metanorma-iso 1.3.23 → 1.3.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e8cbb045e33e2e3403dffc3beac4df18852c29f0bb18edbf579f919ba7923b0
-  data.tar.gz: e38bf3e9fd8169b4ec39110360497a839690d2aed836f80b5033f0c5fc432cba
+  metadata.gz: 0207a8005dcd32df7bd28bcf352786a876ff8301ef7942a678d5bf75ef1bd7a0
+  data.tar.gz: f1eb4a83fe424bc740add6d2a82e2ceaf0b11f38b34ae775108e2afa3d6d2f80
 SHA512:
-  metadata.gz: 5ab999ee188ea2819dfe7a7c50192a96a7dfb2353d28ba3790033846d120f5b262c137bf5cfe5ed29f0dfd3e2129d4a2dad031d1d9974b6cf5bfb4e198dc40c3
-  data.tar.gz: c2da9c1dcded9f65252718d00a22c6195f4a403477a91a3dba51572025ee3aaebbcf02e888301b04b461c938498fe5435c62ff0209b3705c57406bdaa903685f
+  metadata.gz: 181c074093254bbd29824c8af4f7f295781efe18f7ff201f8795da58c52493e30d5e38daff93b6b194e7dd379ea7186a56ae6c2d4331a18a7b7583e6157ec615
+  data.tar.gz: 8b5afd3661cd307878b38e342235f919a9a3960727560fef059b1df4e1ed8023e3cb253b2a506d3b40ba7bf85272777aa7e49d3efe7b9c0ded44fc134e9a46ed

data/lib/asciidoctor/iso/base.rb

@@ -6,6 +6,7 @@ require "open-uri"
 require "pp"
 require "isodoc"
 require "fileutils"
+require 'asciidoctor/iso/macros'
 
 module Asciidoctor
   module ISO
@@ -13,6 +14,10 @@ module Asciidoctor
       XML_ROOT_TAG = "iso-standard".freeze
       XML_NAMESPACE = "https://www.metanorma.org/ns/iso".freeze
 
+      Asciidoctor::Extensions.register do
+        inline_macro Asciidoctor::Iso::TermRefInlineMacro
+      end
+
       def html_converter(node)
         IsoDoc::Iso::HtmlConvert.new(html_extract_attributes(node))
       end

data/lib/asciidoctor/iso/cleanup.rb

@@ -5,6 +5,7 @@ require "json"
 require "pathname"
 require "open-uri"
 require "pp"
+require "asciidoctor/iso/term_lookup_cleanup"
 
 module Asciidoctor
   module ISO
@@ -13,12 +14,12 @@ module Asciidoctor
         "//clause[title = 'Scope']//fn".freeze
 
       NORMREF_FOOTNOTES =
-        "//references[title = 'Normative References']//fn".freeze
+        "//references[@normative = 'true']//fn".freeze
 
       POST_NORMREF_FOOTNOTES =
         "//sections//clause[not(title = 'Scope')]//fn | "\
         "//annex//fn | "\
-        "//references[title = 'Bibliography']//fn".freeze
+        "//references[@normative = 'false']//fn".freeze
 
       def other_footnote_renumber(xmldoc)
         seen = {}
@@ -57,6 +58,8 @@ module Asciidoctor
           id.content = id_prefix(prefix, id)
         id = xmldoc.at("//bibdata/docidentifier[@type = 'iso-with-lang']") and
           id.content = id_prefix(prefix, id)
+        id = xmldoc.at("//bibdata/docidentifier[@type = 'iso-reference']") and
+          id.content = id_prefix(prefix, id)
       end
 
       def format_ref(ref, type, isopub)
@@ -86,6 +89,11 @@ module Asciidoctor
         end
       end
 
+      def termdef_cleanup(xmldoc)
+        Asciidoctor::ISO::TermLookupCleanup.new(xmldoc, @log).call
+        super
+      end
+
       # TODO sort by authors
       # sort by: doc class (ISO, IEC, other standard (not DOI &c), other
       # then standard class (docid class other than DOI &c)

data/lib/asciidoctor/iso/front.rb

@@ -56,9 +56,11 @@ module Asciidoctor
         return unless node.attr("docnumber")
         part, subpart = node&.attr("partnumber")&.split(/-/)
         dn = add_id_parts(node.attr("docnumber"), part, subpart)
-        dn = id_stage_prefix(dn, node)
-        xml.docidentifier dn, **attr_code(type: "iso")
-        xml.docidentifier id_langsuffix(dn, node), **attr_code(type: "iso-with-lang")
+        dn1 = id_stage_prefix(dn, node, false)
+        dn2 = id_stage_prefix(dn, node, true)
+        xml.docidentifier dn1, **attr_code(type: "iso")
+        xml.docidentifier id_langsuffix(dn1, node), **attr_code(type: "iso-with-lang")
+        xml.docidentifier id_langsuffix(dn2, node), **attr_code(type: "iso-reference")
       end
 
       def id_langsuffix(dn, node)
@@ -69,7 +71,7 @@ module Asciidoctor
                  else
                    "(X)"
                  end
-        "#{dn} #{suffix}"
+        "#{dn}#{suffix}"
       end
 
       def metadata_ext(node, xml)
@@ -99,13 +101,14 @@ module Asciidoctor
                        node.attr("draft"))
       end
 
-      def id_stage_prefix(dn, node)
+      def id_stage_prefix(dn, node, force_year)
         stage = get_stage(node)
         substage = get_substage(node)
         if stage && (stage.to_i < 60)
           abbr = id_stage_abbr(stage, substage, node)
           dn = "/#{abbr} #{dn}" unless abbr.nil? || abbr.empty? # prefixes added in cleanup
-        else
+        end
+        if force_year || !(stage && (stage.to_i < 60))
           dn += ":#{node.attr("copyright-year")}" if node.attr("copyright-year")
         end
         dn

data/lib/asciidoctor/iso/isodoc.rng

@@ -129,6 +129,9 @@
             </choice>
           </attribute>
         </optional>
+        <attribute name="normative">
+          <data type="boolean"/>
+        </attribute>
         <optional>
           <ref name="section-title"/>
         </optional>
@@ -303,11 +306,11 @@
         <ref name="paragraph"/>
       </element>
     </define>
-    <define name="TextElement" combine="choice">
-      <ref name="concept"/>
-    </define>
   </include>
   <!-- end overrides -->
+  <define name="TextElement" combine="choice">
+    <ref name="concept"/>
+  </define>
   <define name="concept">
     <element name="concept">
       <optional>

data/lib/asciidoctor/iso/macros.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'asciidoctor/extensions'
+
+module Asciidoctor
+  module Iso
+    # Macro to transform `term[X,Y]` into em, termxref xml
+    class TermRefInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
+      use_dsl
+
+      named :term
+      name_positional_attributes 'name', 'termxref'
+      using_format :short
+
+      def process(_parent, _target, attrs)
+        termref = attrs['termxref'] || attrs['name']
+        "<em>#{attrs['name']}</em> (<termxref>#{termref}</termxref>)"
+      end
+    end
+  end
+end

data/lib/asciidoctor/iso/section.rb

@@ -4,38 +4,12 @@ require "uri"
 module Asciidoctor
   module ISO
     class Converter < Standoc::Converter
-      def section(node)
-        a = section_attributes(node)
-        noko do |xml|
-          case sectiontype(node)
-          when "foreword" then foreword_parse(a, xml, node)
-          when "introduction" then introduction_parse(a, xml, node)
-          when "patent notice" then patent_notice_parse(xml, node)
-          when "scope" then scope_parse(a, xml, node)
-          when "normative references" then norm_ref_parse(a, xml, node)
-          when "terms and definitions"
-            @term_def = true
-            term_def_parse(a, xml, node, true)
-            @term_def = false
-          when "symbols and abbreviated terms"
-            symbols_parse(a, xml, node)
-          when "acknowledgements"
-            acknowledgements_parse(a, xml, node)
-          when "bibliography" then bibliography_parse(a, xml, node)
-          else
-            if @term_def then term_def_subclause_parse(a, xml, node)
-            elsif @biblio then bibliography_parse(a, xml, node)
-            elsif node.attr("style") == "bibliography"
-              bibliography_parse(a, xml, node)
-            elsif node.attr("style") == "appendix" && node.level == 1
-              annex_parse(a, xml, node)
-            elsif node.option? "appendix"
-              appendix_parse(a, xml, node)
-            else
-              clause_parse(a, xml, node)
-            end
-          end
-        end.join("\n")
+      def clause_parse(attrs, xml, node)
+        title = node&.attr("heading")&.downcase ||
+          node.title.gsub(/<[^>]+>/, "").downcase
+        title == "scope" and return scope_parse(attrs, xml, node)
+        node.option? "appendix" and return appendix_parse(attrs, xml, node)
+        super
       end
 
       def appendix_parse(attrs, xml, node)

data/lib/asciidoctor/iso/term_lookup_cleanup.rb

@@ -0,0 +1,90 @@
+# frozen_string_literal: true.
+
+module Asciidoctor
+  module ISO
+    # Intelligent term lookup xml modifier
+    # Lookup all `term` and `calause` tags and replace `termxref` tags with
+    # `xref`:target tag
+    class TermLookupCleanup
+      AUTOMATIC_GENERATED_ID_REGEXP = /\A_/
+      EXISTING_TERM_REGEXP = /\Aterm-/
+
+      attr_reader :xmldoc, :termlookup, :log
+
+      def initialize(xmldoc, log)
+        @xmldoc = xmldoc
+        @log = log
+        @termlookup = {}
+      end
+
+      def call
+        @termlookup = replace_automatic_generated_ids_terms
+        set_termxref_tags_target
+      end
+
+      private
+
+      def set_termxref_tags_target
+        xmldoc.xpath('//termxref').each do |node|
+          target = normalize_ref_id(node.text)
+          if termlookup[target].nil?
+            remove_missing_ref(node, target)
+            next
+          end
+
+          modify_ref_node(node, target)
+        end
+      end
+
+      def remove_missing_ref(node, target)
+        log.add('AsciiDoc Input',
+                node,
+                %(Error: Term reference in `term[#{target}]` missing: \
+                "#{target}" is not defined in document))
+        # Term ref have parentess around it - (ref),
+        # if no target remove parentes and render as text
+        node.next.remove
+        term_name_node = node.previous.previous
+        term_name_node.remove
+        node.previous.remove
+        node.add_previous_sibling(term_name_node.text)
+        node.remove
+      end
+
+      def modify_ref_node(node, target)
+        node.name = 'xref'
+        node['target'] = termlookup[target]
+        node.children.remove
+        node.remove_attribute('defaultref')
+      end
+
+      def replace_automatic_generated_ids_terms
+        xmldoc.xpath('//term').each.with_object({}) do |term_node, res|
+          next if AUTOMATIC_GENERATED_ID_REGEXP.match(term_node['id']).nil?
+
+          normalize_id_and_memorize(term_node, res, './preferred')
+        end
+      end
+
+      def normalize_id_and_memorize(term_node, res_table, text_selector)
+        term_text = normalize_ref_id(term_node.at(text_selector).text)
+        term_node['id'] = unique_text_id(term_text)
+        res_table[term_text] = term_node['id']
+      end
+
+      def normalize_ref_id(text)
+        text.downcase.gsub(/[[:space:]]/, '-')
+      end
+
+      def unique_text_id(text)
+        return "term-#{text}" if xmldoc.at("//*[@id = 'term-#{text}']").nil?
+
+        (1..Float::INFINITY).lazy.each do |index|
+          if xmldoc.at("//*[@id = 'term-#{text}-#{index}']").nil?
+            break("term-#{text}-#{index}")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/asciidoctor/iso/validate.rb

@@ -56,8 +56,7 @@ module Asciidoctor
             @log.add("Bibliography", t, "'#{t} is not pointing to a real reference")
             next
           end
-          if target.at("./ancestor::references"\
-              "[title = 'Normative References']")
+          if target.at("./ancestor::references[@normative = 'true']")
             @log.add("Style", t, "'see #{t}' is pointing to a normative reference")
           end
         end

data/lib/asciidoctor/iso/validate_section.rb

@@ -22,7 +22,7 @@ module Asciidoctor
 
       # ISO/IEC DIR 2, 15.4
       def normref_validate(root)
-        f = root.at("//references[title = 'Normative References']") || return
+        f = root.at("//references[@normative = 'true']") || return
         f.at("./references | ./clause") &&
           @log.add("Style", f, "normative references contains subclauses")
       end
@@ -168,7 +168,7 @@ module Asciidoctor
         "//li[not(p)] | //dt | //dd[not(p)] | //td[not(p)] | //th[not(p)]".freeze
 
       NORM_BIBITEMS =
-        "//references[title = 'Normative References']/bibitem".freeze
+        "//references[@normative = 'true']/bibitem".freeze
 
       # ISO/IEC DIR 2, 10.2
       def norm_bibitem_style(root)

data/lib/isodoc/iso/base_convert.rb

@@ -210,23 +210,10 @@ module IsoDoc
 
       def cleanup(docxml)
         super
