metanorma-iec 1.3.4 → 1.3.8

data/lib/isodoc/iec/metadata.rb

@@ -16,7 +16,7 @@ module IsoDoc
           unpublished(docstatus.text) and
             set(:stageabbr, docstatus["abbreviation"])
         end
-        revdate = isoxml.at(ns("//version/revision-date"))
+        revdate = isoxml.at(ns("//bibdata/version/revision-date"))
         set(:revdate, revdate&.text)
       end
 

data/lib/isodoc/iec/pdf_convert.rb

@@ -13,7 +13,7 @@ module IsoDoc
         super
       end
 
-      def pdf_stylesheet(docxml)
+      def pdf_stylesheet(_docxml)
         "iec.international-standard.xsl"
       end
     end

data/lib/isodoc/iec/presentation_xml_convert.rb

@@ -7,8 +7,8 @@ module IsoDoc
       def clause(docxml)
         docxml.xpath(ns("//clause[not(ancestor::annex)] | "\
                         "//definitions | //references | "\
-                        "//preface/introduction[clause]")).
-        each do |f|
+                        "//preface/introduction[clause]"))
+          .each do |f|
           clause1(f)
         end
         docxml.xpath(ns("//terms")).each do |f|
@@ -16,27 +16,28 @@ module IsoDoc
         end
       end
 
-      def termclause1(f)
-        return clause1(f) unless @is_iev
-        return if @suppressheadingnumbers || f["unnumbered"]
-        lbl = @xrefs.anchor(f['id'], :label, true) or return
-        prefix_name(f, " ", "#{lbl}#{clausedelim}", "title")
+      def termclause1(elem)
+        return clause1(elem) unless @is_iev
+        return if @suppressheadingnumbers || elem["unnumbered"]
+
+        lbl = @xrefs.anchor(elem["id"], :label, true) or return
+        prefix_name(elem, " ", "#{lbl}#{clausedelim}", "title")
       end
 
-      def clause1(f)
-        IsoDoc::PresentationXMLConvert.instance_method(:clause1).bind(self).
-          call(f)
+      def clause1(elem)
+        IsoDoc::PresentationXMLConvert.instance_method(:clause1).bind(self)
+          .call(elem)
       end
 
-      def bibdata_i18n(b)
+      def bibdata_i18n(bib)
         fr = IsoDoc::Iec::I18n.new("fr", "Latn")
         en = IsoDoc::Iec::I18n.new("en", "Latn")
         [{ lang: "en", i18n: en }, { lang: "fr", i18n: fr }].each do |v|
-          hash_translate(b, v[:i18n].get["doctype_dict"], "./ext/doctype", v[:lang])
-          hash_translate(b, v[:i18n].get["stage_dict"], "./status/stage", v[:lang])
-          hash_translate(b, v[:i18n].get["substage_dict"], "./status/substage", v[:lang])
-          hash_translate(b, v[:i18n].get["function_dict"], "./ext/function", v[:lang])
-          hash_translate(b, v[:i18n].get["horizontal_dict"], "./ext/horizontal", v[:lang])
+          { doctype_dict: "./ext/doctype", stage_dict: "./status/stage",
+            substage_dict: "./status/substage", function_dict: "./ext/function",
+            horizontal_dict: "./ext/horizontal" }.each do |lbl, xpath|
+              hash_translate(bib, v[:i18n].get[lbl.to_s], xpath, v[:lang])
+            end
         end
       end
 
@@ -44,4 +45,3 @@ module IsoDoc
     end
   end
 end
-

data/lib/isodoc/iec/word_convert.rb

@@ -11,10 +11,16 @@ module IsoDoc
         @libdir = File.dirname(__FILE__)
       end
 
+      def font_choice(options)
+        if options[:script] == "Hans" then '"Source Han Sans",serif'
+        else '"Arial",sans-serif'
+        end
+      end
+
       def default_fonts(options)
         {
-          bodyfont: (options[:script] == "Hans" ? '"Source Han Sans",serif' : '"Arial",sans-serif'),
-          headerfont: (options[:script] == "Hans" ? '"Source Han Sans",sans-serif' : '"Arial",sans-serif'),
+          bodyfont: font_choice(options),
+          headerfont: font_choice(options),
           monospacefont: '"Courier New",monospace',
           normalfontsize: "10.0pt",
           footnotefontsize: "8.0pt",
@@ -23,7 +29,7 @@ module IsoDoc
         }
       end
 
