metanorma-unece 0.0.5 → 0.0.6

data/lib/isodoc/unece/html/html_unece_titlepage.html

@@ -46,8 +46,11 @@
 
   <div class="coverpage-stage-block" >
     <p><span class="coverpage-maturity" id="{{ status | replace: ' ', '-' | downcase }}">{% if unpublished %}{{ status }}{% endif %}</span></p>
-{% if security %}
-<p><span class="coverpage-maturity">Classification: {{ security }}</span></p>
+{% if submissionlanguage %}
+<p><span class="coverpage-maturity">Original: {{ submissionlanguage | join: "/" }}</span></p>
+{% endif %}
+{% if language %}
+<p><span class="coverpage-maturity">{{ language | join: ", " }} only</span></p>
 {% endif %}
 </div>
 

data/lib/isodoc/unece/html/unece.scss

@@ -498,7 +498,10 @@ p.Formula, li.Formula, div.Formula
 	mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh1;
 	mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h1;
 	mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef1;
-	mso-paper-source:0;}
+	mso-paper-source:0;
+        mso-footnote-numbering-style:chicago;
+	mso-footnote-numbering-restart:each-section;
+      }
 div.WordSection1
 	{page:WordSection1;}
 @page WordSection2
@@ -511,7 +514,9 @@ div.WordSection1
 	mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
 	mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef2;
 	mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f2;
-	mso-paper-source:0;}
+	mso-paper-source:0;
+	mso-footnote-numbering-restart:each-section;
+      }
 div.WordSection2
 	{page:WordSection2;}
 @page WordSection3
@@ -524,7 +529,9 @@ div.WordSection2
 	mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
 	mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef3;
 	mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f3;
-	mso-paper-source:0;}
+	mso-paper-source:0;
+	mso-footnote-numbering-restart:each-section;
+      }
 div.WordSection3
 	{page:WordSection3;}
 ol

data/lib/isodoc/unece/html/word_unece_plenary_titlepage.html

@@ -16,17 +16,25 @@ mso-bidi-font-size:12.0pt;font-family:"Times New Roman",serif'>Economic and
 Social Council</span></b><span lang=EN-AU style='font-family:"Times New Roman",serif'><span
 style='mso-tab-count:1'>               </span></span><span lang=EN-AU
 style='font-size:10.0pt;mso-bidi-font-size:12.0pt;font-family:"Times New Roman",serif'>Distr.:
-<span class=SpellE>{{ session_distribution }}</span><o:p></o:p></span></p>
+<span class=SpellE>{{ distribution }}</span><o:p></o:p></span></p>
 
 <p class=MsoNormal style='tab-stops:70.9pt 12.0cm'><span lang=EN-AU
 style='font-family:"Times New Roman",serif'><span style='mso-tab-count:1'>                        </span><span
 style='mso-tab-count:1'>                                                                                          </span></span><span
 lang=EN-AU style='font-size:10.0pt;mso-bidi-font-size:12.0pt;font-family:"Times New Roman",serif'>{{ revdate }}<o:p></o:p></span></p>
 
+{% if submissionlanguage %}
 <p class=MsoNormal style='tab-stops:70.9pt 12.0cm'><span lang=EN-AU
 style='font-family:"Times New Roman",serif'><span style='mso-tab-count:2'>                                                                                                                 </span></span><span
 lang=EN-AU style='font-size:10.0pt;mso-bidi-font-size:12.0pt;font-family:"Times New Roman",serif'>Original:
-{{ language }}<o:p></o:p></span></p>
+{{ submissionlanguage | join: "/" }}<o:p></o:p></span></p>
+{% endif %}
+
+{% if language %}
+<p class=MsoNormal style='tab-stops:70.9pt 12.0cm'><span lang=EN-AU
+style='font-family:"Times New Roman",serif'><span style='mso-tab-count:2'>                                                                                                                 </span></span><span
+lang=EN-AU style='font-size:10.0pt;mso-bidi-font-size:12.0pt;font-family:"Times New Roman",serif'>{{ language }} only<o:p></o:p></span></p>
+{% endif %}
 
 <p class=MsoNormal style='tab-stops:70.9pt 12.0cm'><span lang=EN-AU
 style='font-size:10.0pt;mso-bidi-font-size:12.0pt;font-family:"Times New Roman",serif'><o:p>&nbsp;</o:p></span></p>
@@ -62,14 +70,37 @@ font-family:"Times New Roman",serif'>{{ session_number }} session<o:p></o:p></sp
 padding:0cm;mso-padding-alt:1.0pt 0cm 0cm 0cm'><span lang=EN-AU
 style='font-size:10.5pt;mso-bidi-font-size:12.0pt;font-family:"Times New Roman",serif'>{{ session_date }}<o:p></o:p></span></p>
 