-        remove_internal_hyperlinks(docxml)
         table_th_center(docxml)
         docxml
       end
 
-      def remove_internal_hyperlinks(docxml)
-        docxml.xpath("//a[@href]").each do |a|
-          next unless /^#/.match(a[:href])
-          anchor = a[:href].sub(/^#/, "")
-          next if a["epub:type"] == "footnote"
-          next unless @anchors[anchor]
-          next unless @anchors[anchor][:type]
-          next if @anchors[anchor][:type] == "clause"
-          a.replace(a.children)
-        end
-      end
-
       def table_th_center(docxml)
         docxml.xpath("//thead//th | //thead//td").each do |th|
           th["align"] = "center"

data/lib/isodoc/iso/html/header.html

@@ -66,7 +66,7 @@ normal'><span lang=EN-GB><span style='mso-special-character:footnote-continuatio
 <div style='mso-element:header' id=eha>
 
 <p class=MsoHeader align=left style='text-align:left;line-height:12.0pt;
-mso-line-height-rule:exactly'><span lang=EN-GB>{{ docnumber_lang }}{{ draftinfo }}</span></p>
+mso-line-height-rule:exactly'><span lang=EN-GB>{{ docnumber_reference }}{{ draftinfo }}</span></p>
 
 </div>
 
@@ -99,22 +99,22 @@ style='mso-tab-count:1'>
 
 <div style='mso-element:header' id=eh2>
 <p class=MsoHeader align=left style='text-align:left;line-height:12.0pt;
-mso-line-height-rule:exactly'><span lang=EN-GB>{{ docnumber_lang }}{{ draftinfo }}</span></p>
+mso-line-height-rule:exactly'><span lang=EN-GB>{{ docnumber_reference }}{{ draftinfo }}</span></p>
 </div>
 
 <div style='mso-element:header' id=eh2l>
 <p class=MsoHeaderLandscape align=left style='text-align:left;line-height:12.0pt;
-mso-line-height-rule:exactly'><span lang=EN-GB>{{ docnumber_lang }}{{ draftinfo }}</span></p>
+mso-line-height-rule:exactly'><span lang=EN-GB>{{ docnumber_reference }}{{ draftinfo }}</span></p>
 </div>
 
 <div style='mso-element:header' id=h2>
 <p class=MsoHeader align=right style='text-align:right;line-height:12.0pt;
-mso-line-height-rule:exactly'><span lang=EN-GB>{{ docnumber_lang }}{{ draftinfo }}</span></p>
+mso-line-height-rule:exactly'><span lang=EN-GB>{{ docnumber_reference }}{{ draftinfo }}</span></p>
 </div>
 
 <div style='mso-element:header' id=h2l>
 <p class=MsoHeaderLandscape align=right style='text-align:right;line-height:12.0pt;
-mso-line-height-rule:exactly'><span lang=EN-GB>{{ docnumber_lang }}{{ draftinfo }}</span></p>
+mso-line-height-rule:exactly'><span lang=EN-GB>{{ docnumber_reference }}{{ draftinfo }}</span></p>
 </div>
 
 <div style='mso-element:footer' id=ef2>

data/lib/isodoc/iso/html_convert.rb

@@ -10,6 +10,13 @@ module IsoDoc
         super
       end
 
+      def googlefonts()
+      <<~HEAD.freeze
+      <link href="https://fonts.googleapis.com/css?family=Space+Mono:400,400i,700,700i&display=swap" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css?family=Lato:400,400i,700,900" rel="stylesheet">
+      HEAD
+    end
+
       def default_fonts(options)
         {
           bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' :

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

@@ -2,8 +2,13 @@
 
 	<xsl:output method="xml" encoding="UTF-8" indent="no"/>
 	
+	<xsl:param name="svg_images"/>
+	<xsl:variable name="images" select="document($svg_images)"/>
+	
 	
 
+	<xsl:key name="kfn" match="iso:p/iso:fn" use="@reference"/>
+	
 	
 	
 	<xsl:variable name="debug">false</xsl:variable>
@@ -15,8 +20,9 @@
 	<xsl:variable name="lang-1st-letter_tmp" select="substring-before(substring-after(/iso:iso-standard/iso:bibdata/iso:docidentifier[@type = 'iso-with-lang'], '('), ')')"/>
 	<xsl:variable name="lang-1st-letter" select="concat('(', $lang-1st-letter_tmp , ')')"/>
   
-	<xsl:variable name="ISOname" select="concat(/iso:iso-standard/iso:bibdata/iso:docidentifier, ':', /iso:iso-standard/iso:bibdata/iso:copyright/iso:from , $lang-1st-letter)"/>
-	
+	<!-- <xsl:variable name="ISOname" select="concat(/iso:iso-standard/iso:bibdata/iso:docidentifier, ':', /iso:iso-standard/iso:bibdata/iso:copyright/iso:from , $lang-1st-letter)"/> -->
+	<xsl:variable name="ISOname" select="/iso:iso-standard/iso:bibdata/iso:docidentifier[@type = 'iso-reference']"/>
+
 	<!-- Information and documentation — Codes for transcription systems  -->
 	<xsl:variable name="title-en" select="/iso:iso-standard/iso:bibdata/iso:title[@language = 'en' and @type = 'main']"/>
 	<xsl:variable name="title-fr" select="/iso:iso-standard/iso:bibdata/iso:title[@language = 'fr' and @type = 'main']"/>
@@ -28,72 +34,84 @@
 	<xsl:variable name="title-part" select="/iso:iso-standard/iso:bibdata/iso:title[@language = 'en' and @type = 'title-part']"/>
 	<xsl:variable name="title-part-fr" select="/iso:iso-standard/iso:bibdata/iso:title[@language = 'fr' and @type = 'title-part']"/>
 
-	<xsl:variable name="doctype" select="/iso:iso-standard/iso:bibdata/iso:ext/iso:doctype"/>
-	<xsl:variable name="doctype_uppercased" select="translate(translate($doctype,'-',' '), $lower,$upper)"/>
+	<xsl:variable name="doctype_uppercased" select="translate(translate(/iso:iso-standard/iso:bibdata/iso:ext/iso:doctype,'-',' '), $lower,$upper)"/>
 	
 	<xsl:variable name="stage" select="number(/iso:iso-standard/iso:bibdata/iso:status/iso:stage)"/>
-	<xsl:variable name="stage-abbrev" select="normalize-space(/iso:iso-standard/iso:bibdata/iso:status/iso:stage/@abbreviation)"/>
-	<xsl:variable name="stage-fullname" select="normalize-space(/iso:iso-standard/iso:bibdata/iso:ext/iso:stagename)"/>
 	<xsl:variable name="substage" select="number(/iso:iso-standard/iso:bibdata/iso:status/iso:substage)"/>	
-	<xsl:variable name="iteration" select="number(/iso:iso-standard/iso:bibdata/iso:status/iso:iteration)"/>	
-	<xsl:variable name="stage-name">
+	<xsl:variable name="stagename" select="normalize-space(/iso:iso-standard/iso:bibdata/iso:ext/iso:stagename)"/>
+	<xsl:variable name="abbreviation" select="normalize-space(/iso:iso-standard/iso:bibdata/iso:status/iso:stage/@abbreviation)"/>
+		
+	<xsl:variable name="stage-abbreviation">
 		<xsl:choose>
-			<xsl:when test="$stage-abbrev != ''">
-				<xsl:value-of select="$stage-abbrev"/>
+			<xsl:when test="$abbreviation != ''">
+				<xsl:value-of select="$abbreviation"/>
 			</xsl:when>
-			<!--  and $substage = 0 -->
-			<xsl:when test="$stage = 0">NWIP</xsl:when> <!-- NWIP (NP, PWI) -->
+			<xsl:when test="$stage = 0 and $substage = 0">PWI</xsl:when>
+			<xsl:when test="$stage = 0">NWIP</xsl:when> <!-- NWIP (NP) -->
 			<xsl:when test="$stage = 10">AWI</xsl:when>
 			<xsl:when test="$stage = 20">WD</xsl:when>
 			<xsl:when test="$stage = 30">CD</xsl:when>
 			<xsl:when test="$stage = 40">DIS</xsl:when>
 			<xsl:when test="$stage = 50">FDIS</xsl:when>
-			<xsl:when test="$stage = 60 and $substage = 0">IS</xsl:when>
+			<xsl:when test="$stage = 60 and $substage = 0">PRF</xsl:when>
+			<xsl:when test="$stage = 60 and $substage = 60">IS</xsl:when>
 			<xsl:when test="$stage &gt;=60">published</xsl:when>
 			<xsl:otherwise/>
 		</xsl:choose>
 	</xsl:variable>
+
+	<xsl:variable name="stage-fullname-uppercased">
+		<xsl:choose>
+			<xsl:when test="$stagename != ''">
+				<xsl:value-of select="translate($stagename, $lower, $upper)"/>
+			</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>
+			<xsl:when test="$stage-abbreviation = 'AWI'">APPROVED WORK ITEM</xsl:when>
+			<xsl:when test="$stage-abbreviation = 'WD'">WORKING DRAFT</xsl:when>
+			<xsl:when test="$stage-abbreviation = 'CD'">COMMITTEE DRAFT</xsl:when>
+			<xsl:when test="$stage-abbreviation = 'DIS'">DRAFT INTERNATIONAL STANDARD</xsl:when>
+			<xsl:when test="$stage-abbreviation = 'FDIS'">FINAL DRAFT INTERNATIONAL STANDARD</xsl:when>
+			<xsl:otherwise><xsl:value-of select="$doctype_uppercased"/></xsl:otherwise>
+		</xsl:choose>
+	</xsl:variable>
 	
-	<!-- UPPERCASED stage name -->
-	<xsl:variable name="stage-name-uppercased">
-		<xsl:if test="$stage-fullname != '' and $stage-abbrev != ''">
-			<item name="{$stage-abbrev}">
-				<xsl:if test="$stage-abbrev = 'NWIP'">
-					<xsl:attribute name="show">true</xsl:attribute>
-					<xsl:attribute name="header">PRELIMINARY WORK ITEM</xsl:attribute>
-				</xsl:if>
-				<xsl:if test="$stage-abbrev = 'AWI'">
-					<xsl:attribute name="show">true</xsl:attribute>
-					<xsl:attribute name="header">APPROVED WORK ITEM</xsl:attribute>
-				</xsl:if>
-				<xsl:if test="$stage-abbrev = 'WD'">
-					<xsl:attribute name="show">true</xsl:attribute>
-					<xsl:attribute name="header">WORKING DRAFT</xsl:attribute>
-				</xsl:if>
-				<xsl:if test="$stage-abbrev = 'CD'">
-					<xsl:attribute name="show">true</xsl:attribute>
-					<xsl:attribute name="header">COMMITTEE DRAFT</xsl:attribute>
-				</xsl:if>
-				<xsl:if test="$stage-abbrev = 'DIS'">
-					<xsl:attribute name="show">true</xsl:attribute>
-					<xsl:attribute name="header">DRAFT INTERNATIONAL STANDARD</xsl:attribute>
-				</xsl:if>
-				<xsl:if test="$stage-abbrev = 'FDIS'">
-					<xsl:attribute name="show">true</xsl:attribute>
-					<xsl:attribute name="header">FINAL DRAFT INTERNATIONAL STANDARD</xsl:attribute>
-				</xsl:if>
-				<xsl:value-of select="translate($stage-fullname, $lower, $upper)"/>
-			</item>
-		</xsl:if>
-		<item name="NWIP" show="true" header="PRELIMINARY WORK ITEM">NEW WORK ITEM PROPOSAL DRAFT</item>
-		<item name="AWI" show="true" header="APPROVED WORK ITEM">APPROVED WORK ITEM</item>
-		<item name="WD" show="true" header="WORKING DRAFT">WORKING DRAFT</item>
-		<item name="CD" show="true" header="COMMITTEE DRAFT">COMMITTEE DRAFT</item>
-		<item name="DIS" show="true" header="DRAFT INTERNATIONAL STANDARD">DRAFT</item>
-		<item name="FDIS" show="true" header="FINAL DRAFT INTERNATIONAL STANDARD">FINAL DRAFT</item>
-		<item name="IS">PROOF</item>
+	<xsl:variable name="stagename-header-firstpage">
+		<xsl:choose>
+			<!-- <xsl:when test="$stage-abbreviation = 'PWI' or 
+														$stage-abbreviation = 'NWIP' or 
+														$stage-abbreviation = 'NP'">PRELIMINARY WORK ITEM</xsl:when> -->
+			<xsl:when test="$stage-abbreviation = 'PRF'"><xsl:value-of select="$doctype_uppercased"/></xsl:when>
+			<xsl:otherwise>
+				<xsl:value-of select="$stage-fullname-uppercased"/>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:variable>
 	
+	<xsl:variable name="stagename-header-coverpage">
+		<xsl:choose>
+			<xsl:when test="$stage-abbreviation = 'DIS'">DRAFT</xsl:when>
+			<xsl:when test="$stage-abbreviation = 'FDIS'">FINAL DRAFT</xsl:when>
+			<xsl:when test="$stage-abbreviation = 'PRF'"/>
+			<xsl:when test="$stage-abbreviation = 'IS'"/>
+			<xsl:otherwise>
+				<xsl:value-of select="$stage-fullname-uppercased"/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:variable>
+	
+	<!-- UPPERCASED stage name -->	
+	<!-- <item name="NWIP" show="true" header="PRELIMINARY WORK ITEM" shortname="NEW WORK ITEM PROPOSAL">NEW WORK ITEM PROPOSAL</item>
+	<item name="PWI" show="true" header="PRELIMINARY WORK ITEM" shortname="PRELIMINARY WORK ITEM">PRELIMINARY WORK ITEM</item>		
+	<item name="NP" show="true" header="PRELIMINARY WORK ITEM" shortname="NEW WORK ITEM PROPOSAL">NEW WORK ITEM PROPOSAL</item>
+	<item name="AWI" show="true" header="APPROVED WORK ITEM" shortname="APPROVED WORK ITEM">APPROVED WORK ITEM</item>
+	<item name="WD" show="true" header="WORKING DRAFT" shortname="WORKING DRAFT">WORKING DRAFT</item>
+	<item name="CD" show="true" header="COMMITTEE DRAFT" shortname="COMMITTEE DRAFT">COMMITTEE DRAFT</item>
+	<item name="DIS" show="true" header="DRAFT INTERNATIONAL STANDARD" shortname="DRAFT">DRAFT INTERNATIONAL STANDARD</item>
+	<item name="FDIS" show="true" header="FINAL DRAFT INTERNATIONAL STANDARD" shortname="FINAL DRAFT">FINAL DRAFT INTERNATIONAL STANDARD</item>
+	<item name="PRF">PROOF</item> -->
+	
+	
 	<!-- 
 		<status>
     <stage>30</stage>
@@ -106,17 +124,24 @@
 		<xsl:choose>
 			<xsl:when test="string($stage) = 'NaN'">false</xsl:when>
 			<xsl:when test="$stage &gt;=60">true</xsl:when>
-			<xsl:when test="normalize-space($stage-name) != ''">true</xsl:when>
+			<xsl:when test="normalize-space($stage-abbreviation) != ''">true</xsl:when>
 			<xsl:otherwise>false</xsl:otherwise>
 		</xsl:choose>
 	</xsl:variable>
 	
 	<xsl:variable name="document-master-reference">
 		<xsl:choose>
-			<xsl:when test="$stage-name != ''">-publishedISO</xsl:when>
+			<xsl:when test="$stage-abbreviation != ''">-publishedISO</xsl:when>
 			<xsl:otherwise/>
 		</xsl:choose>
 	</xsl:variable>
+
+	<xsl:variable name="force-page-count-preface">
+		<xsl:choose>
+			<xsl:when test="$document-master-reference != ''">end-on-even</xsl:when>
+			<xsl:otherwise>no-force</xsl:otherwise>
+		</xsl:choose>
+	</xsl:variable>
 	
 	<xsl:variable name="proof-text">PROOF/ÉPREUVE</xsl:variable>
 
@@ -256,12 +281,22 @@
 					<fo:region-start region-name="left-region" extent="12.5mm"/>
 					<fo:region-end region-name="right-region" extent="25mm"/>
 				</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>
 				<fo:page-sequence-master master-name="preface-publishedISO">
 					<fo:repeatable-page-master-alternatives>
+						<fo:conditional-page-master-reference master-reference="blankpage" blank-or-not-blank="blank"/>
 						<fo:conditional-page-master-reference odd-or-even="even" master-reference="even-publishedISO"/>
 						<fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd-publishedISO"/>
 					</fo:repeatable-page-master-alternatives>
 				</fo:page-sequence-master>
+				
+				
 				<fo:page-sequence-master master-name="document-publishedISO">
 					<fo:repeatable-page-master-alternatives>
 						<fo:conditional-page-master-reference master-reference="first-publishedISO" page-position="first"/>
@@ -310,7 +345,7 @@
 			
 			<!-- cover page -->
 			<xsl:choose>
-				<xsl:when test="$stage-name != ''">
+				<xsl:when test="$stage-abbreviation != ''">
 					<fo:page-sequence master-reference="cover-page-publishedISO" force-page-count="no-force">
 						<fo:static-content flow-name="cover-page-footer" font-size="10pt">
 							<fo:table table-layout="fixed" width="100%">
@@ -322,12 +357,12 @@
 										<fo:table-cell font-size="6.5pt" text-align="justify" display-align="after" padding-bottom="8mm"><!-- before -->
 											<!-- margin-top="-30mm"  -->
 											<fo:block margin-top="-100mm">
-												<xsl:if test="$stage-name = 'DIS' or $stage-name = 'NWIP' or $stage-name = 'AWI' or $stage-name = 'WD' or $stage-name = 'CD'">
+												<xsl:if test="$stage-abbreviation = 'DIS' or                       $stage-abbreviation = 'NWIP' or                       $stage-abbreviation = 'NP' or                       $stage-abbreviation = 'PWI' or                       $stage-abbreviation = 'AWI' or                       $stage-abbreviation = 'WD' or                       $stage-abbreviation = 'CD'">
 													<fo:block margin-bottom="1.5mm">
 														<xsl:text>THIS DOCUMENT IS A DRAFT CIRCULATED FOR COMMENT AND APPROVAL. IT IS THEREFORE SUBJECT TO CHANGE AND MAY NOT BE REFERRED TO AS AN INTERNATIONAL STANDARD UNTIL PUBLISHED AS SUCH.</xsl:text>
 													</fo:block>
 												</xsl:if>
-												<xsl:if test="$stage-name = 'FDIS' or $stage-name = 'DIS' or $stage-name = 'NWIP' or $stage-name = 'AWI' or $stage-name = 'WD' or $stage-name = 'CD'">
+												<xsl:if test="$stage-abbreviation = 'FDIS' or                       $stage-abbreviation = 'DIS' or                       $stage-abbreviation = 'NWIP' or                       $stage-abbreviation = 'NP' or                       $stage-abbreviation = 'PWI' or                       $stage-abbreviation = 'AWI' or                       $stage-abbreviation = 'WD' or                       $stage-abbreviation = 'CD'">
 													<fo:block margin-bottom="1.5mm">
 														<xsl:text>RECIPIENTS OF THIS DRAFT ARE INVITED TO
 																			SUBMIT, WITH THEIR COMMENTS, NOTIFICATION
@@ -352,7 +387,7 @@
 											<fo:block> </fo:block>
 										</fo:table-cell>
 										<fo:table-cell>
-											<xsl:if test="$stage-name = 'DIS'">
+											<xsl:if test="$stage-abbreviation = 'DIS'">
 												<fo:block-container margin-top="-15mm" margin-bottom="7mm" margin-left="1mm">
 													<fo:block font-size="9pt" border="0.5pt solid black" fox:border-radius="5pt" padding-left="2mm" padding-top="2mm" padding-bottom="2mm">
 														<xsl:text>This document is circulated as received from the committee secretariat.</xsl:text>
@@ -387,7 +422,9 @@
 															<fo:table-cell display-align="center">
 																<fo:block text-align="right">
 																	<fo:block>Reference number</fo:block>
-																	<fo:block><xsl:value-of select="$ISOname"/></fo:block>
+																	<fo:block>
+																		<xsl:value-of select="$ISOname"/>																		
+																	</fo:block>
 																	<fo:block> </fo:block>
 																	<fo:block> </fo:block>
 																	<fo:block><fo:inline font-size="9pt">©</fo:inline><xsl:value-of select="concat(' ISO ', iso:iso-standard/iso:bibdata/iso:copyright/iso:from)"/></fo:block>
@@ -404,13 +441,12 @@
 						</fo:static-content>
 						
 						<xsl:choose>
-							<xsl:when test="$stage-name = 'DIS'">
+							<!-- COVER PAGE for DIS document only -->
+							<xsl:when test="$stage-abbreviation = 'DIS'">
 								<fo:flow flow-name="xsl-region-body">
 									<fo:block-container>
 										<fo:block margin-top="-1mm" font-size="20pt" text-align="right">
-											<xsl:value-of select="xalan:nodeset($stage-name-uppercased)/item[@name = $stage-name and @show = 'true']/text()"/>
-											<xsl:text> </xsl:text>
-											<xsl:value-of select="$doctype_uppercased"/>
+											<xsl:value-of select="$stage-fullname-uppercased"/>											
 										</fo:block>
 										<fo:block font-size="20pt" font-weight="bold" text-align="right">
 											<xsl:value-of select="/iso:iso-standard/iso:bibdata/iso:docidentifier[@type = 'iso']"/>
@@ -450,10 +486,24 @@
 														<fo:block> </fo:block>
 													</fo:table-cell>
 													<fo:table-cell>
-														<fo:block><fo:inline font-weight="bold">2018</fo:inline>-xx-xx</fo:block>
+														<fo:block font-weight="bold">
+															<xsl:choose>
+																<xsl:when test="/iso:iso-standard/iso:bibdata/iso:date[@type = 'vote-started']/iso:on">
+																	<xsl:value-of select="/iso:iso-standard/iso:bibdata/iso:date[@type = 'vote-started']/iso:on"/>
+																</xsl:when>
+																<xsl:otherwise>YYYY-MM-DD</xsl:otherwise>
+															</xsl:choose>
+														</fo:block>
 													</fo:table-cell>
 													<fo:table-cell>
-														<fo:block><fo:inline font-weight="bold">2018</fo:inline>-xx-xx</fo:block>
+														<fo:block font-weight="bold">
+															<xsl:choose>
+																<xsl:when test="/iso:iso-standard/iso:bibdata/iso:date[@type = 'vote-ended']/iso:on">
+																	<xsl:value-of select="/iso:iso-standard/iso:bibdata/iso:date[@type = 'vote-ended']/iso:on"/>
+																</xsl:when>
+																<xsl:otherwise>YYYY-MM-DD</xsl:otherwise>
+															</xsl:choose>
+														</fo:block>
 													</fo:table-cell>
 												</fo:table-row>
 											</fo:table-body>
@@ -502,7 +552,13 @@
 													</xsl:if>
 												</fo:block>
 											</fo:block>
-											<fo:block margin-top="10mm">ICS: xx.xxx.xx; xx.xxx.xx</fo:block>
+											<fo:block margin-top="10mm">
+												<xsl:for-each select="/iso:iso-standard/iso:bibdata/iso:ext/iso:ics/iso:code">
+													<xsl:if test="position() = 1"><fo:inline>ICS: </fo:inline></xsl:if>
+													<xsl:value-of select="."/>
+													<xsl:if test="position() != last()"><xsl:text>; </xsl:text></xsl:if>
+												</xsl:for-each>
+											</fo:block>
 										</fo:block-container>
 										
 										
@@ -512,6 +568,7 @@
 							</xsl:when>
 							<xsl:otherwise>
 						
+								<!-- COVER PAGE  for all documents except DIS -->
 								<fo:flow flow-name="xsl-region-body">
 									<fo:block-container>
 										<fo:table table-layout="fixed" width="100%" font-size="24pt" line-height="1"> <!-- margin-bottom="35mm" -->
@@ -522,9 +579,13 @@
 												<fo:table-row>
 													<fo:table-cell>
 														<fo:block font-size="18pt">
-															<xsl:variable name="stgname" select="xalan:nodeset($stage-name-uppercased)/item[@name = $stage-name and @show = 'true']/text()"/>
-															<xsl:value-of select="translate($stgname, ' ', $linebreak)"/>
-															<xsl:if test="number($iteration) = $iteration and ($stage-name = 'NWIP' or $stage-name = 'AWI' or $stage-name = 'WD' or $stage-name = 'CD')"> <!-- not NaN -->
+															
+															<xsl:value-of select="translate($stagename-header-coverpage, ' ', $linebreak)"/>
+															
+															<!-- if there is iteration number, then print it -->
+															<xsl:variable name="iteration" select="number(/iso:iso-standard/iso:bibdata/iso:status/iso:iteration)"/>	
+															
+															<xsl:if test="number($iteration) = $iteration and                                         ($stage-abbreviation = 'NWIP' or                                         $stage-abbreviation = 'NP' or                                         $stage-abbreviation = 'PWI' or                                         $stage-abbreviation = 'AWI' or                                         $stage-abbreviation = 'WD' or                                         $stage-abbreviation = 'CD')">
 																<xsl:text> </xsl:text><xsl:value-of select="$iteration"/>
 															</xsl:if>
 															<!-- <xsl:if test="$stage-name = 'draft'">DRAFT</xsl:if>
@@ -545,20 +606,19 @@
 												<fo:table-row height="42mm">
 													<fo:table-cell number-columns-spanned="3" font-size="10pt" line-height="1.2">
 														<fo:block text-align="right">
-															<xsl:variable name="edition" select="/iso:iso-standard/iso:bibdata/iso:edition"/>
-															<xsl:if test="$stage-name = 'IS' or $stage-name = 'published'">
-																<xsl:choose>
-																	<xsl:when test="$edition = 1">First</xsl:when>
-																	<xsl:when test="$edition = 2">Second</xsl:when>
-																	<xsl:when test="$edition = 3">Third</xsl:when>
-																	<xsl:otherwise><xsl:value-of select="$edition"/></xsl:otherwise>
-																</xsl:choose>
-																<xsl:text> edition</xsl:text>
-															</xsl:if>
-															<xsl:if test="$stage-name = 'published'">
-																<xsl:value-of select="$linebreak"/>
-																<xsl:value-of select="substring(/iso:iso-standard/iso:bibdata/iso:version/iso:revision-date,1, 7)"/>
+															<xsl:if test="$stage-abbreviation = 'PRF' or                          $stage-abbreviation = 'IS' or                          $stage-abbreviation = 'published'">
+																<xsl:call-template name="printEdition"/>
 															</xsl:if>
+															<xsl:choose>
+																<xsl:when test="$stage-abbreviation = 'IS'">
+																	<xsl:value-of select="$linebreak"/>
+																	<xsl:value-of select="/iso:iso-standard/iso:bibdata/iso:date[@type = 'published']"/>
+																</xsl:when>
+																<xsl:when test="$stage-abbreviation = 'published'">
+																	<xsl:value-of select="$linebreak"/>
+																	<xsl:value-of select="substring(/iso:iso-standard/iso:bibdata/iso:version/iso:revision-date,1, 7)"/>
+																</xsl:when>
+															</xsl:choose>
 															<!-- <xsl:value-of select="$linebreak"/>
 															<xsl:value-of select="/iso:iso-standard/iso:bibdata/iso:version/iso:revision-date"/> -->
 															</fo:block>
@@ -576,16 +636,30 @@
 												<fo:table-row> <!--  border="1pt solid black" height="150mm"  -->
 													<fo:table-cell font-size="11pt">
 														<fo:block>
-															<xsl:if test="$stage-name = 'FDIS'">
+															<xsl:if test="$stage-abbreviation = 'FDIS'">
 																<fo:block-container border="0.5mm solid black" width="51mm">
 																	<fo:block margin="2mm">
 																			<fo:block margin-bottom="8pt">ISO/TC <fo:inline font-weight="bold"><xsl:value-of select="/iso:iso-standard/iso:bibdata/iso:ext/iso:editorialgroup/iso:technical-committee/@number"/></fo:inline></fo:block>
 																			<fo:block margin-bottom="6pt">Secretariat: <xsl:value-of select="/iso:iso-standard/iso:bibdata/iso:ext/iso:editorialgroup/iso:secretariat"/></fo:block>
 																			<fo:block margin-bottom="6pt">Voting begins on:<xsl:value-of select="$linebreak"/>
-																				<fo:inline font-weight="bold">2018</fo:inline>-xx-xx
+																				<fo:inline font-weight="bold">
+																					<xsl:choose>
+																						<xsl:when test="/iso:iso-standard/iso:bibdata/iso:date[@type = 'vote-started']/iso:on">
+																							<xsl:value-of select="/iso:iso-standard/iso:bibdata/iso:date[@type = 'vote-started']/iso:on"/>
+																						</xsl:when>
+																						<xsl:otherwise>YYYY-MM-DD</xsl:otherwise>
+																					</xsl:choose>
+																				</fo:inline>
 																			</fo:block>
 																			<fo:block>Voting terminates on:<xsl:value-of select="$linebreak"/>
-																				<fo:inline font-weight="bold">2018</fo:inline>-xx-xx
+																				<fo:inline font-weight="bold">
+																					<xsl:choose>
+																						<xsl:when test="/iso:iso-standard/iso:bibdata/iso:date[@type = 'vote-ended']/iso:on">
+																							<xsl:value-of select="/iso:iso-standard/iso:bibdata/iso:date[@type = 'vote-ended']/iso:on"/>
+																						</xsl:when>
+																						<xsl:otherwise>YYYY-MM-DD</xsl:otherwise>
+																					</xsl:choose>
+																				</fo:inline>
 																			</fo:block>
 																	</fo:block>
 																</fo:block-container>
@@ -648,7 +722,7 @@
 									</fo:block-container>
 									<fo:block-container position="absolute" left="60mm" top="222mm" height="25mm" display-align="after">
 										<fo:block>
-											<xsl:if test="$stage-name = 'IS'">
+											<xsl:if test="$stage-abbreviation = 'PRF'">
 												<fo:block font-size="39pt" font-weight="bold"><xsl:value-of select="$proof-text"/></fo:block>
 											</xsl:if>
 										</fo:block>
@@ -708,14 +782,7 @@
 										<fo:table-row>
 											<fo:table-cell number-columns-spanned="2" font-size="10pt" line-height="1.2">
 												<fo:block text-align="right">
-													<xsl:variable name="edition" select="/iso:iso-standard/iso:bibdata/iso:edition"/>
-													<xsl:choose>
-														<xsl:when test="$edition = 1">First</xsl:when>
-														<xsl:when test="$edition = 2">Second</xsl:when>
-														<xsl:when test="$edition = 3">Third</xsl:when>
-														<xsl:otherwise><xsl:value-of select="$edition"/></xsl:otherwise>
-													</xsl:choose>
-													<xsl:text> edition</xsl:text>
+													<xsl:call-template name="printEdition"/>
 													<xsl:value-of select="$linebreak"/>
 													<xsl:value-of select="/iso:iso-standard/iso:bibdata/iso:version/iso:revision-date"/></fo:block>
 											</fo:table-cell>
@@ -835,12 +902,8 @@
 								
 								<fo:block margin-bottom="100pt">
 									<xsl:text>Secretariat: </xsl:text>
-									<xsl:choose>
-										<xsl:when test="/iso:iso-standard/iso:bibdata/iso:ext/iso:editorialgroup/iso:secretariat">
-											<xsl:value-of select="/iso:iso-standard/iso:bibdata/iso:ext/iso:editorialgroup/iso:secretariat"/>
-										</xsl:when>
-										<xsl:otherwise>XXXX</xsl:otherwise>
-									</xsl:choose>
+									<xsl:value-of select="/iso:iso-standard/iso:bibdata/iso:ext/iso:editorialgroup/iso:secretariat"/>
+									<xsl:text> </xsl:text>
 								</fo:block>
 									
 								
@@ -909,7 +972,7 @@
 				</xsl:otherwise>
 			</xsl:choose>	
 			
-			<fo:page-sequence master-reference="preface{$document-master-reference}" format="i" force-page-count="no-force">
+			<fo:page-sequence master-reference="preface{$document-master-reference}" format="i" force-page-count="{$force-page-count-preface}">
 				<xsl:call-template name="insertHeaderFooter">
 					<xsl:with-param name="font-weight">normal</xsl:with-param>
 				</xsl:call-template>
@@ -954,6 +1017,9 @@
 								<xsl:if test="@level = 1">
 									<xsl:attribute name="margin-top">5pt</xsl:attribute>
 								</xsl:if>
+								<xsl:if test="@level = 3">
+									<xsl:attribute name="margin-top">-0.7pt</xsl:attribute>
+								</xsl:if>
 								<fo:list-block>
 									<xsl:attribute name="margin-left"><xsl:value-of select="$margin-left * (@level - 1)"/>mm</xsl:attribute>
 									<xsl:if test="@level &gt;= 2">
@@ -1021,7 +1087,7 @@
 							<xsl:value-of select="$title-en"/>
 						</fo:block>
 						 -->
-						<fo:block font-size="18pt" font-weight="bold" margin-top="12pt" margin-bottom="18pt">
+						<fo:block font-size="18pt" font-weight="bold" margin-top="40pt" margin-bottom="20pt" line-height="1.1">
 							<fo:block>
 								<xsl:if test="normalize-space($title-intro) != ''">
 									<xsl:value-of select="$title-intro"/>
@@ -1033,7 +1099,7 @@
 								<xsl:if test="normalize-space($title-part) != ''">
 									<xsl:if test="$part != ''">
 										<xsl:text> — </xsl:text>
-										<fo:block font-weight="normal" margin-top="12pt">
+										<fo:block font-weight="normal" margin-top="12pt" line-height="1.1">
 											<xsl:text>Part </xsl:text><xsl:value-of select="$part"/>
 											<xsl:text>:</xsl:text>
 										</fo:block>
@@ -1054,13 +1120,13 @@
 							<xsl:with-param name="sectionNum" select="'1'"/>
 						</xsl:apply-templates>
 
-						<fo:block space-before="27pt"> </fo:block>
+						<!-- <fo:block space-before="27pt">&#xA0;</fo:block> -->
 						 <!-- Normative references  -->
 						<xsl:apply-templates select="/iso:iso-standard/iso:bibliography/iso:references[1]">
 							<xsl:with-param name="sectionNum" select="'2'"/>
 						</xsl:apply-templates>
 						
-						<fo:block space-before="18pt"> </fo:block>
+						<!-- <fo:block space-before="18pt">&#xA0;</fo:block> -->
 						 <!-- main sections -->
 						<xsl:apply-templates select="/iso:iso-standard/iso:sections/*[position() &gt; 1]">
 							<xsl:with-param name="sectionNumSkew" select="'1'"/>
@@ -1093,7 +1159,7 @@
 									</fo:table-cell>
 									<fo:table-cell>
 										<fo:block font-size="11pt" font-weight="bold" text-align="center">
-											<xsl:if test="$stage-name = 'IS'">
+											<xsl:if test="$stage-abbreviation = 'PRF'">
 												<xsl:value-of select="$proof-text"/>
 											</xsl:if>
 										</fo:block>
@@ -1109,12 +1175,17 @@
 						<fo:block-container height="252mm" display-align="after">
 							<fo:block-container border-top="1mm double black">
 								<fo:block font-size="12pt" font-weight="bold" padding-top="3.5mm" padding-bottom="0.5mm">
-									<xsl:choose>
-										<xsl:when test="$stage-name = 'FDIS'">ICS  01.140.30</xsl:when>
-										<xsl:when test="$stage-name = 'IS'">ICS  35.240.63</xsl:when>
-										<xsl:when test="$stage-name = 'published'">ICS  35.240.30</xsl:when>
-										<xsl:otherwise>ICS  67.060</xsl:otherwise>
-									</xsl:choose>
+									<xsl:for-each select="/iso:iso-standard/iso:bibdata/iso:ext/iso:ics/iso:code">
+										<xsl:if test="position() = 1"><fo:inline>ICS  </fo:inline></xsl:if>
+										<xsl:value-of select="."/>
+										<xsl:if test="position() != last()"><xsl:text>; </xsl:text></xsl:if>
+									</xsl:for-each> 
+									<!-- <xsl:choose>
+										<xsl:when test="$stage-name = 'FDIS'">ICS&#xA0;&#xA0;01.140.30</xsl:when>
+										<xsl:when test="$stage-name = 'PRF'">ICS&#xA0;&#xA0;35.240.63</xsl:when>
+										<xsl:when test="$stage-name = 'published'">ICS&#xA0;&#xA0;35.240.30</xsl:when>
+										<xsl:otherwise>ICS&#xA0;&#xA0;67.060</xsl:otherwise>
+									</xsl:choose> -->
 									</fo:block>
 								<fo:block font-size="9pt">Price based on <fo:page-number-citation ref-id="lastBlock"/> pages</fo:block>
 							</fo:block-container>
@@ -1263,8 +1334,6 @@
 		</item>
 	</xsl:template>
 	
-	
-	
 	<xsl:template match="iso:formula" mode="contents">
 		<item level="" id="{@id}" display="false">
 			<xsl:attribute name="section">
@@ -1272,6 +1341,46 @@
 			</xsl:attribute>
 		</item>
 	</xsl:template>
+	
+	<xsl:template match="iso:li" mode="contents">
+		<xsl:param name="sectionNum"/>
+		<item level="" id="{@id}" display="false" type="li">
+			<xsl:attribute name="section">
+				<xsl:call-template name="getListItemFormat"/>
+			</xsl:attribute>
+			<xsl:attribute name="parent_section">
+				<xsl:for-each select="ancestor::*[not(local-name() = 'p' or local-name() = 'ol')][1]">
+					<xsl:call-template name="getSection">
+						<xsl:with-param name="sectionNum" select="$sectionNum"/>
+					</xsl:call-template>
+				</xsl:for-each>
+			</xsl:attribute>
+		</item>
+		<xsl:apply-templates mode="contents">
+			<xsl:with-param name="sectionNum" select="$sectionNum"/>
+		</xsl:apply-templates>
+	</xsl:template>
+
+	<xsl:template name="getListItemFormat">
+		<xsl:choose>
+			<xsl:when test="local-name(..) = 'ul'">—</xsl:when> <!-- dash -->
+			<xsl:otherwise> <!-- for ordered lists -->
+				<xsl:choose>
+					<xsl:when test="../@type = 'arabic'">
+						<xsl:number format="a)"/>
+					</xsl:when>
+					<xsl:when test="../@type = 'alphabet'">
+						<xsl:number format="a)"/>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:number format="1."/>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+
+	
 	<!-- ============================= -->
 	<!-- ============================= -->
 	
@@ -1406,7 +1515,7 @@
 		<xsl:variable name="font-size">
 			<xsl:choose>
 				<xsl:when test="ancestor::iso:annex and $level = 2">13pt</xsl:when>
-				<xsl:when test="ancestor::iso:annex and $level = 3">11pt</xsl:when>
+				<xsl:when test="ancestor::iso:annex and $level = 3">12pt</xsl:when>
 				<xsl:when test="ancestor::iso:preface">16pt</xsl:when>
 				<xsl:when test="$level = 2">12pt</xsl:when>
 				<xsl:when test="$level &gt;= 3">11pt</xsl:when>
@@ -1446,15 +1555,17 @@
 					<xsl:attribute name="margin-top"> <!-- margin-top -->
 						<xsl:choose>
 							<xsl:when test="ancestor::iso:preface">8pt</xsl:when>
-							<xsl:when test="$level = 2 and ancestor::annex">18pt</xsl:when>
-							<xsl:when test="$level = '' or $level = 1">6pt</xsl:when><!-- 13.5pt -->
+							<xsl:when test="$level = 2 and ancestor::iso:annex">18pt</xsl:when>
+							<xsl:when test="$level = 1">18pt</xsl:when>
+							<xsl:when test="$level = ''">6pt</xsl:when><!-- 13.5pt -->
 							<xsl:otherwise>12pt</xsl:otherwise>
 						</xsl:choose>
 					</xsl:attribute>
 					<xsl:attribute name="margin-bottom">
 						<xsl:choose>
 							<xsl:when test="ancestor::iso:preface">18pt</xsl:when>
-							<xsl:otherwise>12pt</xsl:otherwise>
+							<!-- <xsl:otherwise>12pt</xsl:otherwise> -->
+							<xsl:otherwise>8pt</xsl:otherwise>
 						</xsl:choose>
 					</xsl:attribute>
 					<xsl:attribute name="keep-with-next">always</xsl:attribute>		
@@ -1506,10 +1617,12 @@
 				<xsl:choose>
 					<!-- <xsl:when test="ancestor::iso:preface">justify</xsl:when> -->
 					<xsl:when test="@align"><xsl:value-of select="@align"/></xsl:when>
+					<xsl:when test="ancestor::iso:td/@align"><xsl:value-of select="ancestor::iso:td/@align"/></xsl:when>
+					<xsl:when test="ancestor::iso:th/@align"><xsl:value-of select="ancestor::iso:th/@align"/></xsl:when>
 					<xsl:otherwise>justify</xsl:otherwise><!-- left -->
 				</xsl:choose>
 			</xsl:attribute>
-			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
+			<xsl:attribute name="margin-bottom">8pt</xsl:attribute>
 			<xsl:apply-templates/>
 		</xsl:element>
 		<xsl:if test="$element-name = 'fo:inline' and not($inline = 'true') and not(local-name(..) = 'admonition')">
@@ -1525,33 +1638,70 @@
 		</xsl:if>
 	</xsl:template>
 	
+	<xsl:template match="iso:li//iso:p//text()">
+		<xsl:choose>
+			<xsl:when test="contains(., '&#9;')">
+				<fo:inline white-space="pre"><xsl:value-of select="."/></fo:inline>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:value-of select="."/>
+			</xsl:otherwise>
+		</xsl:choose>
+		
+	</xsl:template>
+	
 	<!--
 	<fn reference="1">
 			<p id="_8e5cf917-f75a-4a49-b0aa-1714cb6cf954">Formerly denoted as 15 % (m/m).</p>
 		</fn>
 	-->
+	
+	<xsl:variable name="p_fn">
+		<xsl:for-each select="//iso:p/iso:fn[generate-id(.)=generate-id(key('kfn',@reference)[1])]">
+			<!-- copy unique fn -->
+			<fn gen_id="{generate-id(.)}">
+				<xsl:copy-of select="@*"/>
+				<xsl:copy-of select="node()"/>
+			</fn>
+		</xsl:for-each>
+	</xsl:variable>
+	
 	<xsl:template match="iso:p/iso:fn" priority="2">
-		<fo:footnote>
-			<xsl:variable name="number">
-				<xsl:number level="any" count="iso:p/iso:fn"/>
-			</xsl:variable>
-			<fo:inline font-size="80%" keep-with-previous.within-line="always" vertical-align="super">
-				<fo:basic-link internal-destination="footnote_{@reference}" fox:alt-text="footnote {@reference}">
-					<!-- <xsl:value-of select="@reference"/> -->
-					<xsl:value-of select="$number + count(//iso:bibitem/iso:note)"/><xsl:text>)</xsl:text>
-				</fo:basic-link>
-			</fo:inline>
-			<fo:footnote-body>
-				<fo:block font-size="10pt" margin-bottom="12pt">
-					<fo:inline id="footnote_{@reference}" keep-with-next.within-line="always" padding-right="3mm"> <!-- font-size="60%"  alignment-baseline="hanging" -->
-						<xsl:value-of select="$number + count(//iso:bibitem/iso:note)"/><xsl:text>)</xsl:text>
+		<xsl:variable name="gen_id" select="generate-id(.)"/>
+		<xsl:variable name="reference" select="@reference"/>
+		<xsl:variable name="number">
+			<!-- <xsl:number level="any" count="iso:p/iso:fn"/> -->
+			<xsl:value-of select="count(xalan:nodeset($p_fn)//fn[@reference = $reference]/preceding-sibling::fn) + 1"/>
+		</xsl:variable>
+		<xsl:choose>
+			<xsl:when test="xalan:nodeset($p_fn)//fn[@gen_id = $gen_id]">
+				<fo:footnote>
+					<fo:inline font-size="80%" keep-with-previous.within-line="always" vertical-align="super">
+						<fo:basic-link internal-destination="footnote_{@reference}_{$number}" fox:alt-text="footnote {@reference} {$number}">
+							<!-- <xsl:value-of select="@reference"/> -->
+							<xsl:value-of select="$number + count(//iso:bibitem[ancestor::iso:references[@id='_normative_references']]/iso:note)"/><xsl:text>)</xsl:text>
+						</fo:basic-link>
 					</fo:inline>