-      def default_file_locations(options)
+      def default_file_locations(_options)
         @libdir = File.dirname(__FILE__)
         {
           wordstylesheet: html_doc_path("wordstyle.scss"),
@@ -70,7 +76,7 @@ module IsoDoc
           toc += word_toc_entry(1, header_strip(h))
         end
         toc.sub(/(<p class="MsoToc1">)/,
-                %{\\1#{WORD_TOC_TABLE_PREFACE1}}) +  WORD_TOC_SUFFIX1
+                %{\\1#{WORD_TOC_TABLE_PREFACE1}}) + WORD_TOC_SUFFIX1
       end
 
       def make_FigureWordToC(docxml)
@@ -79,11 +85,21 @@ module IsoDoc
           toc += word_toc_entry(1, header_strip(h))
         end
         toc.sub(/(<p class="MsoToc1">)/,
-                %{\\1#{WORD_TOC_FIGURE_PREFACE1}}) +  WORD_TOC_SUFFIX1
+                %{\\1#{WORD_TOC_FIGURE_PREFACE1}}) + WORD_TOC_SUFFIX1
+      end
+
+      def word_toc_preface(level)
+        <<~TOC.freeze
+          <span lang="EN-GB"><span
+            style='mso-element:field-begin'></span><span
+            style='mso-spacerun:yes'>&#xA0;</span>TOC
+            \\o &quot;1-#{level}&quot; \\h \\z \\u <span
+            style='mso-element:field-separator'></span></span>
+        TOC
       end
 
-      def header_strip(h)
-        h = h.to_s.gsub(/<\/?p[^>]*>/, "")
+      def header_strip(hdr)
+        hdr = hdr.to_s.gsub(/<\/?p[^>]*>/, "")
         super
       end
 
@@ -93,10 +109,11 @@ module IsoDoc
         super
       end
 
-      def make_tr_attr(td, row, totalrows, header)
+      def make_tr_attr(cell, row, totalrows, header)
         ret = super
-        css_class = (td.name == "th" || header) ? "TABLE-col-heading" : "TABLE-cell"
-        ret.merge( "class": css_class )
+        css_class =
+          cell.name == "th" || header ? "TABLE-col-heading" : "TABLE-cell"
+        ret.merge("class": css_class)
       end
 
       def tr_parse(node, out, ord, totalrows, header)
@@ -122,7 +139,8 @@ module IsoDoc
 
       def word_table_cleanup1(docxml, style)
         %w(td th).each do |tdh|
-          docxml.xpath("//#{tdh}[@class = '#{style}'][not(descendant::p)]").each do |td|
+          docxml.xpath("//#{tdh}[@class = '#{style}'][not(descendant::p)]")
+            .each do |td|
             p = Nokogiri::XML::Element.new("p", docxml)
             td.children.each { |c| c.parent = p }
             p.parent = td
@@ -148,7 +166,7 @@ module IsoDoc
       end
 
       # Incredibly, the numbered boilerplate list in IEC is NOT A LIST,
-      # and it violates numbering conventions for ordered lists 
+      # and it violates numbering conventions for ordered lists
       # (arabic not alpha)
       BOILERPLATE_PARAS = "//div[@class = 'boilerplate_legal']//li/p".freeze
 
@@ -156,7 +174,8 @@ module IsoDoc
         docxml.xpath(BOILERPLATE_PARAS).each_with_index do |l, i|
           l["class"] = "FOREWORD"
           l.children.first.add_previous_sibling(
-            %{#{i+1})<span style="mso-tab-count:1">&#xA0; </span>})
+            %{#{i + 1})<span style="mso-tab-count:1">&#xA0; </span>},
+          )
         end
         docxml.xpath("//div[@class = 'boilerplate_legal']//li").each do |l|
           l.replace(l.children)
@@ -166,24 +185,55 @@ module IsoDoc
       end
 
       def authority_cleanup(docxml)
-        auth = docxml.at("//div[@id = 'boilerplate-feedback' or @class = 'boilerplate-feedback']")
+        auth = docxml.at("//div[@id = 'boilerplate-feedback' or "\
+                         "@class = 'boilerplate-feedback']")
         auth&.remove
         super
       end
 
-      def make_body1(body, _docxml)
+      def make_body1(body, _docxml); end
+
+      def word_cover(docxml); end
+
+      def style_cleanup(docxml); end
+
+      def bibliography_attrs
+        { class: "Section3" }
+      end
+
+      def termref_attrs
+        {}
+      end
+
+      def figure_name_attrs(_node)
+        { class: "FigureTitle", style: "text-align:center;" }
+      end
+
+      def table_title_attrs(_node)
+        { class: "TableTitle", style: "text-align:center;" }
       end
 
-      def word_cover(docxml)
+      def para_class(_node)
+        classtype = nil
+        classtype = "MsoCommentText" if in_comment
+        classtype = "Sourcecode" if @annotation
+        classtype
+      end
+
+      def annex_name(_annex, name, div)
+        return if name.nil?
+
+        div.h1 **{ class: "Annex" } do |t|
+          name.children.each { |c2| parse(c2, t) }
+        end
       end
 
       def formula_parse1(node, out)
         out.div **attr_code(class: "formula") do |div|
-          div.p **attr_code(class: "formula") do |p|
+          div.p **attr_code(class: "formula") do |_p|
             insert_tab(div, 1)
             parse(node.at(ns("./stem")), div)
-            lbl = node&.at(ns("./name"))&.text
-            unless lbl.nil?
+            if lbl = node&.at(ns("./name"))&.text
               insert_tab(div, 1)
               div << "(#{lbl})"
             end

data/lib/metanorma/iec/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Iec
-    VERSION = "1.3.4".freeze
+    VERSION = "1.3.8".freeze
   end
 end
 

data/metanorma-iec.gemspec

@@ -25,9 +25,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.files         = `git ls-files`.split("\n")
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
-  spec.add_dependency "metanorma-iso", "~> 1.8.0"
+  spec.add_dependency "metanorma-iso", "~> 1.9.0"
   spec.add_dependency "ruby-jing"
 
   spec.add_development_dependency "byebug"

data/spec/asciidoctor/blocks_spec.rb

@@ -1,7 +1,5 @@
 require "spec_helper"
 
-OPTIONS = [backend: :iec, header_footer: true].freeze
-
 RSpec.describe Asciidoctor::Iec do
   before(:all) do
     @blank_hdr = blank_hdr_gen
@@ -34,8 +32,8 @@ RSpec.describe Asciidoctor::Iec do
       #{ASCIIDOC_BLANK_HDR}
       [stem]
       ++++
-      r = 1 %#{' '}
-      r = 1 %#{' '}
+      r = 1 %
+      r = 1 %
       ++++
 
       [stem]
@@ -47,7 +45,7 @@ RSpec.describe Asciidoctor::Iec do
            #{@blank_hdr}
       <sections>
         <formula id="_">
-        <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mi>r</mi><mo>=</mo><mn>1</mn><mi>%</mi><mi>r</mi><mo>=</mo><mn>1</mn><mi>%</mi></math></stem>
+        <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mi>r</mi><mo>=</mo><mn>1</mn><mo>%</mo><mi>r</mi><mo>=</mo><mn>1</mn><mo>%</mo></math></stem>
       </formula>
 
       <formula id="_">

data/spec/isodoc/blocks_spec.rb

@@ -179,7 +179,7 @@ RSpec.describe IsoDoc::Iec do
     INPUT
     <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
          <preface>
-           <foreword>
+           <foreword displayorder="1">
              <p>
                <xref target='N1'>Clause 1, Equation (1)</xref>
                <xref target='N2'>1.1, Inequality (2)</xref>
@@ -187,7 +187,7 @@ RSpec.describe IsoDoc::Iec do
            </foreword>
          </preface>
          <sections>
-           <clause id='intro'>
+           <clause id='intro' displayorder="2">
              <title depth='1'>
                1
                <tab/>

data/spec/isodoc/i18n_spec.rb

@@ -75,164 +75,156 @@ RSpec.describe IsoDoc do
        </clause>
        </bibliography>
        </iso-standard>
-        INPUT
+    INPUT
 
-        presxml = <<~OUTPUT
-        <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
-       <bibdata>
-       <docnumber>1</docnumber>
-       <language current="true">en</language>
-       <ext>
-  <doctype language=''>international-standard</doctype>
-  <doctype language='fr'>Norme international</doctype>
-  <doctype language='en'>International Standard</doctype>
-<horizontal language=''>true</horizontal>
-<horizontal language='fr'>Norme horizontale</horizontal>
-<horizontal language='en'>Horizontal Standard</horizontal>
-<function language=''>emc</function>
-<function language='fr'>Publication fondamentale en CEM</function>
-<function language='en'>Basic EMC Publication</function>
-</ext>
-       </bibdata>
-       <preface>
-       <foreword obligation="informative">
-          <title>Foreword</title>
-          <p id="A">This is a preamble</p>
-        </foreword>
-         <introduction id="B" obligation="informative"><title depth="1">0<tab/>Introduction</title><clause id="C" inline-header="false" obligation="informative">
-          <title depth="2">0.1<tab/>Introduction Subsection</title>
-        </clause>
-        <p>This is patent boilerplate</p>
-        </introduction></preface><sections>
-        <clause id="D" obligation="normative" type="scope">
-          <title depth="1">1<tab/>Scope</title>
-          <p id="E">Text</p>
-        </clause>
-
-        <clause id="H" obligation="normative"><title depth="1">3<tab/>Terms, definitions, symbols and abbreviated terms</title><terms id="I" obligation="normative">
-          <title depth="2">3.1<tab/>Normal Terms</title>
-          <term id="J"><name>3.1.1</name>
-          <preferred>Term2</preferred>
-        </term>
-        </terms>
-        <definitions id="K"><title>3.2</title>
-          <dl>
-          <dt>Symbol</dt>
-          <dd>Definition</dd>
-          </dl>
-        </definitions>
-        </clause>
-        <definitions id="L"><title>4</title>
-          <dl>
-          <dt>Symbol</dt>
-          <dd>Definition</dd>
-          </dl>
-        </definitions>
-        <clause id="M" inline-header="false" obligation="normative"><title depth="1">5<tab/>Clause 4</title><clause id="N" inline-header="false" obligation="normative">
-          <title depth="2">5.1<tab/>Introduction</title>
-        </clause>
-        <clause id="O" inline-header="false" obligation="normative">
-          <title depth="2">5.2<tab/>Clause 4.2</title>
-        </clause></clause>
-
-        </sections><annex id="P" inline-header="false" obligation="normative">
-          <title><strong>Annex A</strong><br/>(normative)<br/><br/><strong>Annex</strong></title>
-          <clause id="Q" inline-header="false" obligation="normative">
-          <title depth="2">A.1<tab/>Annex A.1</title>
-          <clause id="Q1" inline-header="false" obligation="normative">
-          <title depth="3">A.1.1<tab/>Annex A.1a</title>
-          </clause>
-        </clause>
-        <appendix id="Q2" inline-header="false" obligation="normative">
-          <title depth="2">Appendix 1<tab/>An Appendix</title>
-        </appendix>
-        </annex><bibliography><references id="R" obligation="informative" normative="true">
-          <title depth="1">2<tab/>Normative References</title>
-        </references><clause id="S" obligation="informative">
-          <title depth="1">Bibliography</title>
-          <references id="T" obligation="informative" normative="false">
-          <title depth="2">Bibliography Subsection</title>
-        </references>
-        </clause>
-        </bibliography>
-        </iso-standard>
-        OUTPUT
-
-        html = <<~OUTPUT
-        #{HTML_HDR}
-             <div>
-               <h1 class="ForewordTitle">FOREWORD</h1>
-               <div class="boilerplate_legal"/>
-               <p id="A">This is a preamble</p>
-             </div>
-             <br/>
-             <div class="Section3" id="B">
-               <h1 class="IntroTitle">0&#160; Introduction</h1>
-               <div id="C"><h2>0.1&#160; Introduction Subsection</h2>
-
-        </div>
-               <p>This is patent boilerplate</p>
-             </div>
-             #{IEC_TITLE1}
-             <div id="D">
-               <h1>1&#160; Scope</h1>
-               <p id="E">Text</p>
-             </div>
-             <div>
-               <h1>2&#160; Normative References</h1>
-             </div>
-             <div id="H"><h1>3&#160; Terms, definitions, symbols and abbreviated terms</h1>
-       <div id="I"><h2>3.1&#160; Normal Terms</h2>
-
-          <p class="TermNum" id="J">3.1.1</p>
-          <p class="Terms" style="text-align:left;">Term2</p>
-
-        </div><div id="K"><h2>3.2</h2>
-          <dl><dt><p>Symbol</p></dt><dd>Definition</dd></dl>
-        </div></div>
-             <div id="L" class="Symbols">
-               <h1>4</h1>
-               <dl>
-                 <dt>
-                   <p>Symbol</p>
-                 </dt>
-                 <dd>Definition</dd>
-               </dl>
-             </div>
-             <div id="M">
-               <h1>5&#160; Clause 4</h1>
-               <div id="N"><h2>5.1&#160; Introduction</h2>
-
-        </div>
-               <div id="O"><h2>5.2&#160; Clause 4.2</h2>
-
-        </div>
-             </div>
-             <br/>
-             <div id="P" class="Section3">
-               <h1 class="Annex"><b>Annex A</b><br/>(normative)<br/><br/><b>Annex</b></h1>
-               <div id="Q"><h2>A.1&#160; Annex A.1</h2>
-
-          <div id="Q1"><h3>A.1.1&#160; Annex A.1a</h3>
+    presxml = <<~OUTPUT
+      <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
+      <bibdata>
+      <docnumber>1</docnumber>
+      <language current="true">en</language>
+      <ext>
+      <doctype language="">international-standard</doctype><doctype language="fr">Norme international</doctype><doctype language="en">International Standard</doctype>
+      <horizontal language="">true</horizontal><horizontal language="fr">Norme horizontale</horizontal><horizontal language="en">Horizontal Standard</horizontal>
+      <function language="">emc</function><function language="fr">Publication fondamentale en CEM</function><function language="en">Basic EMC Publication</function>
+      </ext>
+      </bibdata>
+      <preface>
+      <foreword obligation="informative" displayorder="1">
+         <title>Foreword</title>
+         <p id="A">This is a preamble</p>
+       </foreword>
+        <introduction id="B" obligation="informative" displayorder="2"><title depth="1">0<tab/>Introduction</title><clause id="C" inline-header="false" obligation="informative">
+         <title depth="2">0.1<tab/>Introduction Subsection</title>
+       </clause>
+       <p>This is patent boilerplate</p>
+       </introduction></preface><sections>
+       <clause id="D" obligation="normative" type="scope" displayorder="3">
+         <title depth="1">1<tab/>Scope</title>
+         <p id="E">Text</p>
+       </clause>
+       <clause id="H" obligation="normative" displayorder="5"><title depth="1">3<tab/>Terms, definitions, symbols and abbreviated terms</title><terms id="I" obligation="normative">
+         <title depth="2">3.1<tab/>Normal Terms</title>
+         <term id="J"><name>3.1.1</name>
+         <preferred>Term2</preferred>
+       </term>
+       </terms>
+       <definitions id="K"><title>3.2</title>
+         <dl>
+         <dt>Symbol</dt>
+         <dd>Definition</dd>
+         </dl>
+       </definitions>
+       </clause>
+       <definitions id="L" displayorder="6"><title>4</title>
+         <dl>
+         <dt>Symbol</dt>
+         <dd>Definition</dd>
+         </dl>
+       </definitions>
+       <clause id="M" inline-header="false" obligation="normative" displayorder="7"><title depth="1">5<tab/>Clause 4</title><clause id="N" inline-header="false" obligation="normative">
+         <title depth="2">5.1<tab/>Introduction</title>
+       </clause>
+       <clause id="O" inline-header="false" obligation="normative">
+         <title depth="2">5.2<tab/>Clause 4.2</title>
+       </clause></clause>
+       </sections><annex id="P" inline-header="false" obligation="normative" displayorder="8">
+         <title><strong>Annex A</strong><br/>(normative)<br/><br/><strong>Annex</strong></title>
+         <clause id="Q" inline-header="false" obligation="normative">
+         <title depth="2">A.1<tab/>Annex A.1</title>
+         <clause id="Q1" inline-header="false" obligation="normative">
+         <title depth="3">A.1.1<tab/>Annex A.1a</title>
+         </clause>
+       </clause>
+       <appendix id="Q2" inline-header="false" obligation="normative">
+         <title depth="2">Appendix 1<tab/>An Appendix</title>
+       </appendix>
+       </annex><bibliography><references id="R" obligation="informative" normative="true" displayorder="4">
+         <title depth="1">2<tab/>Normative References</title>
+       </references><clause id="S" obligation="informative" displayorder="9">
+         <title depth="1">Bibliography</title>
+         <references id="T" obligation="informative" normative="false">
+         <title depth="2">Bibliography Subsection</title>
+       </references>
+       </clause>
+       </bibliography>
+       </iso-standard>
+    OUTPUT
 
+    html = <<~OUTPUT
+       #{HTML_HDR}
+            <div>
+              <h1 class="ForewordTitle">FOREWORD</h1>
+              <div class="boilerplate_legal"/>
+              <p id="A">This is a preamble</p>
+            </div>
+            <br/>
+            <div class="Section3" id="B">
+              <h1 class="IntroTitle">0&#160; Introduction</h1>
+              <div id="C"><h2>0.1&#160; Introduction Subsection</h2>
+
+       </div>
+              <p>This is patent boilerplate</p>
+            </div>
+            #{IEC_TITLE1}
+            <div id="D">
+              <h1>1&#160; Scope</h1>
+              <p id="E">Text</p>
+            </div>
+            <div>
+              <h1>2&#160; Normative References</h1>
+            </div>
+            <div id="H"><h1>3&#160; Terms, definitions, symbols and abbreviated terms</h1>
+      <div id="I"><h2>3.1&#160; Normal Terms</h2>
+
+         <p class="TermNum" id="J">3.1.1</p>
+         <p class="Terms" style="text-align:left;">Term2</p>
+
+       </div><div id="K"><h2>3.2</h2>
+         <dl><dt><p>Symbol</p></dt><dd>Definition</dd></dl>
+       </div></div>
+            <div id="L" class="Symbols">
+              <h1>4</h1>
+              <dl>
+                <dt>
+                  <p>Symbol</p>
+                </dt>
+                <dd>Definition</dd>
+              </dl>
+            </div>
+            <div id="M">
+              <h1>5&#160; Clause 4</h1>
+              <div id="N"><h2>5.1&#160; Introduction</h2>
+
+       </div>
+              <div id="O"><h2>5.2&#160; Clause 4.2</h2>
+
+       </div>
+            </div>
+            <br/>
+            <div id="P" class="Section3">
+              <h1 class="Annex"><b>Annex A</b><br/>(normative)<br/><br/><b>Annex</b></h1>
+              <div id="Q"><h2>A.1&#160; Annex A.1</h2>
+
+         <div id="Q1"><h3>A.1.1&#160; Annex A.1a</h3>
+
+         </div>
+       </div>
+              <div id="Q2"><h2>Appendix 1&#160; An Appendix</h2>
+
+       </div>
+            </div>
+            <br/>
+            <div>
+              <h1 class="Section3">Bibliography</h1>
+              <div>
+                <h2 class="Section3">Bibliography Subsection</h2>
+              </div>
+            </div>
           </div>
-        </div>
-               <div id="Q2"><h2>Appendix 1&#160; An Appendix</h2>
-
-        </div>
-             </div>
-             <br/>
-             <div>
-               <h1 class="Section3">Bibliography</h1>
-               <div>
-                 <h2 class="Section3">Bibliography Subsection</h2>
-               </div>
-             </div>
-           </div>
-         </body>
-       </html>
+        </body>
+      </html>
     OUTPUT
-        expect(xmlpp(IsoDoc::Iec::PresentationXMLConvert.new({}).convert("test", input, true).sub(%r{<localized-strings>.*</localized-strings>}m, ""))).to be_equivalent_to xmlpp(presxml)
+    expect((IsoDoc::Iec::PresentationXMLConvert.new({}).convert("test", input, true).sub(%r{<localized-strings>.*</localized-strings>}m, ""))).to be_equivalent_to xmlpp(presxml)
     expect(xmlpp(IsoDoc::Iec::HtmlConvert.new({}).convert("test", presxml, true))).to be_equivalent_to xmlpp(html)
   end
 
@@ -304,141 +296,70 @@ RSpec.describe IsoDoc do
        </clause>
        </bibliography>
        </iso-standard>
-        INPUT
-        <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
-         <bibdata>
-           <language current="true">tlh</language>
-         </bibdata>
-         <preface>
-           <foreword obligation='informative'>
-             <title>Foreword</title>
-             <p id='A'>This is a preamble</p>
-           </foreword>
-           <introduction id='B' obligation='informative'>
-             <title depth='1'>
-               0
-               <tab/>
-               Introduction
-             </title>
-             <clause id='C' inline-header='false' obligation='informative'>
-               <title depth='2'>
-                 0.1
-                 <tab/>
-                 Introduction Subsection
-               </title>
-             </clause>
-             <p>This is patent boilerplate</p>
-           </introduction>
-         </preface>
-         <sections>
-           <clause id='D' obligation='normative' type="scope">
-             <title depth='1'>
-               1
-               <tab/>
-               Scope
-             </title>
-             <p id='E'>Text</p>
-           </clause>
-           <clause id='H' obligation='normative'>
-             <title depth='1'>
-               3
-               <tab/>
-               Terms, definitions, symbols and abbreviated terms
-             </title>
-             <terms id='I' obligation='normative'>
-               <title depth='2'>
-                 3.1
-                 <tab/>
-                 Normal Terms
-               </title>
-               <term id='J'>
-                 <name>3.1.1</name>
-                 <preferred>Term2</preferred>
-               </term>
-             </terms>
-             <definitions id='K'>
-               <title>3.2</title>
-               <dl>
-                 <dt>Symbol</dt>
-                 <dd>Definition</dd>
-               </dl>
-             </definitions>
-           </clause>
-           <definitions id='L'>
-             <title>4</title>
-             <dl>
-               <dt>Symbol</dt>
-               <dd>Definition</dd>
-             </dl>
-           </definitions>
-           <clause id='M' inline-header='false' obligation='normative'>
-             <title depth='1'>
-               5
-               <tab/>
-               Clause 4
-             </title>
-             <clause id='N' inline-header='false' obligation='normative'>
-               <title depth='2'>
-                 5.1
-                 <tab/>
-                 Introduction
-               </title>
-             </clause>
-             <clause id='O' inline-header='false' obligation='normative'>
-               <title depth='2'>
-                 5.2
-                 <tab/>
-                 Clause 4.2
-               </title>
-             </clause>
-           </clause>
-         </sections>
-         <annex id='P' inline-header='false' obligation='normative'>
-           <title>
-             <strong>Annex A</strong>
-             <br/>
-             (normative)
-             <br/>
-             <br/>
-             <strong>Annex</strong>
-           </title>
-           <clause id='Q' inline-header='false' obligation='normative'>
-             <title depth='2'>
-               A.1
-               <tab/>
-               Annex A.1
-             </title>
-             <clause id='Q1' inline-header='false' obligation='normative'>
-               <title depth='3'>
-                 A.1.1
-                 <tab/>
-                 Annex A.1a
-               </title>
-             </clause>
-           </clause>
-           <appendix id='Q2' inline-header='false' obligation='normative'>
-             <title depth='2'>
-               Appendix 1
-               <tab/>
-               An Appendix
-             </title>
-           </appendix>
-         </annex>
-         <bibliography>
-           <references id='R' obligation='informative' normative='true'>
-             <title depth='1'>
-               2
-               <tab/>
-               Normative References
-             </title>
-           </references>
-           <clause id='S' obligation='informative'>
-             <title depth='1'>Bibliography</title>
-             <references id='T' obligation='informative' normative='false'>
-               <title depth='2'>Bibliography Subsection</title>
-             </references>
-           </clause>
-         </bibliography>
+    INPUT
+      <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
+      <bibdata>
+      <language current="true">tlh</language>
+      </bibdata>
+      <preface>
+      <foreword obligation="informative" displayorder="1">
+         <title>Foreword</title>
+         <p id="A">This is a preamble</p>
+       </foreword>
+        <introduction id="B" obligation="informative" displayorder="2"><title depth="1">0<tab/>Introduction</title><clause id="C" inline-header="false" obligation="informative">
+         <title depth="2">0.1<tab/>Introduction Subsection</title>
+       </clause>
+       <p>This is patent boilerplate</p>
+       </introduction></preface><sections>
+       <clause id="D" obligation="normative" type="scope" displayorder="3">
+         <title depth="1">1<tab/>Scope</title>
+         <p id="E">Text</p>
+       </clause>
+       <clause id="H" obligation="normative" displayorder="5"><title depth="1">3<tab/>Terms, definitions, symbols and abbreviated terms</title><terms id="I" obligation="normative">
+         <title depth="2">3.1<tab/>Normal Terms</title>
+         <term id="J"><name>3.1.1</name>
+         <preferred>Term2</preferred>
+       </term>
+       </terms>
+       <definitions id="K"><title>3.2</title>
+         <dl>
+         <dt>Symbol</dt>
+         <dd>Definition</dd>
+         </dl>
+       </definitions>
+       </clause>
+       <definitions id="L" displayorder="6"><title>4</title>
+         <dl>
+         <dt>Symbol</dt>
+         <dd>Definition</dd>
+         </dl>
+       </definitions>
+       <clause id="M" inline-header="false" obligation="normative" displayorder="7"><title depth="1">5<tab/>Clause 4</title><clause id="N" inline-header="false" obligation="normative">
+         <title depth="2">5.1<tab/>Introduction</title>
+       </clause>
+       <clause id="O" inline-header="false" obligation="normative">
+         <title depth="2">5.2<tab/>Clause 4.2</title>
+       </clause></clause>
+       </sections><annex id="P" inline-header="false" obligation="normative" displayorder="8">
+         <title><strong>Annex A</strong><br/>(normative)<br/><br/><strong>Annex</strong></title>
+         <clause id="Q" inline-header="false" obligation="normative">
+         <title depth="2">A.1<tab/>Annex A.1</title>
+         <clause id="Q1" inline-header="false" obligation="normative">
+         <title depth="3">A.1.1<tab/>Annex A.1a</title>
+         </clause>
+       </clause>
+              <appendix id="Q2" inline-header="false" obligation="normative">
+         <title depth="2">Appendix 1<tab/>An Appendix</title>
+       </appendix>
+       </annex><bibliography><references id="R" obligation="informative" normative="true" displayorder="4">
+         <title depth="1">2<tab/>Normative References</title>
+       </references><clause id="S" obligation="informative" displayorder="9">
+         <title depth="1">Bibliography</title>
+         <references id="T" obligation="informative" normative="false">
+         <title depth="2">Bibliography Subsection</title>
+       </references>
+       </clause>
+       </bibliography>
        </iso-standard>
     OUTPUT
   end
@@ -516,163 +437,156 @@ RSpec.describe IsoDoc do
        </clause>
        </bibliography>
        </iso-standard>
-        INPUT
-
-        presxml = <<~OUTPUT
-<iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
-       <bibdata>
-       <language current="true">fr</language>
-       <ext>
-  <doctype language=''>international-standard</doctype>
-  <doctype language='fr'>Norme international</doctype>
-  <doctype language='en'>International Standard</doctype>
-  <horizontal language=''>false</horizontal>
-  <function language=''>emc</function>
-  <function language='fr'>Publication fondamentale en CEM</function>
-  <function language='en'>Basic EMC Publication</function>
-</ext>
-       </bibdata>
-       <preface>
-       <foreword obligation="informative">
-          <title>Foreword</title>
-          <p id="A">This is a preamble</p>
-        </foreword>
-         <introduction id="B" obligation="informative"><title depth="1">0<tab/>Introduction</title><clause id="C" inline-header="false" obligation="informative">
-          <title depth="2">0.1<tab/>Introduction Subsection</title>
-        </clause>
-        <p>This is patent boilerplate</p>
-        </introduction></preface><sections>
-        <clause id="D" obligation="normative" type="scope">
-          <title depth="1">1<tab/>Scope</title>
-          <p id="E">Text</p>
-        </clause>
-     
-        <clause id="H" obligation="normative"><title depth="1">3<tab/>Terms, definitions, symbols and abbreviated terms</title><terms id="I" obligation="normative">
-          <title depth="2">3.1<tab/>Normal Terms</title>
-          <term id="J"><name>3.1.1</name>
-          <preferred>Term2</preferred>
-        </term>
-        </terms>
-        <definitions id="K"><title>3.2</title>
-          <dl>
-          <dt>Symbol</dt>
-          <dd>Definition</dd>
-          </dl>
-        </definitions>
-        </clause>
-        <definitions id="L"><title>4</title>
-          <dl>
-          <dt>Symbol</dt>
-          <dd>Definition</dd>
-          </dl>
-        </definitions>
-        <clause id="M" inline-header="false" obligation="normative"><title depth="1">5<tab/>Clause 4</title><clause id="N" inline-header="false" obligation="normative">
-          <title depth="2">5.1<tab/>Introduction</title>
-        </clause>
-        <clause id="O" inline-header="false" obligation="normative">
-          <title depth="2">5.2<tab/>Clause 4.2</title>
-        </clause></clause>
-     
-        </sections><annex id="P" inline-header="false" obligation="normative">
-          <title><strong>Annexe A</strong><br/>(normative)<br/><br/><strong>Annex</strong></title>
-          <clause id="Q" inline-header="false" obligation="normative">
-          <title depth="2">A.1<tab/>Annex A.1</title>
-          <clause id="Q1" inline-header="false" obligation="normative">
-          <title depth="3">A.1.1<tab/>Annex A.1a</title>
-          </clause>
-        </clause>
-               <appendix id="Q2" inline-header="false" obligation="normative">
-          <title depth="2">Appendice 1<tab/>An Appendix</title>
-        </appendix>
-        </annex><bibliography><references id="R" obligation="informative" normative="true">
-          <title depth="1">2<tab/>Normative References</title>
-        </references><clause id="S" obligation="informative">
-          <title depth="1">Bibliography</title>
-          <references id="T" obligation="informative" normative="false">
-          <title depth="2">Bibliography Subsection</title>
-        </references>
-        </clause>
-        </bibliography>
-        </iso-standard>
-        OUTPUT
-
-        html = <<~OUTPUT
-    #{HTML_HDR.sub(/INTERNATIONAL ELECTROTECHNICAL COMMISSION/, "COMMISSION ELECTROTECHNIQUE INTERNATIONALE").
-    gsub(/"en"/, '"fr"')}
-             <div>
-               <h1 class="ForewordTitle">AVANT-PROPOS</h1>
-               <div class="boilerplate_legal"/>
-               <p id="A">This is a preamble</p>
-             </div>
-             <br/>
-             <div class="Section3" id="B">
-               <h1 class="IntroTitle">0&#160; Introduction</h1>
-               <div id="C"><h2>0.1&#160; Introduction Subsection</h2>
+    INPUT
 
-        </div>
-               <p>This is patent boilerplate</p>
-             </div>
-             #{IEC_TITLE1}
-             <div id="D">
-               <h1>1&#160; Scope</h1>
-               <p id="E">Text</p>
-             </div>
-             <div>
-               <h1>2&#160; Normative References</h1>
-             </div>
-             <div id="H"><h1>3&#160; Terms, definitions, symbols and abbreviated terms</h1>
-       <div id="I"><h2>3.1&#160; Normal Terms</h2>
+    presxml = <<~OUTPUT
+      <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
+      <bibdata>
+      <language current="true">fr</language>
+      <ext>
+      <doctype language="">international-standard</doctype><doctype language="fr">Norme international</doctype><doctype language="en">International Standard</doctype>
+      <horizontal language="">false</horizontal>
+      <function language="">emc</function><function language="fr">Publication fondamentale en CEM</function><function language="en">Basic EMC Publication</function>
+      </ext>
+      </bibdata>
+      <preface>
+      <foreword obligation="informative" displayorder="1">
+         <title>Foreword</title>
+         <p id="A">This is a preamble</p>
+       </foreword>
+        <introduction id="B" obligation="informative" displayorder="2"><title depth="1">0<tab/>Introduction</title><clause id="C" inline-header="false" obligation="informative">
+         <title depth="2">0.1<tab/>Introduction Subsection</title>
+       </clause>
+       <p>This is patent boilerplate</p>
+       </introduction></preface><sections>
+       <clause id="D" obligation="normative" type="scope" displayorder="3">
+         <title depth="1">1<tab/>Scope</title>
+         <p id="E">Text</p>
+       </clause>
+       <clause id="H" obligation="normative" displayorder="5"><title depth="1">3<tab/>Terms, definitions, symbols and abbreviated terms</title><terms id="I" obligation="normative">
+         <title depth="2">3.1<tab/>Normal Terms</title>
+         <term id="J"><name>3.1.1</name>
+         <preferred>Term2</preferred>
+       </term>
+       </terms>
+       <definitions id="K"><title>3.2</title>
+         <dl>
+         <dt>Symbol</dt>
+         <dd>Definition</dd>
+         </dl>
+       </definitions>
+       </clause>
+       <definitions id="L" displayorder="6"><title>4</title>
+         <dl>
+         <dt>Symbol</dt>
+         <dd>Definition</dd>
+         </dl>
+       </definitions>
+       <clause id="M" inline-header="false" obligation="normative" displayorder="7"><title depth="1">5<tab/>Clause 4</title><clause id="N" inline-header="false" obligation="normative">
+         <title depth="2">5.1<tab/>Introduction</title>
+       </clause>
+       <clause id="O" inline-header="false" obligation="normative">
+         <title depth="2">5.2<tab/>Clause 4.2</title>
+       </clause></clause>
+       </sections><annex id="P" inline-header="false" obligation="normative" displayorder="8">
+         <title><strong>Annexe A</strong><br/>(normative)<br/><br/><strong>Annex</strong></title>
+         <clause id="Q" inline-header="false" obligation="normative">
+         <title depth="2">A.1<tab/>Annex A.1</title>
+         <clause id="Q1" inline-header="false" obligation="normative">
+         <title depth="3">A.1.1<tab/>Annex A.1a</title>
+         </clause>
+       </clause>
+              <appendix id="Q2" inline-header="false" obligation="normative">
+         <title depth="2">Appendice 1<tab/>An Appendix</title>
+       </appendix>
+       </annex><bibliography><references id="R" obligation="informative" normative="true" displayorder="4">
+         <title depth="1">2<tab/>Normative References</title>
+       </references><clause id="S" obligation="informative" displayorder="9">
+         <title depth="1">Bibliography</title>
+         <references id="T" obligation="informative" normative="false">
+         <title depth="2">Bibliography Subsection</title>
+       </references>
+       </clause>
+       </bibliography>
+       </iso-standard>
+    OUTPUT
 
-          <p class="TermNum" id="J">3.1.1</p>
-          <p class="Terms" style="text-align:left;">Term2</p>
+    html = <<~OUTPUT
+      #{HTML_HDR.sub(/INTERNATIONAL ELECTROTECHNICAL COMMISSION/, 'COMMISSION ELECTROTECHNIQUE INTERNATIONALE')
+      .gsub(/"en"/, '"fr"')}
+               <div>
+                 <h1 class="ForewordTitle">AVANT-PROPOS</h1>
+                 <div class="boilerplate_legal"/>
+                 <p id="A">This is a preamble</p>
+               </div>
+               <br/>
+               <div class="Section3" id="B">
+                 <h1 class="IntroTitle">0&#160; Introduction</h1>
+                 <div id="C"><h2>0.1&#160; Introduction Subsection</h2>
 
-        </div><div id="K"><h2>3.2</h2>
-          <dl><dt><p>Symbol</p></dt><dd>Definition</dd></dl>
-        </div></div>
-             <div id="L" class="Symbols">
-               <h1>4</h1>
-               <dl>
-                 <dt>
-                   <p>Symbol</p>
-                 </dt>
-                 <dd>Definition</dd>
-               </dl>
-             </div>
-             <div id="M">
-               <h1>5&#160; Clause 4</h1>
-               <div id="N"><h2>5.1&#160; Introduction</h2>
+          </div>
+                 <p>This is patent boilerplate</p>
+               </div>
+               #{IEC_TITLE1}
+               <div id="D">
+                 <h1>1&#160; Scope</h1>
+                 <p id="E">Text</p>
+               </div>
+               <div>
+                 <h1>2&#160; Normative References</h1>
+               </div>
+               <div id="H"><h1>3&#160; Terms, definitions, symbols and abbreviated terms</h1>
+         <div id="I"><h2>3.1&#160; Normal Terms</h2>
+
+            <p class="TermNum" id="J">3.1.1</p>
+            <p class="Terms" style="text-align:left;">Term2</p>
+
+          </div><div id="K"><h2>3.2</h2>
+            <dl><dt><p>Symbol</p></dt><dd>Definition</dd></dl>
+          </div></div>
+               <div id="L" class="Symbols">
+                 <h1>4</h1>
+                 <dl>
+                   <dt>
+                     <p>Symbol</p>
+                   </dt>
+                   <dd>Definition</dd>
+                 </dl>
+               </div>
+               <div id="M">
+                 <h1>5&#160; Clause 4</h1>
+                 <div id="N"><h2>5.1&#160; Introduction</h2>
 
-        </div>
-               <div id="O"><h2>5.2&#160; Clause 4.2</h2>
+          </div>
+                 <div id="O"><h2>5.2&#160; Clause 4.2</h2>
 
-        </div>
-             </div>
-             <br/>
-             <div id="P" class="Section3">
-               <h1 class="Annex"><b>Annexe A</b><br/>(normative)<br/><br/><b>Annex</b></h1>
-               <div id="Q"><h2>A.1&#160; Annex A.1</h2>
+          </div>
+               </div>
+               <br/>
+               <div id="P" class="Section3">
+                 <h1 class="Annex"><b>Annexe A</b><br/>(normative)<br/><br/><b>Annex</b></h1>
+                 <div id="Q"><h2>A.1&#160; Annex A.1</h2>
 
-          <div id="Q1"><h3>A.1.1&#160; Annex A.1a</h3>
+            <div id="Q1"><h3>A.1.1&#160; Annex A.1a</h3>
 
+            </div>
           </div>
-        </div>
-               <div id="Q2"><h2>Appendice 1&#160; An Appendix</h2>
+                 <div id="Q2"><h2>Appendice 1&#160; An Appendix</h2>
 
-        </div>
-             </div>
-             <br/>
-             <div>
-               <h1 class="Section3">Bibliography</h1>
+          </div>
+               </div>
+               <br/>
                <div>
-                 <h2 class="Section3">Bibliography Subsection</h2>
+                 <h1 class="Section3">Bibliography</h1>
+                 <div>
+                   <h2 class="Section3">Bibliography Subsection</h2>
+                 </div>
                </div>
              </div>
-           </div>
-         </body>
-       </html>
+           </body>
+         </html>
     OUTPUT
     expect(xmlpp(IsoDoc::Iec::PresentationXMLConvert.new({}).convert("test", input, true).sub(%r{<localized-strings>.*</localized-strings>}m, ""))).to be_equivalent_to xmlpp(presxml)
     expect(xmlpp(IsoDoc::Iec::HtmlConvert.new({}).convert("test", presxml, true))).to be_equivalent_to xmlpp(html)
   end
-
 end