+{% if session_itemnumber.size == 1 %}
+<p class=MsoNormal style='border:none;mso-border-top-alt:solid windowtext 2.25pt;
+padding:0cm;mso-padding-alt:1.0pt 0cm 0cm 0cm'><span lang=EN-AU
+style='font-size:10.5pt;mso-bidi-font-size:12.0pt;font-family:"Times New Roman",serif'>Agenda item {{ session_itemnumber[0] }}<o:p></o:p></span></p>
+{% endif %}
+
+{% if session_itemnumber.size > 1 %}
+<p class=MsoNormal style='border:none;mso-border-top-alt:solid windowtext 2.25pt;
+padding:0cm;mso-padding-alt:1.0pt 0cm 0cm 0cm'><span lang=EN-AU
+style='font-size:10.5pt;mso-bidi-font-size:12.0pt;font-family:"Times New Roman",serif'>Agenda items {{ session_itemnumber | join: ", " }}<o:p></o:p></span></p>
+{% endif %}
+
 <p class=MsoNormal style='border:none;mso-border-top-alt:solid windowtext 2.25pt;
 padding:0cm;mso-padding-alt:1.0pt 0cm 0cm 0cm'><span lang=EN-AU
-style='font-size:10.5pt;mso-bidi-font-size:12.0pt;font-family:"Times New Roman",serif'>{{ docnumber }}<o:p></o:p></span></p>
+  style='font-size:10.5pt;mso-bidi-font-size:12.0pt;font-family:"Times New Roman",serif'>{{ docnumber }}{% if item_footnote %}<a
+style='mso-footnote-id:ftnitem' href="#ftnitem" name="_ftnrefitem" class="footnote" title=""><span
+                                                           class=MsoFootnoteReference><span style='mso-special-character:footnote'></span></span></a>{% endif %}<o:p></o:p></span></p>
 
+{% if session_itemname.size > 0 %}
 <p class=MsoNormal style='border:none;mso-border-top-alt:solid windowtext 2.25pt;
 padding:0cm;mso-padding-alt:1.0pt 0cm 0cm 0cm'><b style='mso-bidi-font-weight:
 normal'><span lang=EN-AU style='font-size:10.5pt;mso-bidi-font-size:12.0pt;
-font-family:"Times New Roman",serif'>{{ doctitle }}<o:p></o:p></span></b></p>
+font-family:"Times New Roman",serif'>{{ session_itemname | join: "<br/>" }}<o:p></o:p></span></b></p>
+{% endif %}
+
+{% if session_subitemname.size > 0 %}
+<p class=MsoNormal style='border:none;mso-border-top-alt:solid windowtext 2.25pt;
+padding:0cm;mso-padding-alt:1.0pt 0cm 0cm 0cm'><b style='mso-bidi-font-weight:
+normal'><span lang=EN-AU style='font-size:10.5pt;mso-bidi-font-size:12.0pt;
+font-family:"Times New Roman",serif'>{{ session_subitemname | join: "<br/>" }}<o:p></o:p></span></b></p>
+{% endif %}
 
 <p class=MsoNormal style='border:none;mso-border-top-alt:solid windowtext 2.25pt;
 padding:0cm;mso-padding-alt:1.0pt 0cm 0cm 0cm'><span lang=EN-AU

data/lib/isodoc/unece/html/word_unece_titlepage.html

@@ -1,6 +1,19 @@
 <p class="MsoNormal" align="center" style='text-align:center'><span lang="EN-GB" style='mso-no-proof:yes'><b>UNECE</b></span><br/>
 <span lang="EN-GB"><span style='mso-no-proof:yes'><b>{{ tc | join: "/" }}</b></span></p>
 
+{% if submissionlanguage %}
+<p class=MsoNormal style='tab-stops:70.9pt 12.0cm'><span lang=EN-AU
+style='font-family:"Times New Roman",serif'><span style='mso-tab-count:2'>?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?|  </span></span><span
+lang=EN-AU style='font-size:10.0pt;mso-bidi-font-size:12.0pt;font-family:"Times New Roman",serif'>Original:
+{{ submissionlanguage | join: "/" }}<o:p></o:p></span></p>
+{% endif %}
+
+{% if language %}
+<p class=MsoNormal style='tab-stops:70.9pt 12.0cm'><span lang=EN-AU
+style='font-family:"Times New Roman",serif'><span style='mso-tab-count:2'>?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?| ?|  </span></span><span
+lang=EN-AU style='font-size:10.0pt;mso-bidi-font-size:12.0pt;font-family:"Times New Roman",serif'>{{ language }} only<o:p></o:p></span></p>
+{% endif %}
+
 <p class="MsoNormal" align="center" style='text-align:center;line-height:18.0pt;margin-bottom:0.0pt'><b
 style='mso-bidi-font-weight:normal'><span lang="EN-GB" style='font-size:24.0pt'>{{ doctitle }}</span>
 </b><br/><span lang="EN-GB" style='font-size:16.0pt'>{{ docsubtitle }}</span></p>