-					<xsl:for-each select="iso:p">
-							<xsl:apply-templates/>
-					</xsl:for-each>
-				</fo:block>
-			</fo:footnote-body>
-		</fo:footnote>
+					<fo:footnote-body>
+						<fo:block font-size="10pt" margin-bottom="12pt">
+							<fo:inline id="footnote_{@reference}_{$number}" keep-with-next.within-line="always" padding-right="3mm"> <!-- font-size="60%"  alignment-baseline="hanging" -->
+								<xsl:value-of select="$number + count(//iso:bibitem[ancestor::iso:references[@id='_normative_references']]/iso:note)"/><xsl:text>)</xsl:text>
+							</fo:inline>
+							<xsl:for-each select="iso:p">
+									<xsl:apply-templates/>
+							</xsl:for-each>
+						</fo:block>
+					</fo:footnote-body>
+				</fo:footnote>
+			</xsl:when>
+			<xsl:otherwise>
+				<fo:inline font-size="60%" keep-with-previous.within-line="always" vertical-align="super">
+					<fo:basic-link internal-destination="footnote_{@reference}_{$number}" fox:alt-text="footnote {@reference} {$number}">
+						<xsl:value-of select="$number + count(//iso:bibitem/iso:note)"/>
+					</fo:basic-link>
+				</fo:inline>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template>
 
 	<xsl:template match="iso:p/iso:fn/iso:p">
