metanorma-iso 1.4.1 → 1.5.1

data/lib/isodoc/iso/metadata.rb

@@ -3,7 +3,7 @@ require "isodoc"
 module IsoDoc
   module Iso
     class  Metadata < IsoDoc::Metadata
-      def initialize(lang, script, labels)
+      def initialize(lang, script, i18n)
         super
         @metadata = {
           tc: "XXXX",

data/lib/isodoc/iso/presentation_xml_convert.rb

@@ -1,4 +1,4 @@
-require_relative "base_convert"
+require_relative "init"
 require "isodoc"
 
 module IsoDoc
@@ -8,6 +8,104 @@ module IsoDoc
     # schema encapsulation of the document for validation
     #
     class PresentationXMLConvert < IsoDoc::PresentationXMLConvert
+      def initialize(options)
+        super
+      end
+
+      def convert1(docxml, filename, dir)
+        if amd(docxml)
+          @oldsuppressheadingnumbers = @suppressheadingnumbers
+          @suppressheadingnumbers = true
+        end
+        super
+      end
+
+      def annex(isoxml)
+        amd(isoxml) and @suppressheadingnumbers = @oldsuppressheadingnumbers
+        super
+        isoxml.xpath(ns("//annex//clause | //annex//appendix")).each do |f|
+          clause1(f)
+        end
+        amd(isoxml) and @suppressheadingnumbers = true
+      end
+
+      def xref_init(lang, script, klass, labels, options)
+        @xrefs = Xref.new(lang, script, klass, labels, options)
+      end
+
+      def figure1(f)
+        return if labelled_ancestor(f) && f.ancestors("figure").empty?
+        lbl = @xrefs.anchor(f['id'], :label, false) or return
+        figname = f.parent.name == "figure" ? "" : "#{@i18n.figure} "
+        connective = f.parent.name == "figure" ? "&nbsp; " : "&nbsp;&mdash; "
+        prefix_name(f, connective, l10n("#{figname}#{lbl}"), "name")
+      end
+
+      def example1(f)
+        n = @xrefs.get[f["id"]]
+        lbl = (n.nil? || n[:label].nil? || n[:label].empty?) ? @i18n.example :
+          l10n("#{@i18n.example} #{n[:label]}")
+        prefix_name(f, "&nbsp;&mdash; ", lbl, "name")
+      end
+
+      def eref_localities1_zh(target, type, from, to, delim)
+        subsection = from&.text&.match(/\./)
+        ret = (delim == ";") ? ";" : (type == "list") ? "" : delim
+        ret += " 第#{from.text}" if from
+        ret += "&ndash;#{to.text}" if to
+        loc = (@i18n.locality[type] || type.sub(/^locality:/, "").capitalize )
+        ret += " #{loc}" unless subsection && type == "clause" ||
+          type == "list" || target.match(/^IEV$|^IEC 60050-/)
+        ret += ")" if type == "list"
+        ret
+      end
+
+      def eref_localities1(target, type, from, to, delim, lang = "en")
+        return "" if type == "anchor"
+        subsection = from&.text&.match(/\./)
+        type = type.downcase
+        lang == "zh" and
+          return l10n(eref_localities1_zh(target, type, from, to, delim))
+        ret = (delim == ";") ? ";" : (type == "list") ? "" : delim
+        loc = @i18n.locality[type] || type.sub(/^locality:/, "").capitalize
+        ret += " #{loc}" unless subsection && type == "clause" ||
+          type == "list" || target.match(/^IEV$|^IEC 60050-/)
+        ret += " #{from.text}" if from
+        ret += "&ndash;#{to.text}" if to
+        ret += ")" if type == "list"
+        l10n(ret)
+      end
+
+      def prefix_container(container, linkend, target)
+        delim = @xrefs.anchor(target, :type) == "listitem" ? " " : ", "
+        l10n(@xrefs.anchor(container, :xref) + delim + linkend)
+      end
+
+      def example_span_label(node, div, name)
+        return if name.nil?
+        div.span **{ class: "example_label" } do |p|
+          name.children.each { |n| parse(n, div) }
+        end
+      end
+
+      def clause1(f)
+        if !f.at(ns("./title")) &&
+            !%w(sections preface bibliography).include?(f.parent.name)
+          f["inline-header"] = "true"
+        end
+        super
+      end
+
+      def clause(docxml)
+        docxml.xpath(ns("//clause[not(ancestor::annex)] | "\
+                        "//terms | //definitions | //references | "\
+                        "//preface/introduction[clause]")).
+        each do |f|
+          clause1(f)
+        end
+      end
+
+      include Init
     end
   end
 end

data/lib/isodoc/iso/sections.rb

@@ -37,11 +37,10 @@ module IsoDoc
 
       def introduction(isoxml, out)
         f = isoxml.at(ns("//introduction")) || return
-        num = f.at(ns(".//clause")) ? "0" : nil
         title_attr = { class: "IntroTitle" }
         page_break(out)
         out.div **{ class: "Section3", id: f["id"] } do |div|
-          clause_name(num, @introduction_lbl, div, title_attr)
+          clause_name(nil, f.at(ns("./title")), div, title_attr)
           f.elements.each do |e|
             parse(e, div) unless e.name == "title"
           end
@@ -52,15 +51,11 @@ module IsoDoc
         f = isoxml.at(ns("//foreword")) || return
         page_break(out)
         out.div **attr_code(id: f["id"]) do |s|
-          s.h1(**{ class: "ForewordTitle" }) { |h1| h1 << @foreword_lbl }
+          clause_name(nil, f.at(ns("./title")) || @i18n.foreword, s,
+                      { class: "ForewordTitle" })
           f.elements.each { |e| parse(e, s) unless e.name == "title" }
         end
       end
-
-      def clause_parse_title(node, div, c1, out)
-        return inline_header_title(out, node, c1) if c1.nil?
-        super
-      end
     end
   end
 end

data/lib/isodoc/iso/word_convert.rb

@@ -1,6 +1,6 @@
 require_relative "base_convert"
 require "isodoc"
-require_relative "metadata"
+require_relative "init"
 
 module IsoDoc
   module Iso
@@ -121,6 +121,7 @@ module IsoDoc
       end
 
       include BaseConvert
+      include Init
     end
   end
 end

data/lib/isodoc/iso/xref.rb

@@ -21,6 +21,8 @@ module IsoDoc
       # we can reference 0-number clauses in introduction
       def introduction_names(clause)
         return if clause.nil?
+        clause.at(ns("./clause")) and @anchors[clause["id"]] = 
+          { label: "0", level: 1, xref: clause.at(ns("./title"))&.text, type: "clause" }
         clause.xpath(ns("./clause")).each_with_index do |c, i|
           section_names1(c, "0.#{i + 1}", 2)
         end

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "1.4.1".freeze
+    VERSION = "1.5.1".freeze
   end
 end

data/metanorma-iso.gemspec

@@ -30,17 +30,18 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
   spec.add_dependency "ruby-jing"
-  spec.add_dependency "isodoc", "~> 1.1.0"
-  spec.add_dependency "metanorma-standoc", "~> 1.4.0"
+  spec.add_dependency "isodoc", "~> 1.2.0"
+  spec.add_dependency "metanorma-standoc", "~> 1.5.0"
   spec.add_dependency "tokenizer", "~> 0.3.0"
   spec.add_dependency "twitter_cldr"
   spec.add_dependency "mn2sts", "~> 1.2.0"
 
   spec.add_development_dependency "byebug"
+  spec.add_development_dependency "sassc", "2.4.0"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"
   spec.add_development_dependency "guard-rspec", "~> 4.7"
-  spec.add_development_dependency "rake", "~> 12.0"
+  spec.add_development_dependency "rake" #, "~> 12.0"
   spec.add_development_dependency "rspec", "~> 3.6"
   spec.add_development_dependency "rubocop", "= 0.54.0"
   spec.add_development_dependency "simplecov", "~> 0.15"

data/spec/asciidoctor-iso/cleanup_spec.rb

@@ -190,7 +190,7 @@ RSpec.describe Asciidoctor::ISO do
       </p>
       </foreword></preface><sections>
       </sections><bibliography><references id="_" obligation="informative" normative="true">
-        <title>Normative References</title>
+        <title>Normative references</title>
         <p id="_">The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
         <bibitem id="iso216" type="standard">
          <title format="text/plain">Reference</title>
@@ -233,7 +233,7 @@ RSpec.describe Asciidoctor::ISO do
         </p>
       </foreword></preface><sections>
       </sections><bibliography><references id="_" obligation="informative" normative="true">
-        <title>Normative References</title>
+        <title>Normative references</title>
         <p id="_">The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
         <bibitem id="iso216" type="standard">
          <title format="text/plain">Reference</title>
@@ -333,7 +333,7 @@ RSpec.describe Asciidoctor::ISO do
     INPUT
       #{BLANK_HDR}
       <sections></sections>
-      <bibliography><references id="_" obligation="informative" normative="true"><title>Normative References</title>
+      <bibliography><references id="_" obligation="informative" normative="true"><title>Normative references</title>
       <p id="_">The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
              <bibitem id="iso216" type="standard">
          <title format="text/plain">Reference</title>
@@ -638,7 +638,7 @@ RSpec.describe Asciidoctor::ISO do
       </fn>
       </p>
       </clause></sections><bibliography><references id="_" obligation="informative" normative="true">
-        <title>Normative References</title>
+        <title>Normative references</title>
         <p id="_">The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
         <bibitem id="iso123" type="standard">
          <title format="text/plain">Standard</title>

data/spec/asciidoctor-iso/inline_spec.rb

@@ -128,7 +128,7 @@ RSpec.describe Asciidoctor::ISO do
        <sections>
 
        </sections><bibliography><references id="_" obligation="informative" normative="true">
-         <title>Normative References</title>
+         <title>Normative references</title>
          <p id="_">The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
          <bibitem id="ISO712">
          <formattedref format="application/x-isodoc+xml">Reference</formattedref>

data/spec/asciidoctor-iso/refs_spec.rb

@@ -16,7 +16,7 @@ RSpec.describe Asciidoctor::ISO do
        #{BLANK_HDR}
        <sections>
               </sections><bibliography><references id="_" obligation="informative" normative="true">
-         <title>Normative References</title>
+         <title>Normative references</title>
          <p id="_">The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
          <bibitem id="iso123" type="standard">
          <title format="text/plain">Standard</title>
@@ -65,7 +65,7 @@ RSpec.describe Asciidoctor::ISO do
   </clause>
 </sections>
       <bibliography><references id="_" obligation="informative" normative="true">
-        <title>Normative References</title>
+        <title>Normative references</title>
         <p id="_">The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
         <bibitem id="iso123" type="standard">
          <title format="text/plain">Standard</title>
@@ -101,7 +101,7 @@ RSpec.describe Asciidoctor::ISO do
               <sections>
 
        </sections><bibliography><references id="_" obligation="informative" normative="true">
-         <title>Normative References</title>
+         <title>Normative references</title>
          <p id="_">The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
          <bibitem id="iso123">
          <formattedref format="application/x-isodoc+xml">

data/spec/asciidoctor-iso/section_spec.rb

@@ -66,7 +66,7 @@ RSpec.describe Asciidoctor::ISO do
   <title>Acknowledgements</title>
 </acknowledgements>
 </preface><sections>
-       <clause id="_" obligation="normative">
+       <clause id="_" obligation="normative" inline-header='false' type="scope">
          <title>Scope</title>
          <p id="_">Text</p>
        </clause>
@@ -88,7 +88,9 @@ standardization at the following addresses:</p>
          <preferred>Term1</preferred>
        </term>
        </terms>
-       <clause id="_" obligation="normative"><title>Terms, definitions, symbols and abbreviated terms</title><terms id="_" obligation="normative">
+       <clause id="_" obligation="normative"><title>Terms, definitions, symbols and abbreviated terms</title>
+<terms id="_" obligation="normative">
+<title>Normal Terms</title>
        <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
 <p id='_'>
   ISO and IEC maintain terminological databases for use in
@@ -108,13 +110,14 @@ standardization at the following addresses:</p>
     </p>
   </li>
 </ul>
-         <title>Normal Terms</title>
          <term id="term-term2">
          <preferred>Term2</preferred>
        </term>
        </terms>
-       <definitions id="_"><title>Symbols and Abbreviated Terms</title></definitions></clause>
-       <definitions id="_"><title>Symbols and Abbreviated Terms</title></definitions>
+       <definitions id="_" obligation="normative">
+<title>Symbols and abbreviated terms</title></definitions></clause>
+       <definitions id="_" obligation="normative">
+<title>Symbols and abbreviated terms</title></definitions>
        <clause id="_" inline-header="false" obligation="normative"><title>Clause 4</title><clause id="_" inline-header="false" obligation="normative">
          <title>Introduction</title>
        </clause>
@@ -134,7 +137,7 @@ standardization at the following addresses:</p>
        <appendix id="_" inline-header="false" obligation="normative">
           <title>Appendix 1</title>
        </appendix></annex><bibliography><references id="_" obligation="informative" normative="true">
-         <title>Normative References</title>
+         <title>Normative references</title>
          <p id="_">There are no normative references in this document.</p>
        </references><clause id="_" obligation="informative">
          <title>Bibliography</title>

data/spec/asciidoctor-iso/validate_spec.rb

@@ -527,7 +527,7 @@ it "Style warning if Symbols and Abbreviated Terms contains extraneous matter" d
     expect(File.read("test.err")).to include "Symbols and Abbreviated Terms can only contain a definition list"
 end
 
-it "Warning if do not start with scope or introduction" do
+it "Warning if missing foreword" do
     FileUtils.rm_f "test.err"
   Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
   #{VALIDATING_BLANK_HDR}
@@ -536,19 +536,15 @@ it "Warning if do not start with scope or introduction" do
 
   Paragraph
   INPUT
-    expect(File.read("test.err")).to include "Prefatory material must be followed by (clause) Scope"
+    expect(File.read("test.err")).to include "Initial section must be (content) Foreword"
 end
 
-it "Warning if introduction not followed by scope" do
+it "Warning if do not start with scope or introduction" do
     FileUtils.rm_f "test.err"
   Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
   #{VALIDATING_BLANK_HDR}
-
-  .Foreword 
   Foreword
 
-  == Introduction
-
   == Symbols and Abbreviated Terms
 
   Paragraph
@@ -556,7 +552,7 @@ it "Warning if introduction not followed by scope" do
     expect(File.read("test.err")).to include "Prefatory material must be followed by (clause) Scope"
 end
 
-it "Warning if normative references not followed by terms and definitions" do
+it "Warning if introduction not followed by scope" do
     FileUtils.rm_f "test.err"
   Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
   #{VALIDATING_BLANK_HDR}
@@ -564,19 +560,16 @@ it "Warning if normative references not followed by terms and definitions" do
   .Foreword 
   Foreword
 
-  == Scope
-
-  [bibliography]
-  == Normative References
+  == Introduction
 
   == Symbols and Abbreviated Terms
 
   Paragraph
   INPUT
-    expect(File.read("test.err")).to include "Normative References must be followed by Terms and Definitions"
+    expect(File.read("test.err")).to include "Prefatory material must be followed by (clause) Scope"
 end
 
-it "Warning if there are no clauses in the document" do
+it "Warning if normative references not followed by terms and definitions" do
     FileUtils.rm_f "test.err"
   Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
   #{VALIDATING_BLANK_HDR}
@@ -589,20 +582,19 @@ it "Warning if there are no clauses in the document" do
   [bibliography]
   == Normative References
 
-  == Terms and Definitions
-
   == Symbols and Abbreviated Terms
 
+  Paragraph
   INPUT
-    expect(File.read("test.err")).to include "Document must contain clause after Terms and Definitions"
+    expect(File.read("test.err")).to include "Normative References must be followed by Terms and Definitions"
 end
 
-it "Warning if scope occurs after Terms and Definitions" do
+it "Warning if there are no clauses in the document" do
     FileUtils.rm_f "test.err"
   Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
   #{VALIDATING_BLANK_HDR}
 
-  .Foreword
+  .Foreword 
   Foreword
 
   == Scope
@@ -612,10 +604,10 @@ it "Warning if scope occurs after Terms and Definitions" do
 
   == Terms and Definitions
 
-  == Scope
+  == Symbols and Abbreviated Terms
 
   INPUT
-    expect(File.read("test.err")).to include "Scope must occur before Terms and Definitions"
+    expect(File.read("test.err")).to include "Document must contain at least one clause"
 end
 
 it "Warning if scope occurs after Terms and Definitions" do

data/spec/isodoc/amd_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 RSpec.describe IsoDoc do
   it "cross-references notes in amendments" do
-    expect(xmlpp(IsoDoc::Iso::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <bibdata> <ext> <doctype>amendment</doctype> </ext> </bibdata>
     <preface>
@@ -56,66 +56,104 @@ RSpec.describe IsoDoc do
     </annex>
     </iso-standard>
     INPUT
-    #{HTML_HDR}
-    <br/>
-               <div>
-                 <h1 class="ForewordTitle">Foreword</h1>
-                 <p>
-           <a href="#N">[N]</a>
-           <a href="#note1">[note1]</a>
-           <a href="#note2">[note2]</a>
-           <a href="#AN">A.1, Note</a>
-           <a href="#Anote1">A.2, Note 1</a>
-           <a href="#Anote2">A.2, Note 2</a>
-           </p>
-               </div>
-               <p class="zzSTDTitle1"/>
-               <div id="scope">
-                 <h1>Scope</h1>
-                 <div id="N" class="Note">
-                   <p><span class="note_label">NOTE</span>&#160; These results are based on a study carried out on three different types of kernel.</p>
-                 </div>
-                 <p>
-                   <a href="#N">[n]</a>
-                 </p>
-               </div>
-               <div id="terms"><h1/>
-       </div>
-               <div id="widgets">
-                 <h1>Widgets</h1>
-                 <div id="widgets1"><span class='zzMoveToFollowing'><b/></span>
-           <div id="note1" class="Note"><p><span class="note_label">NOTE</span>&#160; These results are based on a study carried out on three different types of kernel.</p></div>
-           <div id="note2" class="Note"><p><span class="note_label">NOTE</span>&#160; These results are based on a study carried out on three different types of kernel.</p></div>
-       <p>    <a href="#note1">[note1]</a> <a href="#note2">[note2]</a> </p>
-
-           </div>
-               </div>
-               <br/>
-               <div id="annex1" class="Section3">
-               <h1 class='Annex'>
-               <b>Annex A</b>
+     <?xml version='1.0'?>
+<iso-standard xmlns='http://riboseinc.com/isoxml'>
+  <bibdata>
+    <ext>
+      <doctype>amendment</doctype>
+    </ext>
+  </bibdata>
+  <preface>
+    <foreword>
+      <p>
+        <xref target='N'>[N]</xref>
+<xref target='note1'>[note1]</xref>
+<xref target='note2'>[note2]</xref>
+<xref target='AN'>A.1, Note</xref>
+<xref target='Anote1'>A.2, Note 1</xref>
+<xref target='Anote2'>A.2, Note 2</xref>
+      </p>
+    </foreword>
+  </preface>
+  <sections>
+    <clause id='scope'>
+      <title depth="1">Scope</title>
+      <note id='N'>
+        <name>NOTE</name>
+        <p id='_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f'>
+          These results are based on a study carried out on three different
+          types of kernel.
+        </p>
+      </note>
+      <p>
+       <xref target='N'>[n]</xref>
+      </p>
+    </clause>
+    <terms id='terms'/>
+    <clause id='widgets'>
+      <title depth="1">Widgets</title>
+      <clause id='widgets1' inline-header="true">
+        <note id='note1'>
+          <name>NOTE</name>
+          <p id='_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f'>
+            These results are based on a study carried out on three different
+            types of kernel.
+          </p>
+        </note>
+        <note id='note2'>
+          <name>NOTE</name>
+          <p id='_f06fd0d1-a203-4f3d-a515-0bdba0f8d83a'>
+            These results are based on a study carried out on three different
+            types of kernel.
+          </p>
+        </note>
+        <p>
+        <xref target='note1'>[note1]</xref>
+<xref target='note2'>[note2]</xref>
+        </p>
+      </clause>
+    </clause>
+  </sections>
+  <annex id='annex1'>
+  <title>
+  <strong>Annex A</strong>
   <br/>
   (informative)
-  <br/>
-  <br/>
-  <b/>
-</h1>
-                 <div id="annex1a"><span class='zzMoveToFollowing'><b>A.1&#160; </b></span>
-           <div id="AN" class="Note"><p><span class="note_label">NOTE</span>&#160; These results are based on a study carried out on three different types of kernel.</p></div>
-           </div>
-                 <div id="annex1b"><span class='zzMoveToFollowing'><b>A.2&#160; </b></span>
-           <div id="Anote1" class="Note"><p><span class="note_label">NOTE 1</span>&#160; These results are based on a study carried out on three different types of kernel.</p></div>
-           <div id="Anote2" class="Note"><p><span class="note_label">NOTE 2</span>&#160; These results are based on a study carried out on three different types of kernel.</p></div>
-           </div>
-               </div>
-             </div>
-           </body>
-       </html>
+</title>
+<clause id='annex1a' inline-header='true'>
+<title>A.1</title>
+      <note id='AN'>
+        <name>NOTE</name>
+        <p id='_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f'>
+          These results are based on a study carried out on three different
+          types of kernel.
+        </p>
+      </note>
+    </clause>
+    <clause id='annex1b' inline-header="true">
+     <title>A.2</title>
+      <note id='Anote1'>
+        <name>NOTE 1</name>
+        <p id='_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f'>
+          These results are based on a study carried out on three different
+          types of kernel.
+        </p>
+      </note>
+      <note id='Anote2'>
+        <name>NOTE 2</name>
+        <p id='_f06fd0d1-a203-4f3d-a515-0bdba0f8d83a'>
+          These results are based on a study carried out on three different
+          types of kernel.
+        </p>
+      </note>
+    </clause>
+  </annex>
+</iso-standard>
     OUTPUT
   end
 
   it "cross-references sections" do
-    expect(xmlpp(IsoDoc::Iso::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       <iso-standard xmlns="http://riboseinc.com/isoxml">
     <bibdata> <ext> <doctype>amendment</doctype> </ext> </bibdata>
       <preface>
@@ -145,7 +183,7 @@ RSpec.describe IsoDoc do
        </clause>
        <clause id="C1" inline-header="false" obligation="informative">Text</clause>
        </introduction></preface><sections>
-       <clause id="D" obligation="normative">
+       <clause id="D" obligation="normative" type="scope">
          <title>Scope</title>
          <p id="E">Text</p>
        </clause>
@@ -179,85 +217,107 @@ RSpec.describe IsoDoc do
        </bibliography>
        </iso-standard>
     INPUT
-        #{HTML_HDR}
-    <br/>
-    <div>
-    <h1 class="ForewordTitle">Foreword</h1>
-    <p id="A">This is a preamble
-                     <a href='#C'>[C]</a>
-                 <a href='#C1'>[C1]</a>
-                 <a href='#D'>[D]</a>
-                 <a href='#H'>[H]</a>
-                 <a href='#I'>[I]</a>
-                 <a href='#J'>[J]</a>
-                 <a href='#K'>[K]</a>
-                 <a href='#L'>[L]</a>
-                 <a href='#M'>[M]</a>
-                 <a href='#N'>[N]</a>
-                 <a href='#O'>[O]</a>
-                 <a href='#P'>Annex A</a>
-                 <a href='#Q'>A.1</a>
-                 <a href='#Q1'>A.1.1</a>
-                 <a href='#Q2'>Annex A, Appendix 1</a>
-                 <a href='#R'>[R]</a>
-    </p>
-    </div>
-    <br/>
-                 <div class="Section3" id="B">
-                 <h1 class="IntroTitle">Introduction</h1>
-               <div id="C">
-                 <h1>Introduction Subsection</h1>
-        </div>
-        <div id="C1"><span class='zzMoveToFollowing'>
-  <b/>
-</span>
-Text</div>
-             </div>
-    <p class="zzSTDTitle1"/>
-    <div id="D">
-    <h1>Scope</h1>
-      <p id="E">Text</p>
-    </div>
-    <div>
-    <h1>Normative references</h1>
-    </div>
-               <div id="M">
-                 <h1>Clause 4</h1>
-                 <div id="N">
-          <h1>Introduction</h1>
-        </div>
-                 <div id="O">
-          <h1>Clause 4.2</h1>
-        </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>
-           </body>
-       </html>
+    <?xml version='1.0'?>
+       <iso-standard xmlns='http://riboseinc.com/isoxml'>
+         <bibdata>
+           <ext>
+             <doctype>amendment</doctype>
+           </ext>
+         </bibdata>
+         <preface>
+           <foreword obligation='informative'>
+             <title>Foreword</title>
+             <p id='A'>
+               This is a preamble
+               <xref target='C'>[C]</xref>
+               <xref target='C1'>[C1]</xref>
+               <xref target='D'>[D]</xref>
+               <xref target='H'>[H]</xref>
+               <xref target='I'>[I]</xref>
+               <xref target='J'>[J]</xref>
+               <xref target='K'>[K]</xref>
+               <xref target='L'>[L]</xref>
+               <xref target='M'>[M]</xref>
+               <xref target='N'>[N]</xref>
+               <xref target='O'>[O]</xref>
+               <xref target='P'>Annex A</xref>
+               <xref target='Q'>A.1</xref>
+               <xref target='Q1'>A.1.1</xref>
+               <xref target='Q2'>Annex A, Appendix 1</xref>
+               <xref target='R'>[R]</xref>
+             </p>
+           </foreword>
+           <introduction id='B' obligation='informative'>
+             <title depth="1">Introduction</title>
+             <clause id='C' inline-header='false' obligation='informative'>
+               <title depth="1">Introduction Subsection</title>
+             </clause>
+             <clause id='C1' inline-header='true' obligation='informative'>Text</clause>
+           </introduction>
+         </preface>
+         <sections>
+           <clause id='D' obligation='normative' type="scope">
+             <title depth="1">Scope</title>
+             <p id='E'>Text</p>
+           </clause>
+           <clause id='M' inline-header='false' obligation='normative'>
+             <title depth="1">Clause 4</title>
+             <clause id='N' inline-header='false' obligation='normative'>
+               <title depth="1">Introduction</title>
+             </clause>
+             <clause id='O' inline-header='false' obligation='normative'>
+               <title depth="1">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">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
   end
 
     it "processes section names" do
-    expect(xmlpp(IsoDoc::Iso::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+      input = <<~INPUT
       <iso-standard xmlns="http://riboseinc.com/isoxml">
     <bibdata> <ext> <doctype>amendment</doctype> </ext> </bibdata>
       <boilerplate>
@@ -284,7 +344,7 @@ Text</div>
       </boilerplate>
       <preface>
       <abstract obligation="informative">
-         <title>Foreword</title>
+         <title>Abstract</title>
       </abstract>
       <foreword obligation="informative">
          <title>Foreword</title>
@@ -300,11 +360,6 @@ Text</div>
          <title>Acknowledgements</title>
        </acknowledgements>
         </preface><sections>
-       <clause id="D" obligation="normative">
-         <title>Scope</title>
-         <p id="E">Text</p>
-       </clause>
-
        <clause id="M" inline-header="false" obligation="normative"><title>Clause 4</title><clause id="N" inline-header="false" obligation="normative">
          <title>Introduction</title>
        </clause>
@@ -314,7 +369,10 @@ Text</div>
        <clause id="O1" inline-header="false" obligation="normative">
        </clause>
         </clause>
-
+<clause id="D" obligation="normative">
+         <title>Scope</title>
+         <p id="E">Text</p>
+       </clause>
        </sections><annex id="P" inline-header="false" obligation="normative">
          <title>Annex</title>
          <clause id="Q" inline-header="false" obligation="normative">
@@ -322,7 +380,6 @@ Text</div>
          <clause id="Q1" inline-header="false" obligation="normative">
          <title>Annex A.1a</title>
          </clause>
-         <references id="Q2" normative="false"><title>Annex Bibliography</title></references>
        </clause>
        </annex>
        <annex id="P1" inline-header="false" obligation="normative">
@@ -338,6 +395,112 @@ Text</div>
        </bibliography>
        </iso-standard>
     INPUT
+    presxml = <<~OUTPUT
+    <iso-standard xmlns='http://riboseinc.com/isoxml'>
+         <bibdata>
+           <ext>
+             <doctype>amendment</doctype>
+           </ext>
+         </bibdata>
+         <boilerplate>
+           <copyright-statement>
+             <clause>
+               <title depth="1">Copyright</title>
+             </clause>
+           </copyright-statement>
+           <license-statement>
+             <clause>
+               <title depth="1">License</title>
+             </clause>
+           </license-statement>
+           <legal-statement>
+             <clause>
+               <title depth="1">Legal</title>
+             </clause>
+           </legal-statement>
+           <feedback-statement>
+             <clause>
+               <title depth="1">Feedback</title>
+             </clause>
+           </feedback-statement>
+         </boilerplate>
+         <preface>
+           <abstract obligation='informative'>
+             <title>Abstract</title>
+           </abstract>
+           <foreword obligation='informative'>
+             <title>Foreword</title>
+             <p id='A'>This is a preamble</p>
+           </foreword>
+           <introduction id='B' obligation='informative'>
+             <title depth='1'>Introduction</title>
+             <clause id='C' inline-header='false' obligation='informative'>
+               <title depth='1'>Introduction Subsection</title>
+             </clause>
+           </introduction>
+           <clause id='B1'>
+             <title depth='1'>Dedication</title>
+           </clause>
+           <clause id='B2'>
+             <title depth='1'>Note to reader</title>
+           </clause>
+           <acknowledgements obligation='informative'>
+             <title>Acknowledgements</title>
+           </acknowledgements>
+         </preface>
+         <sections>
+           <clause id='M' inline-header='false' obligation='normative'>
+             <title depth='1'>Clause 4</title>
+             <clause id='N' inline-header='false' obligation='normative'>
+               <title depth='1'>Introduction</title>
+             </clause>
+             <clause id='O' inline-header='false' obligation='normative'>
+               <title depth='1'>Clause 4.2</title>
+             </clause>
+             <clause id='O1' inline-header='true' obligation='normative'> </clause>
+           </clause>
+            <clause id='D' obligation='normative'>
+             <title depth='1'>Scope</title>
+             <p id='E'>Text</p>
+           </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>
+         </annex>
+         <annex id='P1' inline-header='false' obligation='normative'>
+           <title>
+             <strong>Annex B</strong>
+             <br/>
+             (normative)
+           </title>
+         </annex>
+         <bibliography>
+           <references id='R' obligation='informative' normative='true'>
+             <title depth='1'>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 xmlns:epub='http://www.idpf.org/2007/ops' lang='en'>
   <head/>
   <body lang='en'>
@@ -401,12 +564,8 @@ Text</div>
         <h1 class='IntroTitle'>Acknowledgements</h1>
       </div>
       <p class='zzSTDTitle1'/>
-      <div id='D'>
-        <h1>Scope</h1>
-        <p id='E'>Text</p>
-      </div>
       <div>
-        <h1>Normative references</h1>
+        <h1>Normative References</h1>
       </div>
       <div id='M'>
         <h1>Clause 4</h1>
@@ -417,11 +576,12 @@ Text</div>
           <h1>Clause 4.2</h1>
         </div>
         <div id='O1'>
-        <span class='zzMoveToFollowing'>
-  <b/>
-</span>
         </div>
       </div>
+      <div id='D'>
+        <h1>Scope</h1>
+        <p id='E'>Text</p>
+      </div>
       <br/>
       <div id='P' class='Section3'>
         <h1 class='Annex'>
@@ -437,9 +597,6 @@ Text</div>
           <div id='Q1'>
             <h3>A.1.1&#160; Annex A.1a</h3>
           </div>
-          <div>
-          <h3>A.1.2&#160; Annex Bibliography</h3>
-          </div>
         </div>
       </div>
       <br/>
@@ -448,9 +605,6 @@ Text</div>
         <b>Annex B</b>
 <br/>
 (normative)
-          <br/>
-          <br/>
-          <b/>
         </h1>
       </div>
       <br/>
@@ -464,6 +618,8 @@ Text</div>
   </body>
 </html>
 OUTPUT
+    expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({}).convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::Iso::HtmlConvert.new({}).convert("test", presxml, true))).to be_equivalent_to xmlpp(html)
     end
 
      it "processes IsoXML metadata" do