data/lib/isodoc/unece/html_convert.rb

@@ -68,6 +68,9 @@ module IsoDoc
       def make_body(xml, docxml)
         plenary = docxml.at(ns("//bibdata[@type = 'plenary']"))
         body_attr = { lang: "EN-US", link: "blue", vlink: "#954F72", "xml:lang": "EN-US", class: "container" }
+        if plenary && @htmlcoverpage == html_doc_path("html_unece_titlepage.html")
+          @htmlcoverpage = html_doc_path("html_unece_plenary_titlepage.html")
+        end
         #@htmlintropage = nil if plenary
         xml.body **body_attr do |body|
           make_body1(body, docxml)

data/lib/isodoc/unece/metadata.rb

@@ -1,5 +1,6 @@
 require "isodoc"
 require "twitter_cldr"
+require "iso-639"
 
 module IsoDoc
   module Unece
@@ -20,17 +21,44 @@ module IsoDoc
         set(:docsubtitle, main)
       end
 
+      def extract_languages(nodeset)
+        lgs = []
+        nodeset.each do |l|
+          l && ISO_639&.find(l.text)&.english_name &&
+            lgs << ISO_639.find(l.text).english_name 
+        end
+        lgs.map { |l| l == "Spanish; Castilian" ? "Spanish" : l }
+      end
+
       def author(isoxml, _out)
         tc = isoxml.at(ns("//bibdata/editorialgroup/committee"))
         set(:tc, tc.text) if tc
+        set(:distribution, isoxml&.at(ns("//bibdata/distribution"))&.text)
+        lgs = extract_languages(isoxml.xpath(ns("//bibdata/language")))
+        lgs = [] if lgs.sort == %w(English French Arabic Chinese German Spanish).sort
+        slgs = extract_languages(isoxml.xpath(ns("//bibdata/submissionlanguage")))
+        lgs = [] if slgs.size == 1
+        set(:language, lgs) unless lgs.empty?
+        set(:submissionlanguage, slgs) unless slgs.empty?
+        session(isoxml, _out)
+      end
+
+      def multival(isoxml, xpath)
+        items = []
+        isoxml.xpath(ns(xpath)).each { |i| items << i.text }
+        items
+      end
+
+      def session(isoxml, _out)
         set(:session_number, isoxml&.at(ns("//bibdata/session/number"))&.text&.to_i&.
             localize&.to_rbnf_s("SpelloutRules", "spellout-ordinal")&.capitalize)
         set(:session_date, isoxml&.at(ns("//bibdata/session/date"))&.text)
-        set(:session_agendaitem, isoxml&.at(ns("//bibdata/session/agenda_item"))&.text)
         set(:session_collaborator, isoxml&.at(ns("//bibdata/session/collaborator"))&.text)
         set(:session_id, isoxml&.at(ns("//bibdata/session/id"))&.text)
-        set(:session_distribution, isoxml&.at(ns("//bibdata/session/distribution"))&.text)
-        set(:language, isoxml&.at(ns("//bibdata/language"))&.text)
+        set(:item_footnote, isoxml&.at(ns("//bibdata/session/item-footnote"))&.text)
+        set(:session_itemnumber, multival(isoxml, "//bibdata/session/item-number"))
+        set(:session_itemname, multival(isoxml, "//bibdata/session/item-name"))
+        set(:session_subitemname, multival(isoxml, "//bibdata/session/subitem-name"))
       end
 
       def docid(isoxml, _out)

data/lib/isodoc/unece/word_convert.rb

@@ -41,319 +41,331 @@ module IsoDoc
         @meta.set(:toc, @toc)
       end
 
-      def make_body(xml, docxml)
-        plenary = docxml.at(ns("//bibdata[@type = 'plenary']"))
-        if plenary && @wordcoverpage == html_doc_path("word_unece_titlepage.html")
-          @wordcoverpage = html_doc_path("word_unece_plenary_titlepage.html")
-        end
-        @wordintropage = nil if plenary && !@toc
-        body_attr = { lang: "EN-US", link: "blue", vlink: "#954F72" }
-        xml.body **body_attr do |body|
-          make_body1(body, docxml)
-          make_body2(body, docxml)
-          make_body3(body, docxml)
+      def footnotes(div)
+        if @meta.get[:item_footnote]
+          fn = noko do |xml|
+            xml.aside **{ id: "ftnitem" } do |div|
+              div.p @meta.get[:item_footnote]
+            end
+          end.join("\n")
+          @footnotes.unshift fn
         end