@@ -1626,7 +1776,17 @@
 	
 	<xsl:template match="iso:figure/iso:image">
 		<fo:block text-align="center">
-			<fo:external-graphic src="{@src}" width="100%" content-height="scale-to-fit" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image {@alt}"/> 
+			<xsl:variable name="src">
+				<xsl:choose>
+					<xsl:when test="@mimetype = 'image/svg+xml' and $images/images/image[@id = current()/@id]">
+						<xsl:value-of select="$images/images/image[@id = current()/@id]/@src"/>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:value-of select="@src"/>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:variable>		
+			<fo:external-graphic src="{$src}" width="100%" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Image {@alt}"/>  <!-- src="{@src}" -->
 		</fo:block>
 	</xsl:template>
 	
@@ -1661,14 +1821,14 @@
 			<xsl:variable name="number">
 				<xsl:number level="any" count="iso:bibitem/iso:note"/>
 			</xsl:variable>
-			<fo:inline font-size="85%" keep-with-previous.within-line="always" vertical-align="super"> <!--60% -->
+			<fo:inline font-size="8pt" keep-with-previous.within-line="always" baseline-shift="30%"> <!--85% vertical-align="super"-->
 				<fo:basic-link internal-destination="footnote_{../@id}" fox:alt-text="footnote {$number}">
 					<xsl:value-of select="$number"/><xsl:text>)</xsl:text>
 				</fo:basic-link>
 			</fo:inline>
 			<fo:footnote-body>