+        super
       end
 
-      def make_body2(body, docxml)
-        body.div **{ class: "WordSection2" } do |div2|
-          info docxml, div2
-          abstract docxml, div2
-          foreword docxml, div2
-          introduction docxml, div2
-          div2.p { |p| p << "&nbsp;" } # placeholder
-        end
-        section_break(body)
+    def make_body(xml, docxml)
+      plenary = docxml.at(ns("//bibdata[@type = 'plenary']"))
+      if plenary && @wordcoverpage == html_doc_path("word_unece_titlepage.html")
+        @wordcoverpage = html_doc_path("word_unece_plenary_titlepage.html")
+      end
+      @wordintropage = nil if plenary && !@toc
+      body_attr = { lang: "EN-US", link: "blue", vlink: "#954F72" }
+      xml.body **body_attr do |body|
+        make_body1(body, docxml)
+        make_body2(body, docxml)
+        make_body3(body, docxml)
+      end
+    end
+
+    def make_body2(body, docxml)
+      body.div **{ class: "WordSection2" } do |div2|
+        info docxml, div2
+        abstract docxml, div2
+        foreword docxml, div2
+        introduction docxml, div2
+        div2.p { |p| p << "&nbsp;" } # placeholder
       end
+      section_break(body)
+    end
 
-      ENDLINE = <<~END.freeze
+    ENDLINE = <<~END.freeze
       <v:line id="_x0000_s1026"
  alt="" style='position:absolute;left:0;text-align:left;z-index:251662848;
  mso-wrap-edited:f;mso-width-percent:0;mso-height-percent:0;
  mso-width-percent:0;mso-height-percent:0'
  from="6.375cm,20.95pt" to="10.625cm,20.95pt"
  strokeweight="1.5pt"/>
-      END
+    END
 
-      def end_line(_isoxml, out)
-        out.parent.add_child(ENDLINE)
-      end
+    def end_line(_isoxml, out)
+      out.parent.add_child(ENDLINE)
+    end
 
-      def middle(isoxml, out)
-        clause isoxml, out
-        annex isoxml, out
-        bibliography isoxml, out
-        end_line(isoxml, out)
-      end
+    def middle(isoxml, out)
+      clause isoxml, out
+      annex isoxml, out
+      bibliography isoxml, out
+      end_line(isoxml, out)
+    end
 
-      def clause_parse_title(node, div, c1, out)
-        if node["inline-header"] == "true"
-          inline_header_title(out, node, c1)
-        else
-          div.send "h#{get_anchors[node['id']][:level]}" do |h|
-            lbl = get_anchors[node['id']][:label]
-            h << "#{lbl}. " if lbl && !@suppressheadingnumbers
-            insert_tab(h, 1)
-            c1&.children&.each { |c2| parse(c2, h) }
-          end
+    def clause_parse_title(node, div, c1, out)
+      if node["inline-header"] == "true"
+        inline_header_title(out, node, c1)
+      else
+        div.send "h#{get_anchors[node['id']][:level]}" do |h|
+          lbl = get_anchors[node['id']][:label]
+          h << "#{lbl}. " if lbl && !@suppressheadingnumbers
+          insert_tab(h, 1)
+          c1&.children&.each { |c2| parse(c2, h) }
         end
       end
+    end
 
-      def introduction(isoxml, out)
-        f = isoxml.at(ns("//introduction")) || return
-        out.div **{ class: "Section3", id: f["id"] } do |div|
-          page_break(out)
-          div.p(**{ class: "IntroTitle" }) do |h1|
-            h1 << @introduction_lbl
-          end
-          f.elements.each do |e|
-            parse(e, div) unless e.name == "title"
-          end
+    def introduction(isoxml, out)
+      f = isoxml.at(ns("//introduction")) || return
+      out.div **{ class: "Section3", id: f["id"] } do |div|
+        page_break(out)
+        div.p(**{ class: "IntroTitle" }) do |h1|
+          h1 << @introduction_lbl
+        end
+        f.elements.each do |e|
+          parse(e, div) unless e.name == "title"
         end
       end
+    end
 
-      def foreword(isoxml, out)
-        f = isoxml.at(ns("//foreword")) || return
-        out.div **attr_code(id: f["id"]) do |s|
-          page_break(out)
-          s.p(**{ class: "ForewordTitle" }) do |h1|
-            h1 << @foreword_lbl
-          end
-          f.elements.each { |e| parse(e, s) unless e.name == "title" }
+    def foreword(isoxml, out)
+      f = isoxml.at(ns("//foreword")) || return
+      out.div **attr_code(id: f["id"]) do |s|
+        page_break(out)
+        s.p(**{ class: "ForewordTitle" }) do |h1|
+          h1 << @foreword_lbl
         end
+        f.elements.each { |e| parse(e, s) unless e.name == "title" }
       end
+    end
 
-      def word_preface(docxml)
-        super
-        preface_container = docxml.at("//div[@id = 'preface_container']") # recommendation
-        abstractbox = docxml.at("//div[@id = 'abstractbox']") # plenary
-        foreword = docxml.at("//p[@class = 'ForewordTitle']/..")
-        intro = docxml.at("//p[@class = 'IntroTitle']/..")
-        abstract = docxml.at("//p[@class = 'AbstractTitle']/..")
-        abstract.parent = (abstractbox || preface_container) if abstract
-        abstractbox and abstract&.xpath("./br")&.each do |a|
-          a.remove if /page-break-before:always/.match(a["style"])
-        end
-        docxml&.at("//p[@class = 'AbstractTitle']")&.remove if abstractbox
-        foreword.parent = preface_container if foreword && preface_container
-        intro.parent = preface_container if intro && preface_container
-        if preface_container && (foreword || intro)
-          preface_container.at("./div/br").remove # remove initial page break
-        end
-        if abstractbox && !intro && !foreword && !@toc
-          sect2 = docxml.at("//div[@class='WordSection2']")
-          sect2.next_element.remove # pagebreak
-          sect2.remove # pagebreak
-        end
+    def word_preface(docxml)
+      super
+      preface_container = docxml.at("//div[@id = 'preface_container']") # recommendation
+      abstractbox = docxml.at("//div[@id = 'abstractbox']") # plenary
+      foreword = docxml.at("//p[@class = 'ForewordTitle']/..")
+      intro = docxml.at("//p[@class = 'IntroTitle']/..")
+      abstract = docxml.at("//p[@class = 'AbstractTitle']/..")
+      abstract.parent = (abstractbox || preface_container) if abstract
+      abstractbox and abstract&.xpath("./br")&.each do |a|
+        a.remove if /page-break-before:always/.match(a["style"])
+      end
+      docxml&.at("//p[@class = 'AbstractTitle']")&.remove if abstractbox
+      foreword.parent = preface_container if foreword && preface_container
+      intro.parent = preface_container if intro && preface_container
+      if preface_container && (foreword || intro)
+        preface_container.at("./div/br").remove # remove initial page break
+      end
+      if abstractbox && !intro && !foreword && !@toc
+        sect2 = docxml.at("//div[@class='WordSection2']")
+        sect2.next_element.remove # pagebreak
+        sect2.remove # pagebreak
       end
+    end
 
-      # SAME as html_convert.rb from here on, starting with annex_name
+    # SAME as html_convert.rb from here on, starting with annex_name
 
-      def annex_name(annex, name, div)
-        div.h1 **{ class: "Annex" } do |t|
-          t << "#{get_anchors[annex['id']][:label]}"
-          t.br
-          t.b do |b|
-            name&.children&.each { |c2| parse(c2, b) }
-          end
+    def annex_name(annex, name, div)
+      div.h1 **{ class: "Annex" } do |t|
+        t << "#{get_anchors[annex['id']][:label]}"
+        t.br
+        t.b do |b|
+          name&.children&.each { |c2| parse(c2, b) }
         end
       end
+    end
 
-      def i18n_init(lang, script)
-        super
-        @admonition_lbl = "Box"
-        @abstract_lbl = "Summary"
-      end
+    def i18n_init(lang, script)
+      super
+      @admonition_lbl = "Box"
+      @abstract_lbl = "Summary"
+    end
 
-      def fileloc(loc)
-        File.join(File.dirname(__FILE__), loc)
-      end
+    def fileloc(loc)
+      File.join(File.dirname(__FILE__), loc)
+    end
 
-      MIDDLE_CLAUSE = "//clause[parent::sections]".freeze
+    MIDDLE_CLAUSE = "//clause[parent::sections]".freeze
 
-      def initial_anchor_names(d)
-        preface_names(d.at(ns("//foreword")))
-        preface_names(d.at(ns("//introduction")))
-        sequential_asset_names(d.xpath(ns("//foreword | //introduction")))
-        middle_section_asset_names(d)
-        clause_names(d, 0)
-        termnote_anchor_names(d)
-        termexample_anchor_names(d)
-      end
+    def initial_anchor_names(d)
+      preface_names(d.at(ns("//foreword")))
+      preface_names(d.at(ns("//introduction")))
+      sequential_asset_names(d.xpath(ns("//foreword | //introduction")))
+      middle_section_asset_names(d)
+      clause_names(d, 0)
+      termnote_anchor_names(d)
+      termexample_anchor_names(d)
+    end
 