-				<fo:block font-size="10pt" margin-bottom="12pt">
-					<fo:inline id="footnote_{../@id}" keep-with-next.within-line="always" alignment-baseline="hanging" padding-right="9mm"><!-- font-size="60%"  -->
+				<fo:block font-size="10pt" margin-bottom="4pt" start-indent="0pt">
+					<fo:inline id="footnote_{../@id}" keep-with-next.within-line="always" alignment-baseline="hanging" padding-right="3mm"><!-- font-size="60%"  -->
 						<xsl:value-of select="$number"/><xsl:text>)</xsl:text>
 					</fo:inline>
 					<xsl:apply-templates/>
@@ -1680,7 +1840,7 @@
 	
 	
 	<xsl:template match="iso:ul | iso:ol">
-		<fo:list-block provisional-distance-between-starts="7mm">
+		<fo:list-block provisional-distance-between-starts="7mm" margin-top="8pt"> <!-- margin-bottom="8pt" -->
 			<xsl:apply-templates/>
 		</fo:list-block>
 		<xsl:for-each select="./iso:note//iso:p">
@@ -1694,22 +1854,7 @@
 		<fo:list-item id="{@id}">
 			<fo:list-item-label end-indent="label-end()">
 				<fo:block>
-					<xsl:choose>
-						<xsl:when test="local-name(..) = 'ul'">—</xsl:when> <!-- dash -->
-						<xsl:otherwise> <!-- for ordered lists -->
-							<xsl:choose>
-								<xsl:when test="../@type = 'arabic'">
-									<xsl:number format="a)"/>
-								</xsl:when>
-								<xsl:when test="../@type = 'alphabet'">
-									<xsl:number format="a)"/>
-								</xsl:when>
-								<xsl:otherwise>
-									<xsl:number format="1."/>
-								</xsl:otherwise>
-							</xsl:choose>
-						</xsl:otherwise>
-					</xsl:choose>
+					<xsl:call-template name="getListItemFormat"/>
 				</fo:block>
 			</fo:list-item-label>
 			<fo:list-item-body start-indent="body-start()">
@@ -1719,19 +1864,13 @@
 		</fo:list-item>
 	</xsl:template>
 	
-	<xsl:template match="iso:link">
-		<fo:inline>
-			<fo:basic-link external-destination="{@target}" color="blue" text-decoration="underline" fox:alt-text="{@target}">
-				<xsl:choose>
-					<xsl:when test="normalize-space(.) = ''">
-						<xsl:value-of select="@target"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:apply-templates/>
-					</xsl:otherwise>
-				</xsl:choose>
-			</fo:basic-link>
-		</fo:inline>
+	<xsl:template match="iso:term">
+		<xsl:param name="sectionNum"/>
+		<fo:block margin-bottom="10pt">
+			<xsl:apply-templates>
+				<xsl:with-param name="sectionNum" select="$sectionNum"/>
+			</xsl:apply-templates>
+		</fo:block>
 	</xsl:template>
 	
 	<xsl:template match="iso:preferred">
@@ -1739,7 +1878,13 @@
 		<fo:block line-height="1.1">
 			<fo:block font-weight="bold" keep-with-next="always">
 				<fo:inline id="{../@id}">
-					<xsl:value-of select="$sectionNum"/>.<xsl:number count="iso:term"/>
+					<xsl:variable name="section">
+						<xsl:call-template name="getSection">
+							<xsl:with-param name="sectionNum" select="$sectionNum"/>
+						</xsl:call-template>
+					</xsl:variable>
+					<xsl:value-of select="$section"/>
+					<!-- <xsl:value-of select="$sectionNum"/>.<xsl:number count="iso:term"/> -->
 				</fo:inline>
 			</fo:block>
 			<fo:block font-weight="bold" keep-with-next="always">
@@ -1773,14 +1918,17 @@
 	</xsl:template>
 	
 	<xsl:template match="iso:termsource">