-      def clause_names(docxml, sect_num)
-        q = "//clause[parent::sections]"
-        @paranumber = 0
-        docxml.xpath(ns(q)).each_with_index do |c, i|
-          section_names(c, (i + sect_num), 1)
-        end
+    def clause_names(docxml, sect_num)
+      q = "//clause[parent::sections]"
+      @paranumber = 0
+      docxml.xpath(ns(q)).each_with_index do |c, i|
+        section_names(c, (i + sect_num), 1)
       end
+    end
 
-      def levelnumber(num, lvl)
-        case lvl % 3
-        when 1 then RomanNumerals.to_roman(num)
-        when 2 then ("A".ord + num - 1).chr
-        when 0 then num.to_s
-        end
+    def levelnumber(num, lvl)
+      case lvl % 3
+      when 1 then RomanNumerals.to_roman(num)
+      when 2 then ("A".ord + num - 1).chr
+      when 0 then num.to_s
       end
+    end
 
-      def annex_levelnumber(num, lvl)
-        case lvl % 3
-        when 0 then RomanNumerals.to_roman(num)
-        when 1 then ("A".ord + num - 1).chr
-        when 2 then num.to_s
-        end
+    def annex_levelnumber(num, lvl)
+      case lvl % 3
+      when 0 then RomanNumerals.to_roman(num)
+      when 1 then ("A".ord + num - 1).chr
+      when 2 then num.to_s
       end
+    end
 
-      def leaf_section(clause, lvl)
-        @paranumber += 1
-        @anchors[clause["id"]] = {label: @paranumber.to_s, xref: "paragraph #{@paranumber}", level: lvl, type: "paragraph" }
-      end
+    def leaf_section(clause, lvl)
+      @paranumber += 1
+      @anchors[clause["id"]] = {label: @paranumber.to_s, xref: "paragraph #{@paranumber}", level: lvl, type: "paragraph" }
+    end
 
-      def annex_leaf_section(clause, num, lvl)
-        @paranumber += 1
-        @anchors[clause["id"]] = {label: @paranumber.to_s, xref: "paragraph #{num}.#{@paranumber}", level: lvl, type: "paragraph" }
-      end
+    def annex_leaf_section(clause, num, lvl)
+      @paranumber += 1
+      @anchors[clause["id"]] = {label: @paranumber.to_s, xref: "paragraph #{num}.#{@paranumber}", level: lvl, type: "paragraph" }
+    end
 
-      def section_names(clause, num, lvl)
-        return num if clause.nil?
-        clause.at(ns("./clause | ./term  | ./terms | ./definitions")) or
-          leaf_section(clause, lvl) && return
-        num = num + 1
-        lbl = levelnumber(num, 1)
-        @anchors[clause["id"]] =
-          { label: lbl, xref: l10n("#{@clause_lbl} #{lbl}"), level: lvl, type: "clause" }
-        i = 1
-        clause.xpath(ns("./clause | ./term  | ./terms | ./definitions")).each do |c|
-          section_names1(c, "#{lbl}.#{levelnumber(i, lvl + 1)}", lvl + 1)
-          i += 1 if c.at(ns("./clause | ./term  | ./terms | ./definitions"))
-        end
-        num
-      end
+    def section_names(clause, num, lvl)
+      return num if clause.nil?
+      clause.at(ns("./clause | ./term  | ./terms | ./definitions")) or
+        leaf_section(clause, lvl) && return
+      num = num + 1
+      lbl = levelnumber(num, 1)
+      @anchors[clause["id"]] =
+        { label: lbl, xref: l10n("#{@clause_lbl} #{lbl}"), level: lvl, type: "clause" }
+      i = 1
+      clause.xpath(ns("./clause | ./term  | ./terms | ./definitions")).each do |c|
+        section_names1(c, "#{lbl}.#{levelnumber(i, lvl + 1)}", lvl + 1)
+        i += 1 if c.at(ns("./clause | ./term  | ./terms | ./definitions"))
+      end
+      num
+    end
 