-		<fo:block margin-bottom="8pt" keep-with-previous="always">
+		<fo:block margin-bottom="8pt"> <!-- keep-with-previous="always" -->
 			<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->
 			<fo:basic-link internal-destination="{iso:origin/@bibitemid}" fox:alt-text="{iso:origin/@citeas}">
 				<xsl:text>[SOURCE: </xsl:text>
 				<xsl:value-of select="iso:origin/@citeas"/>
-				<xsl:if test="iso:origin/iso:locality/iso:referenceFrom">
+				
+				<xsl:apply-templates select="iso:origin/iso:localityStack"/>
+				
+				<!-- <xsl:if test="iso:origin/iso:locality/iso:referenceFrom">
 					<xsl:text>, </xsl:text><xsl:value-of select="iso:origin/iso:locality/iso:referenceFrom"/>
-				</xsl:if>
+				</xsl:if> -->
 			</fo:basic-link>
 			<xsl:apply-templates select="iso:modification"/>
 			<xsl:text>]</xsl:text>
@@ -1796,7 +1944,7 @@
 	</xsl:template>
 	
 	<xsl:template match="iso:termnote">
-		<fo:block font-size="10pt" margin-bottom="12pt">
+		<fo:block font-size="10pt" margin-top="8pt" margin-bottom="8pt" text-align="justify">
 			<xsl:text>Note </xsl:text>
 			<xsl:number/>
 			<xsl:text> to entry: </xsl:text>
@@ -1806,6 +1954,10 @@
 	
 	<xsl:template match="iso:termnote/iso:p">
 		<fo:inline><xsl:apply-templates/></fo:inline>
+		<!-- <xsl:if test="following-sibling::* and not(following-sibling::iso:p)">
+			<xsl:value-of select="$linebreak"/>
+			<xsl:value-of select="$linebreak"/>
+		</xsl:if> -->
 	</xsl:template>
 	
 	<xsl:template match="iso:domain">
@@ -1814,8 +1966,13 @@
 	
 	
 	<xsl:template match="iso:termexample">
-		<fo:block font-size="10pt" margin-bottom="12pt">
-			<fo:inline padding-right="10mm">EXAMPLE</fo:inline>
+		<fo:block font-size="10pt" margin-top="8pt" margin-bottom="8pt" text-align="justify">
+			<fo:inline padding-right="5mm">
+				<xsl:text>EXAMPLE </xsl:text>
+				<xsl:if test="count(ancestor::iso:term[1]//iso:termexample) &gt; 1">
+					<xsl:number/>
+				</xsl:if>
+			</fo:inline>
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
@@ -1855,9 +2012,11 @@
 						<xsl:if test="iso:docidentifier">
 							<xsl:choose>
 								<xsl:when test="iso:docidentifier/@type = 'metanorma'"/>
-								<xsl:otherwise><fo:inline><xsl:value-of select="iso:docidentifier"/>, </fo:inline></xsl:otherwise>
+								<xsl:otherwise><fo:inline><xsl:value-of select="iso:docidentifier"/></fo:inline></xsl:otherwise>
 							</xsl:choose>
 						</xsl:if>
+						<xsl:apply-templates select="iso:note"/>
+						<xsl:if test="iso:docidentifier">, </xsl:if>
 						<xsl:choose>
 							<xsl:when test="iso:title[@type = 'main' and @language = 'en']">
 								<xsl:apply-templates select="iso:title[@type = 'main' and @language = 'en']"/>
@@ -1900,10 +2059,7 @@
 	<xsl:template match="iso:source">
 		<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
 			<xsl:value-of select="@citeas" disable-output-escaping="yes"/>
-			<xsl:if test="iso:locality">
-				<xsl:text>, </xsl:text>
-				<xsl:apply-templates select="iso:locality"/>
-			</xsl:if>
+			<xsl:apply-templates select="iso:localityStack"/>
 		</fo:basic-link>
 	</xsl:template>
 	
@@ -1916,10 +2072,14 @@
 	</xsl:template>
 	
 	<xsl:template match="iso:appendix//iso:example">
-		<fo:block font-size="10pt" margin-bottom="12pt">
-			<xsl:text>EXAMPLE</xsl:text>
+		<fo:block font-size="10pt" margin-top="8pt" margin-bottom="8pt">
+			<xsl:variable name="claims_id" select="ancestor::iso:clause[1]/@id"/>
+			<xsl:text>EXAMPLE </xsl:text>
+			<xsl:if test="count(ancestor::iso:clause[1]//iso:example) &gt; 1">
+					<xsl:number count="iso:example[ancestor::iso:clause[@id = $claims_id]]" level="any"/><xsl:text> </xsl:text>
+				</xsl:if>
 			<xsl:if test="iso:name">
-				<xsl:text> — </xsl:text><xsl:apply-templates select="iso:name" mode="process"/>
+				<xsl:text>— </xsl:text><xsl:apply-templates select="iso:name" mode="process"/>
 			</xsl:if>
 		</fo:block>
 		<xsl:apply-templates/>
@@ -1970,17 +2130,35 @@
 	</xsl:template>
 	
 	<xsl:template match="iso:xref">
+		<xsl:param name="sectionNum"/>
+		
 		<xsl:variable name="target" select="normalize-space(@target)"/>
 		<fo:basic-link internal-destination="{$target}" fox:alt-text="{$target}">
 			<xsl:variable name="section" select="xalan:nodeset($contents)//item[@id = $target]/@section"/>
-			<xsl:if test="not(starts-with($section, 'Figure') or starts-with($section, 'Table'))">
+			<!-- <xsl:if test="not(starts-with($section, 'Figure') or starts-with($section, 'Table'))"> -->
 				<xsl:attribute name="color">blue</xsl:attribute>
 				<xsl:attribute name="text-decoration">underline</xsl:attribute>
-			</xsl:if>
+			<!-- </xsl:if> -->
 			<xsl:variable name="type" select="xalan:nodeset($contents)//item[@id = $target]/@type"/>
 			<xsl:variable name="root" select="xalan:nodeset($contents)//item[@id =$target]/@root"/>
+			<xsl:variable name="level" select="xalan:nodeset($contents)//item[@id =$target]/@level"/>
 			<xsl:choose>
-				<xsl:when test="$type = 'clause' and $root != 'annex'">Clause </xsl:when><!-- and not (ancestor::annex) -->
+				<xsl:when test="$type = 'clause' and $root != 'annex' and $level = 1">Clause </xsl:when><!-- and not (ancestor::annex) -->
+				<xsl:when test="$type = 'li'">
+					<xsl:attribute name="color">black</xsl:attribute>
+					<xsl:attribute name="text-decoration">none</xsl:attribute>
+					<xsl:variable name="parent_section" select="xalan:nodeset($contents)//item[@id =$target]/@parent_section"/>
+					<xsl:variable name="currentSection">
+						<xsl:call-template name="getSection"/>
+					</xsl:variable>
+					<xsl:if test="not(contains($parent_section, $currentSection))">
+						<fo:basic-link internal-destination="{$target}" fox:alt-text="{$target}">
+							<xsl:attribute name="color">blue</xsl:attribute>
+							<xsl:attribute name="text-decoration">underline</xsl:attribute>
+							<xsl:value-of select="$parent_section"/><xsl:text> </xsl:text>
+						</fo:basic-link>
+					</xsl:if>
+				</xsl:when>
 				<xsl:otherwise/> <!-- <xsl:value-of select="$type"/> -->
 			</xsl:choose>
 			<xsl:value-of select="$section"/>
@@ -2000,20 +2178,35 @@
 	</xsl:template>
 	
 	<xsl:template match="iso:example/iso:p">
-		<fo:block font-size="10pt">
-			<fo:inline padding-right="9mm">EXAMPLE</fo:inline>
+		<fo:block font-size="10pt" margin-top="8pt" margin-bottom="8pt">
+			<!-- <xsl:if test="ancestor::iso:li">
+				<xsl:attribute name="font-size">11pt</xsl:attribute>
+			</xsl:if> -->
+			<xsl:variable name="claims_id" select="ancestor::iso:clause[1]/@id"/>
+			<fo:inline padding-right="5mm">
+				<xsl:text>EXAMPLE </xsl:text>
+				<xsl:if test="count(ancestor::iso:clause[1]//iso:example) &gt; 1">
+					<xsl:number count="iso:example[ancestor::iso:clause[@id = $claims_id]]" level="any"/>
+				</xsl:if>
+			</fo:inline>
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
 	
 	<xsl:template match="iso:note/iso:p" name="note">
-		<fo:block font-size="10pt" margin-bottom="12pt">
-			<fo:inline padding-right="6mm">NOTE</fo:inline>
+		<fo:block font-size="10pt" margin-top="8pt" margin-bottom="12pt" text-align="justify">
+			<xsl:variable name="claims_id" select="ancestor::iso:clause[1]/@id"/>
+			<fo:inline padding-right="6mm">
+				<xsl:text>NOTE </xsl:text>
+				<xsl:if test="count(ancestor::iso:clause[1]//iso:note) &gt; 1">
+					<xsl:number count="iso:note[ancestor::iso:clause[@id = $claims_id]]" level="any"/>
+				</xsl:if>
+			</fo:inline>
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
 
-	<!-- <eref type="inline" bibitemid="ISO20483" citeas="ISO 20483:2013"><locality type="annex"><referenceFrom>C</referenceFrom></locality></eref> -->
+	<!-- <eref type="inline" bibitemid="IEC60050-113" citeas="IEC 60050-113:2011"><localityStack><locality type="clause"><referenceFrom>113-01-12</referenceFrom></locality></localityStack></eref> -->
 	<xsl:template match="iso:eref">
 		<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}"> <!-- font-size="9pt" color="blue" vertical-align="super" -->
 			<xsl:if test="@type = 'footnote'">
@@ -2022,30 +2215,32 @@
 				<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
 				<xsl:attribute name="vertical-align">super</xsl:attribute>
 			</xsl:if>
-			<xsl:if test="@type = 'inline'">
-				<xsl:attribute name="color">blue</xsl:attribute>
-				<xsl:attribute name="text-decoration">underline</xsl:attribute>
-			</xsl:if>
 			<!-- <xsl:if test="@type = 'inline'">
+				<xsl:attribute name="color">blue</xsl:attribute>
 				<xsl:attribute name="text-decoration">underline</xsl:attribute>
 			</xsl:if> -->
-			<xsl:value-of select="@citeas" disable-output-escaping="yes"/>
-			<xsl:if test="iso:locality">
-				<xsl:text>, </xsl:text>
-				<!-- <xsl:choose>
-						<xsl:when test="iso:locality/@type = 'section'">Section </xsl:when>
-						<xsl:when test="iso:locality/@type = 'clause'">Clause </xsl:when>
-						<xsl:otherwise></xsl:otherwise>
-					</xsl:choose> -->
-					<xsl:apply-templates select="iso:locality"/>
-			</xsl:if>
+			
+			<xsl:choose>
+				<xsl:when test="@citeas and normalize-space(text()) = ''">
+					<xsl:value-of select="@citeas" disable-output-escaping="yes"/>
+				</xsl:when>
+				<xsl:when test="@bibitemid and normalize-space(text()) = ''">
+					<xsl:value-of select="//iso:bibitem[@id = current()/@bibitemid]/iso:docidentifier"/>
+				</xsl:when>
+				<xsl:otherwise/>
+			</xsl:choose>
+			<xsl:apply-templates select="iso:localityStack"/>
+			<xsl:apply-templates select="text()"/>
 		</fo:basic-link>
 	</xsl:template>
 	
 	<xsl:template match="iso:locality">
 		<xsl:choose>
+			<xsl:when test="ancestor::iso:termsource"/>
+			<xsl:when test="@type ='clause' and ancestor::iso:eref"/>
 			<xsl:when test="@type ='clause'">Clause </xsl:when>
 			<xsl:when test="@type ='annex'">Annex </xsl:when>
+			<xsl:when test="@type ='table'">Table </xsl:when>
 			<xsl:otherwise><xsl:value-of select="@type"/></xsl:otherwise>
 		</xsl:choose>
 		<xsl:text> </xsl:text><xsl:value-of select="iso:referenceFrom"/>
@@ -2119,7 +2314,7 @@
 							</fo:table-cell>
 							<fo:table-cell display-align="center">
 								<fo:block font-size="11pt" font-weight="bold" text-align="center">
-									<xsl:if test="$stage-name = 'IS'">
+									<xsl:if test="$stage-abbreviation = 'PRF'">
 										<xsl:value-of select="$proof-text"/>
 									</xsl:if>
 								</fo:block>
@@ -2136,16 +2331,8 @@
 			<fo:block-container margin-top="13mm" height="9mm" width="172mm" border-top="0.5mm solid black" border-bottom="0.5mm solid black" display-align="center" background-color="white">
 				<fo:block text-align-last="justify" font-size="12pt" font-weight="bold">
 					