-      def section_names1(clause, num, level)
-        unless clause.at(ns("./clause | ./term  | ./terms | ./definitions"))
-          leaf_section(clause, level) and return
-        end
-        /\.(?<leafnum>[^.]+$)/ =~ num
-        @anchors[clause["id"]] =
-          { label: leafnum, level: level, xref: l10n("#{@clause_lbl} #{num}"), type: "clause" }
-        i = 1
-        clause.xpath(ns("./clause | ./terms | ./term | ./definitions")).each do |c|
-          section_names1(c, "#{num}.#{levelnumber(i, level + 1)}", level + 1)
-          i += 1 if c.at(ns("./clause | ./term  | ./terms | ./definitions"))
-        end
+    def section_names1(clause, num, level)
+      unless clause.at(ns("./clause | ./term  | ./terms | ./definitions"))
+        leaf_section(clause, level) and return
       end
-
-      def annex_name_lbl(clause, num)
-        l10n("<b>#{@annex_lbl} #{num}</b>")
+      /\.(?<leafnum>[^.]+$)/ =~ num
+      @anchors[clause["id"]] =
+        { label: leafnum, level: level, xref: l10n("#{@clause_lbl} #{num}"), type: "clause" }
+      i = 1
+      clause.xpath(ns("./clause | ./terms | ./term | ./definitions")).each do |c|
+        section_names1(c, "#{num}.#{levelnumber(i, level + 1)}", level + 1)
+        i += 1 if c.at(ns("./clause | ./term  | ./terms | ./definitions"))
       end
+    end
 
-      def annex_names(clause, num)
-        hierarchical_asset_names(clause, num)
-        unless clause.at(ns("./clause | ./term  | ./terms | ./definitions"))
-          annex_leaf_section(clause, num, 1) and return
-        end
-        @anchors[clause["id"]] = { label: annex_name_lbl(clause, num), type: "clause",
-                                   xref: "#{@annex_lbl} #{num}", level: 1 }
-        i = 1
-        clause.xpath(ns("./clause")).each do |c|
-          annex_names1(c, "#{num}.#{annex_levelnumber(i, 2)}", 2)
-          i += 1 if c.at(ns("./clause | ./term  | ./terms | ./definitions"))
-        end
-      end
+    def annex_name_lbl(clause, num)
+      l10n("<b>#{@annex_lbl} #{num}</b>")
+    end
 
-      def annex_names1(clause, num, level)
-        unless clause.at(ns("./clause | ./term  | ./terms | ./definitions"))
-          annex_leaf_section(clause, num, level) and return
-        end
-        /\.(?<leafnum>[^.]+$)/ =~ num
-        @anchors[clause["id"]] = { label: leafnum, xref: "#{@annex_lbl} #{num}",
-                                   level: level, type: "clause" }
-        i = 1
-        clause.xpath(ns("./clause")).each do |c|
-          annex_names1(c, "#{num}.#{annex_levelnumber(i, level + 1)}", level + 1)
-          i += 1 if c.at(ns("./clause | ./term  | ./terms | ./definitions"))
-        end
+    def annex_names(clause, num)
+      hierarchical_asset_names(clause, num)
+      unless clause.at(ns("./clause | ./term  | ./terms | ./definitions"))
+        annex_leaf_section(clause, num, 1) and return
       end
-
-      def back_anchor_names(docxml)
-        docxml.xpath(ns("//annex")).each_with_index do |c, i|
-          @paranumber = 0
-          annex_names(c, RomanNumerals.to_roman(i + 1))
-        end
-        docxml.xpath(ns("//bibitem[not(ancestor::bibitem)]")).each do |ref|
-          reference_names(ref)
-        end
+      @anchors[clause["id"]] = { label: annex_name_lbl(clause, num), type: "clause",
+                                 xref: "#{@annex_lbl} #{num}", level: 1 }
+      i = 1
+      clause.xpath(ns("./clause")).each do |c|
+        annex_names1(c, "#{num}.#{annex_levelnumber(i, 2)}", 2)
+        i += 1 if c.at(ns("./clause | ./term  | ./terms | ./definitions"))
       end
+    end
 
-      def sequential_admonition_names(clause)
-        i = 0
-        clause.xpath(ns(".//admonition")).each do |t|
-          i += 1
-          next if t["id"].nil? || t["id"].empty?
-          @anchors[t["id"]] = anchor_struct(i.to_s, nil, @admonition_lbl, "box")
-        end
+    def annex_names1(clause, num, level)
+      unless clause.at(ns("./clause | ./term  | ./terms | ./definitions"))
+        annex_leaf_section(clause, num, level) and return
       end
+      /\.(?<leafnum>[^.]+$)/ =~ num
+      @anchors[clause["id"]] = { label: leafnum, xref: "#{@annex_lbl} #{num}",
+                                 level: level, type: "clause" }
+      i = 1
+      clause.xpath(ns("./clause")).each do |c|
+        annex_names1(c, "#{num}.#{annex_levelnumber(i, level + 1)}", level + 1)
+        i += 1 if c.at(ns("./clause | ./term  | ./terms | ./definitions"))
+      end
+    end
 
-      def hierarchical_admonition_names(clause, num)
-        i = 0 
-        clause.xpath(ns(".//admonition")).each do |t|
-          i += 1
-          next if t["id"].nil? || t["id"].empty?
-          @anchors[t["id"]] = anchor_struct("#{num}.#{i}", nil, @admonition_lbl, "box")
-        end
+    def back_anchor_names(docxml)
+      docxml.xpath(ns("//annex")).each_with_index do |c, i|
+        @paranumber = 0
+        annex_names(c, RomanNumerals.to_roman(i + 1))
+      end
+      docxml.xpath(ns("//bibitem[not(ancestor::bibitem)]")).each do |ref|
+        reference_names(ref)
       end
+    end
 
-      def sequential_asset_names(clause)
-        super
-        sequential_admonition_names(clause)
+    def sequential_admonition_names(clause)
+      i = 0
+      clause.xpath(ns(".//admonition")).each do |t|
+        i += 1
+        next if t["id"].nil? || t["id"].empty?
+        @anchors[t["id"]] = anchor_struct(i.to_s, nil, @admonition_lbl, "box")
       end
+    end
 
-      def hierarchical_asset_names(clause, num)
-        super
-        hierarchical_admonition_names(clause, num)
+    def hierarchical_admonition_names(clause, num)
+      i = 0 
+      clause.xpath(ns(".//admonition")).each do |t|
+        i += 1
+        next if t["id"].nil? || t["id"].empty?
+        @anchors[t["id"]] = anchor_struct("#{num}.#{i}", nil, @admonition_lbl, "box")
       end
+    end
 
-      def admonition_name_parse(node, div, name)
-        div.p **{ class: "FigureTitle", align: "center" } do |p|
-          p << l10n("#{@admonition_lbl} #{get_anchors[node['id']][:label]}")
-          if name
-            p << "&nbsp;&mdash; "
-            name.children.each { |n| parse(n, div) }
-          end
+    def sequential_asset_names(clause)
+      super
+      sequential_admonition_names(clause)
+    end
+
+    def hierarchical_asset_names(clause, num)
+      super
+      hierarchical_admonition_names(clause, num)
+    end
+
+    def admonition_name_parse(node, div, name)
+      div.p **{ class: "FigureTitle", align: "center" } do |p|
+        p << l10n("#{@admonition_lbl} #{get_anchors[node['id']][:label]}")
+        if name
+          p << "&nbsp;&mdash; "
+          name.children.each { |n| parse(n, div) }
         end
       end
+    end
 
-      def admonition_parse(node, out)
-        name = node.at(ns("./name"))
-        out.div **{ class: "Admonition" } do |t|
-          admonition_name_parse(node, t, name) if name
-          node.children.each do |n|
-            parse(n, t) unless n.name == "name"
-          end
+    def admonition_parse(node, out)
+      name = node.at(ns("./name"))
+      out.div **{ class: "Admonition" } do |t|
+        admonition_name_parse(node, t, name) if name
+        node.children.each do |n|
+          parse(n, t) unless n.name == "name"
         end
       end
+    end
 
-      def inline_header_title(out, node, c1)
-        title = c1&.content || ""
-        out.span **{ class: "zzMoveToFollowing" } do |s|
-          if get_anchors[node['id']][:label]
-            s << "#{get_anchors[node['id']][:label]}. " unless @suppressheadingnumbers
-            insert_tab(s, 1)
-          end
-          s << "#{title} "
+    def inline_header_title(out, node, c1)
+      title = c1&.content || ""
+      out.span **{ class: "zzMoveToFollowing" } do |s|
+        if get_anchors[node['id']][:label]
+          s << "#{get_anchors[node['id']][:label]}. " unless @suppressheadingnumbers
+          insert_tab(s, 1)
         end
+        s << "#{title} "
       end
+    end
 
-      def abstract(isoxml, out)
-        f = isoxml.at(ns("//abstract")) || return
-        out.div **attr_code(id: f["id"]) do |s|
-          page_break(out)
-          s.p(**{ class: "AbstractTitle" }) { |h1| h1 << @abstract_lbl }
-          f.elements.each { |e| parse(e, s) unless e.name == "title" }
-        end
+    def abstract(isoxml, out)
+      f = isoxml.at(ns("//abstract")) || return
+      out.div **attr_code(id: f["id"]) do |s|
+        page_break(out)
+        s.p(**{ class: "AbstractTitle" }) { |h1| h1 << @abstract_lbl }
+        f.elements.each { |e| parse(e, s) unless e.name == "title" }
       end
     end
   end
 end
+end