-					<xsl:variable name="stgname" select="normalize-space(xalan:nodeset($stage-name-uppercased)/item[@name = $stage-name and @show = 'true']/@header)"/>
-					<xsl:if test="$stgname != ''">
-					<!-- <xsl:if test="$stage-name = 'final-draft' or $stage-name = 'draft'"> -->
-						<!-- <fo:inline><xsl:value-of select="translate(translate($stage-name,'-',' '), $lower,$upper)"/></fo:inline> -->
-						<fo:inline><xsl:value-of select="$stgname"/></fo:inline>
-						<!-- <xsl:text>&#xA0;</xsl:text> -->
-					</xsl:if>
-					<xsl:if test="$stgname = ''">
-						<fo:inline><xsl:value-of select="$doctype_uppercased"/></fo:inline>
-					</xsl:if>
+					<xsl:value-of select="$stagename-header-firstpage"/>
+					
 					<fo:inline keep-together.within-line="always">
 						<fo:leader leader-pattern="space"/>
 						<fo:inline><xsl:value-of select="$ISOname"/></fo:inline>
@@ -2171,7 +2358,7 @@
 							</fo:table-cell>
 							<fo:table-cell display-align="center">
 								<fo:block font-size="11pt" font-weight="bold" text-align="center">
-									<xsl:if test="$stage-name = 'IS'">
+									<xsl:if test="$stage-abbreviation = 'PRF'">
 										<xsl:value-of select="$proof-text"/>
 									</xsl:if>
 								</fo:block>
@@ -2244,7 +2431,7 @@
 						</xsl:when>
 						<xsl:when test="$level &gt;= 2">
 							<xsl:variable name="num">
-								<xsl:number format=".1" level="multiple" count="iso:clause/iso:clause | iso:clause/iso:terms | iso:terms/iso:term | iso:clause/iso:term"/>
+								<xsl:number format=".1" level="multiple" count="iso:clause/iso:clause |                                            iso:clause/iso:terms |                                            iso:terms/iso:term |                                            iso:clause/iso:term |                                             iso:terms/iso:clause |                                           iso:terms/iso:definitions |                                           iso:definitions/iso:clause |                                           iso:clause/iso:definitions"/>
 							</xsl:variable>
 							<xsl:value-of select="concat($sectionNum, $num)"/>
 						</xsl:when>
@@ -2265,12 +2452,13 @@
 					</xsl:choose>
 				</xsl:when> -->
 				<xsl:when test="ancestor::iso:annex">
+					<xsl:variable name="annexid" select="normalize-space(/iso:iso-standard/iso:bibdata/iso:ext/iso:structuredidentifier/iso:annexid)"/>
 					<xsl:choose>
 						<xsl:when test="$level = 1">
 							<xsl:text>Annex </xsl:text>
 							<xsl:choose>
-								<xsl:when test="count(//iso:annex) = 1">
-									<xsl:value-of select="/iso:iso-standard/iso:bibdata/iso:ext/iso:structuredidentifier/iso:annexid"/>
+								<xsl:when test="count(//iso:annex) = 1 and $annexid != ''">
+									<xsl:value-of select="$annexid"/>
 								</xsl:when>
 								<xsl:otherwise>
 									<xsl:number format="A" level="any" count="iso:annex"/>
@@ -2278,9 +2466,10 @@
 							</xsl:choose>
 						</xsl:when>
 						<xsl:otherwise>
+							<xsl:variable name="annexid" select="normalize-space(/iso:iso-standard/iso:bibdata/iso:ext/iso:structuredidentifier/iso:annexid)"/>
 							<xsl:choose>
-								<xsl:when test="count(//iso:annex) = 1">
-									<xsl:value-of select="/iso:iso-standard/iso:bibdata/iso:ext/iso:structuredidentifier/iso:annexid"/><xsl:number format=".1" level="multiple" count="iso:clause"/>
+								<xsl:when test="count(//iso:annex) = 1 and $annexid != ''">
+									<xsl:value-of select="$annexid"/><xsl:number format=".1" level="multiple" count="iso:clause"/>
 								</xsl:when>
 								<xsl:otherwise>
 									<xsl:number format="A.1" level="multiple" count="iso:annex | iso:clause"/>
@@ -2896,11 +3085,116 @@
 			ubYJPnswvSFSFVBu3ryZJ5fj+e+//wVuVmgt0lkFPgAAAABJRU5ErkJggg==
 		</xsl:text>
 	</xsl:variable>
-<xsl:variable xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="lower">abcdefghijklmnopqrstuvwxyz</xsl:variable><xsl:variable xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="upper">ABCDEFGHIJKLMNOPQRSTUVWXYZ</xsl:variable><xsl:variable xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="en_chars" select="concat($lower,$upper,',.`1234567890-=~!@#$%^*()_+[]{}\|?/')"/><xsl:variable xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="linebreak" select="'&#8232;'"/><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="text()">
+	
+		<xsl:template name="number-to-words">
+		<xsl:param name="number"/>
+		<xsl:variable name="words">
+			<words>
+				<word cardinal="1">One-</word>
+				<word ordinal="1">First </word>
+				<word cardinal="2">Two-</word>
+				<word ordinal="2">Second </word>
+				<word cardinal="3">Three-</word>
+				<word ordinal="3">Third </word>
+				<word cardinal="4">Four-</word>
+				<word ordinal="4">Fourth </word>
+				<word cardinal="5">Five-</word>
+				<word ordinal="5">Fifth </word>
+				<word cardinal="6">Six-</word>
+				<word ordinal="6">Sixth </word>
+				<word cardinal="7">Seven-</word>
+				<word ordinal="7">Seventh </word>
+				<word cardinal="8">Eight-</word>
+				<word ordinal="8">Eighth </word>
+				<word cardinal="9">Nine-</word>
+				<word ordinal="9">Ninth </word>
+				<word ordinal="10">Tenth </word>
+				<word ordinal="11">Eleventh </word>
+				<word ordinal="12">Twelfth </word>
+				<word ordinal="13">Thirteenth </word>
+				<word ordinal="14">Fourteenth </word>
+				<word ordinal="15">Fifteenth </word>
+				<word ordinal="16">Sixteenth </word>
+				<word ordinal="17">Seventeenth </word>
+				<word ordinal="18">Eighteenth </word>
+				<word ordinal="19">Nineteenth </word>
+				<word cardinal="20">Twenty-</word>
+				<word ordinal="20">Twentieth </word>
+				<word cardinal="30">Thirty-</word>
+				<word ordinal="30">Thirtieth </word>
+				<word cardinal="40">Forty-</word>
+				<word ordinal="40">Fortieth </word>
+				<word cardinal="50">Fifty-</word>
+				<word ordinal="50">Fiftieth </word>
+				<word cardinal="60">Sixty-</word>
+				<word ordinal="60">Sixtieth </word>
+				<word cardinal="70">Seventy-</word>
+				<word ordinal="70">Seventieth </word>
+				<word cardinal="80">Eighty-</word>
+				<word ordinal="80">Eightieth </word>
+				<word cardinal="90">Ninety-</word>
+				<word ordinal="90">Ninetieth </word>
+				<word cardinal="100">Hundred-</word>
+				<word ordinal="100">Hundredth </word>
+			</words>
+		</xsl:variable>
+
+		<xsl:variable name="ordinal" select="xalan:nodeset($words)//word[@ordinal = $number]/text()"/>
+
+		<xsl:choose>
+			<xsl:when test="$ordinal != ''">
+				<xsl:value-of select="$ordinal"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:choose>
+					<xsl:when test="$number &lt; 100">
+						<xsl:variable name="decade" select="concat(substring($number,1,1), '0')"/>
+						<xsl:variable name="digit" select="substring($number,2)"/>
+						<xsl:value-of select="xalan:nodeset($words)//word[@cardinal = $decade]/text()"/>
+						<xsl:value-of select="xalan:nodeset($words)//word[@ordinal = $digit]/text()"/>
+					</xsl:when>
+					<xsl:otherwise>
+						<!-- more 100 -->
+						<xsl:variable name="hundred" select="substring($number,1,1)"/>
+						<xsl:variable name="digits" select="number(substring($number,2))"/>
+						<xsl:value-of select="xalan:nodeset($words)//word[@cardinal = $hundred]/text()"/>
+						<xsl:value-of select="xalan:nodeset($words)//word[@cardinal = '100']/text()"/>
+						<xsl:call-template name="number-to-words">
+							<xsl:with-param name="number" select="$digits"/>
+						</xsl:call-template>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+	
+	<xsl:template name="printEdition">
+		<xsl:variable name="edition" select="normalize-space(/iso:iso-standard/iso:bibdata/iso:edition)"/>
+		<xsl:text> </xsl:text>
+		<xsl:choose>
+			<xsl:when test="number($edition) = $edition">
+				<xsl:call-template name="number-to-words">
+					<xsl:with-param name="number" select="$edition"/>
+				</xsl:call-template>
+			</xsl:when>
+			<xsl:when test="$edition != ''">
+				<xsl:value-of select="$edition"/>
+			</xsl:when>
+		</xsl:choose>
+		<xsl:if test="$edition != ''"><xsl:text> edition</xsl:text></xsl:if>
+	</xsl:template>
+	
+<xsl:variable xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="lower">abcdefghijklmnopqrstuvwxyz</xsl:variable><xsl:variable xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="upper">ABCDEFGHIJKLMNOPQRSTUVWXYZ</xsl:variable><xsl:variable xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="en_chars" select="concat($lower,$upper,',.`1234567890-=~!@#$%^*()_+[]{}\|?/')"/><xsl:variable xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="linebreak" select="'&#8232;'"/><xsl:attribute-set xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="link-style">
+		
+			<xsl:attribute name="color">blue</xsl:attribute>
+			<xsl:attribute name="text-decoration">underline</xsl:attribute>
+		
+		
+	</xsl:attribute-set><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="text()">
 		<xsl:value-of select="."/>
 	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='br']">
 		<xsl:value-of select="$linebreak"/>
-	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='td']//text() | *[local-name()='th']//text()" priority="1">
+	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='td']//text() | *[local-name()='th']//text() | *[local-name()='dt']//text() | *[local-name()='dd']//text()" priority="1">
 		<xsl:call-template name="add-zero-spaces"/>
 	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='table']">
 	
@@ -2916,9 +3210,9 @@
 	
 		<!-- <xsl:variable name="namespace" select="substring-before(name(/*), '-')"/> -->
 		
-		
-			<fo:block space-before="6pt"> </fo:block>				
-		
+		<!-- <xsl:if test="$namespace = 'iso'">
+			<fo:block space-before="6pt">&#xA0;</fo:block>				
+		</xsl:if> -->
 		
 		<xsl:choose>
 			<xsl:when test="@unnumbered = 'true'"/>
@@ -2928,6 +3222,10 @@
 				
 					<fo:block font-weight="bold" text-align="center" margin-bottom="6pt" keep-with-next="always">
 						
+							<xsl:attribute name="margin-top">12pt</xsl:attribute>
+						
+						
+						
 						
 						
 						
@@ -2939,7 +3237,10 @@
 							</xsl:when>
 							<xsl:when test="ancestor::*[local-name()='annex']">
 								
-									<xsl:number format="A." count="*[local-name()='annex']"/><xsl:number format="1"/>
+									<xsl:variable name="annex-id" select="ancestor::iso:annex/@id"/>
+									<xsl:number format="A." count="*[local-name()='annex']"/><xsl:number format="1" level="any" count="iso:table[(not(@unnumbered) or @unnumbered != 'true') and ancestor::iso:annex[@id = $annex-id]]"/>
+								
+								
 								
 								
 								
@@ -2999,11 +3300,11 @@
 			</xsl:call-template>
 		</xsl:variable>
 		
-		<xsl:variable name="colwidths2">
+		<!-- <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>
+		</xsl:variable> -->
 		
 		<!-- cols-count=<xsl:copy-of select="$cols-count"/>
 		colwidthsNew=<xsl:copy-of select="$colwidths"/>
@@ -3023,13 +3324,22 @@
 			
 			
 			
-			<fo:table id="{@id}" table-layout="fixed" width="100%" margin-left="{$margin-left}mm" margin-right="{$margin-left}mm">
+			
+				<xsl:attribute name="margin-left">0mm</xsl:attribute>
+				<xsl:attribute name="margin-right">0mm</xsl:attribute>
+				<xsl:attribute name="margin-bottom">8pt</xsl:attribute>
+			
+			<fo:table id="{@id}" table-layout="fixed" width="100%" margin-left="{$margin-left}mm" margin-right="{$margin-left}mm" table-omit-footer-at-break="true">
 				
 					<xsl:attribute name="border">1.5pt solid black</xsl:attribute>
 				
 				
 				
 				
+					<xsl:attribute name="margin-left">0mm</xsl:attribute>
+					<xsl:attribute name="margin-right">0mm</xsl:attribute>
+				
+				
 				
 				
 				
@@ -3049,6 +3359,9 @@
 				</xsl:for-each>
 				<xsl:apply-templates/>
 			</fo:table>
+			
+			
+			
 		</fo:block-container>
 	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='table']/*[local-name()='name']"/><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='table']/*[local-name()='name']" mode="process">
 		<xsl:apply-templates/>
@@ -3102,9 +3415,13 @@
 					</xsl:when>
 					<xsl:otherwise>
 						<xsl:for-each select="xalan:nodeset($table)//tr">
+							<xsl:variable name="td_text">
+								<xsl:apply-templates select="td[$curr-col]" mode="td_text"/>
+							</xsl:variable>
 							<xsl:variable name="words">
 								<xsl:call-template name="tokenize">
-									<xsl:with-param name="text" select="translate(td[$curr-col],'- —:', '    ')"/>
+									<!-- <xsl:with-param name="text" select="translate(td[$curr-col],'- —:', '    ')"/> -->
+									<xsl:with-param name="text" select="translate(normalize-space($td_text),'- —:', '    ')"/>
 								</xsl:call-template>
 							</xsl:variable>
 							<xsl:variable name="max_length">
@@ -3145,60 +3462,84 @@
 				<xsl:with-param name="table" select="$table"/>
 			</xsl:call-template>
 		</xsl:if>
+	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="text()" mode="td_text">
+		<xsl:variable name="zero-space">​</xsl:variable>
+		<xsl:value-of select="translate(., $zero-space, ' ')"/><xsl:text> </xsl:text>
 	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='table2']"/><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='thead']"/><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='thead']" mode="process">
-		<!-- <fo:table-header font-weight="bold">
-			<xsl:apply-templates />
-		</fo:table-header> -->
-		<xsl:apply-templates/>
+		<!-- font-weight="bold" -->
+		<fo:table-header>
+			<xsl:apply-templates/>
+		</fo:table-header>
 	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='tfoot']"/><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='tfoot']" mode="process">
 		<xsl:apply-templates/>
+	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="insertTableFooter">
+		<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
+		<xsl:if test="../*[local-name()='tfoot'] or           $isNoteOrFnExist = 'true'">
+		
+			<fo:table-footer>
+			
+				<xsl:apply-templates select="../*[local-name()='tfoot']" mode="process"/>
+				
+				<!-- if there are note(s) or fn(s) then create footer row -->
+				<xsl:if test="$isNoteOrFnExist = 'true'">
+				
+					<xsl:variable name="cols-count">
+						<xsl:choose>
+							<xsl:when test="../*[local-name()='thead']">
+								<!-- <xsl:value-of select="count(../*[local-name()='thead']/*[local-name()='tr']/*[local-name()='th'])"/> -->
+								<xsl:call-template name="calculate-columns-numbers">
+									<xsl:with-param name="table-row" select="../*[local-name()='thead']/*[local-name()='tr'][1]"/>
+								</xsl:call-template>
+							</xsl:when>
+							<xsl:otherwise>
+								<!-- <xsl:value-of select="count(./*[local-name()='tr'][1]/*[local-name()='td'])"/> -->
+								<xsl:call-template name="calculate-columns-numbers">
+									<xsl:with-param name="table-row" select="./*[local-name()='tr'][1]"/>
+								</xsl:call-template>
+							</xsl:otherwise>
+						</xsl:choose>
+					</xsl:variable>
+				
+					<fo:table-row>
+						<fo:table-cell border="solid black 1pt" padding-left="1mm" padding-right="1mm" padding-top="1mm" number-columns-spanned="{$cols-count}">
+							
+								<xsl:attribute name="border-top">solid black 0pt</xsl:attribute>
+							
+							
+							
+							<!-- fn will be processed inside 'note' processing -->
+							
+							
+							<!-- except gb -->
+							
+								<xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
+							
+							
+							<!-- horizontal row separator -->
+							
+							
+							<!-- fn processing -->
+							<xsl:call-template name="fn_display"/>
+							
+						</fo:table-cell>
+					</fo:table-row>
+					
+				</xsl:if>
+			</fo:table-footer>
+		
+		</xsl:if>
 	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='tbody']">
-		<xsl:variable name="cols-count">
-			<xsl:choose>
-				<xsl:when test="../*[local-name()='thead']">
-					<!-- <xsl:value-of select="count(../*[local-name()='thead']/*[local-name()='tr']/*[local-name()='th'])"/> -->
-					<xsl:call-template name="calculate-columns-numbers">
-						<xsl:with-param name="table-row" select="../*[local-name()='thead']/*[local-name()='tr'][1]"/>
-					</xsl:call-template>
-				</xsl:when>
-				<xsl:otherwise>
-					<!-- <xsl:value-of select="count(./*[local-name()='tr'][1]/*[local-name()='td'])"/> -->
-					<xsl:call-template name="calculate-columns-numbers">
-						<xsl:with-param name="table-row" select="./*[local-name()='tr'][1]"/>
-					</xsl:call-template>
-				</xsl:otherwise>
-			</xsl:choose>
-		</xsl:variable>
-	
+		
+		<xsl:apply-templates select="../*[local-name()='thead']" mode="process"/>
+		
+		<xsl:call-template name="insertTableFooter"/>
+		
 		<fo:table-body>
-			<xsl:apply-templates select="../*[local-name()='thead']" mode="process"/>
 			<xsl:apply-templates/>
-			<xsl:apply-templates select="../*[local-name()='tfoot']" mode="process"/>
-			<!-- if there are note(s) or fn(s) then create footer row -->
-			<xsl:if test="../*[local-name()='note'] or ..//*[local-name()='fn'][local-name(..) != 'name']">
-				<fo:table-row>
-					<fo:table-cell border="solid black 1pt" padding-left="1mm" padding-right="1mm" padding-top="1mm" number-columns-spanned="{$cols-count}">
-						
-							<xsl:attribute name="border-top">solid black 0pt</xsl:attribute>
-						
-						
-						
-						<!-- fn will be processed inside 'note' processing -->
-						
-						
-						<xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
-						
-						<!-- horizontal row separator -->
-						
-						
-						<!-- fn processing -->
-						<xsl:call-template name="fn_display"/>
-						
-					</fo:table-cell>
-				</fo:table-row>
-				
-			</xsl:if>
+			<!-- <xsl:apply-templates select="../*[local-name()='tfoot']" mode="process"/> -->
+		
 		</fo:table-body>
+		
 	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='tr']">
 		<xsl:variable name="parent-name" select="local-name(..)"/>
 		<!-- <xsl:variable name="namespace" select="substring-before(name(/*), '-')"/> -->
@@ -3235,6 +3576,7 @@
 					
 				</xsl:if>
 				
+				
 			<xsl:apply-templates/>
 		</fo:table-row>
 	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='th']">
@@ -3277,6 +3619,8 @@
 			
 			
 			
+			
+			
 			<xsl:if test="@colspan">
 				<xsl:attribute name="number-columns-spanned">
 					<xsl:value-of select="@colspan"/>
@@ -3312,11 +3656,18 @@
 					<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 				
 				
+				
 				<fo:inline padding-right="2mm">
+					
 					<xsl:text>NOTE </xsl:text>
 					
+						<xsl:variable name="id" select="ancestor::*[local-name() = 'table'][1]/@id"/>
+						<xsl:if test="count(//*[local-name()='note'][ancestor::*[@id = $id]]) &gt; 1">
+							<xsl:number count="*[local-name()='note'][ancestor::*[@id = $id]]" level="any"/>
+						</xsl:if>
+						
+					
 					
-						<xsl:number format="1 "/>
 					
 				</fo:inline>
 				<xsl:apply-templates mode="process"/>
@@ -3343,6 +3694,7 @@
 						<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 					
 					
+					
 					<fo:inline font-size="80%" padding-right="5mm" id="{@id}">
 						
 						
@@ -3351,6 +3703,7 @@
 						
 						
 						
+						
 						<xsl:value-of select="@reference"/>
 						
 					</fo:inline>
@@ -3440,6 +3793,7 @@
 			
 			
 			
+			
 			<fo:basic-link internal-destination="{@reference}_{ancestor::*[@id][1]/@id}" fox:alt-text="{@reference}"> <!-- @reference   | ancestor::*[local-name()='clause'][1]/@id-->
 				
 				<xsl:value-of select="@reference"/>
@@ -3465,7 +3819,7 @@
 					<fo:block margin-bottom="12pt" text-align="left">
 						
 							<xsl:attribute name="margin-bottom">0</xsl:attribute>
-						
+												
 						<xsl:text>where </xsl:text>
 						<xsl:apply-templates select="*[local-name()='dt']/*"/>
 						<xsl:text/>
@@ -3480,6 +3834,7 @@
 					
 					
 					
+					
 					<xsl:text>where</xsl:text>
 				</fo:block>
 			</xsl:when>
@@ -3490,6 +3845,7 @@
 						<xsl:attribute name="margin-bottom">0</xsl:attribute>
 					
 					
+					
 					<xsl:text>Key</xsl:text>
 				</fo:block>
 			</xsl:when>
@@ -3502,12 +3858,13 @@
 					<xsl:if test="$parent = 'formula'">
 						<xsl:attribute name="margin-left">4mm</xsl:attribute>
 					</xsl:if>
-				
+					<xsl:attribute name="margin-top">12pt</xsl:attribute>
 				
 				
 				
 				<fo:block>
 					
+					
 					<!-- create virtual html table for dl/[dt and dd] -->
 					<xsl:variable name="html-table">
 						<xsl:variable name="ns" select="substring-before(name(/*), '-')"/>
@@ -3527,6 +3884,7 @@
 					<!-- colwidths=<xsl:value-of select="$colwidths"/> -->
 					
 					<fo:table width="95%" table-layout="fixed">
+						
 						<xsl:choose>
 							<xsl:when test="normalize-space($key_iso) = 'true' and $parent = 'formula'">
 								<!-- <xsl:attribute name="font-size">11pt</xsl:attribute> -->
@@ -3626,6 +3984,9 @@
 			<fo:table-cell>
 				<fo:block margin-top="6pt">
 					
+						<xsl:attribute name="margin-top">0pt</xsl:attribute>
+					
+					
 					<xsl:if test="normalize-space($key_iso) = 'true'">
 						<xsl:attribute name="margin-top">0</xsl:attribute>
 						
@@ -3633,6 +3994,7 @@
 					
 					
 					<xsl:apply-templates/>
+					
 				</fo:block>
 			</fo:table-cell>
 			<fo:table-cell>
@@ -3651,7 +4013,7 @@
 	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='dd']"/><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='dd']" mode="process">
 		<xsl:apply-templates/>
 	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='dd']/*[local-name()='p']" mode="inline">
-		<fo:inline><xsl:apply-templates/></fo:inline>
+		<fo:inline><xsl:text> </xsl:text><xsl:apply-templates/></fo:inline>
 	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='em']">
 		<fo:inline font-style="italic">
 			<xsl:apply-templates/>
@@ -3766,6 +4128,7 @@
 		<xsl:variable name="zero-space-after-dot">.</xsl:variable>
 		<xsl:variable name="zero-space-after-colon">:</xsl:variable>
 		<xsl:variable name="zero-space-after-equal">=</xsl:variable>
+		<xsl:variable name="zero-space-after-underscore">_</xsl:variable>
 		<xsl:variable name="zero-space">​</xsl:variable>
 		<xsl:choose>
 			<xsl:when test="contains($text, $zero-space-after-chars)">
@@ -3800,6 +4163,14 @@
 					<xsl:with-param name="text" select="substring-after($text, $zero-space-after-equal)"/>
 				</xsl:call-template>
 			</xsl:when>
+			<xsl:when test="contains($text, $zero-space-after-underscore)">
+				<xsl:value-of select="substring-before($text, $zero-space-after-underscore)"/>
+				<xsl:value-of select="$zero-space-after-underscore"/>
+				<xsl:value-of select="$zero-space"/>
+				<xsl:call-template name="add-zero-spaces">
+					<xsl:with-param name="text" select="substring-after($text, $zero-space-after-underscore)"/>
+				</xsl:call-template>
+			</xsl:when>
 			<xsl:otherwise>
 				<xsl:value-of select="$text"/>
 			</xsl:otherwise>
@@ -3976,4 +4347,40 @@
 				<xsl:copy-of select="."/>
 			</fo:instream-foreign-object>
 		</fo:inline>
+	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='localityStack']">
+		<xsl:for-each select="*[local-name()='locality']">
+			<xsl:if test="position() =1"><xsl:text>, </xsl:text></xsl:if>
+			<xsl:apply-templates select="."/>
+			<xsl:if test="position() != last()"><xsl:text>; </xsl:text></xsl:if>
+		</xsl:for-each>
+	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='link']" name="link">
+		<xsl:variable name="target">
+			<xsl:choose>
+				<xsl:when test="starts-with(normalize-space(@target), 'mailto:')">
+					<xsl:value-of select="normalize-space(substring-after(@target, 'mailto:'))"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="normalize-space(@target)"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<fo:inline xsl:use-attribute-sets="link-style">
+			<xsl:choose>
+				<xsl:when test="$target = ''">
+					<xsl:apply-templates/>
+				</xsl:when>
+				<xsl:otherwise>
+					<fo:basic-link external-destination="{@target}" fox:alt-text="{@target}">
+						<xsl:choose>
+							<xsl:when test="normalize-space(.) = ''">
+								<xsl:value-of select="$target"/>
+							</xsl:when>
+							<xsl:otherwise>
+								<xsl:apply-templates/>
+							</xsl:otherwise>
+						</xsl:choose>
+					</fo:basic-link>
+				</xsl:otherwise>
+			</xsl:choose>
+		</fo:inline>
 	</xsl:template></xsl:stylesheet>