metanorma-iso 1.8.1 → 1.8.2

data/spec/asciidoctor/section_spec.rb

@@ -101,20 +101,6 @@ RSpec.describe Asciidoctor::ISO do
             <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 standardization at the following addresses:</p>
-              <ul id="_">
-                <li>
-                  <p id="_">ISO Online browsing platform: available at
-
-                    <link target="http://www.iso.org/obp"/></p>
-                </li>
-                <li>
-                  <p id="_">IEC Electropedia: available at
-
-                    <link target="http://www.electropedia.org"/></p>
-                </li>
-              </ul>
               <term id="term-term2">
                 <preferred>Term2</preferred>
               </term>

data/spec/asciidoctor/validate_spec.rb

@@ -517,7 +517,8 @@ RSpec.describe Asciidoctor::ISO do
       <<iso123>>
     INPUT
     expect(File.read("test.err"))
-      .to include "iso123 does not have a corresponding anchor ID in the bibliography"
+      .to include "iso123 does not have a corresponding anchor ID "\
+                  "in the bibliography"
   end
 
   it "warns that undated reference has locality" do
@@ -530,9 +531,10 @@ RSpec.describe Asciidoctor::ISO do
       [bibliography]
       == Normative References
       * [[[iso123,ISO 123]]] _Standard_
-      INPUT
-      expect(File.read("test.err"))
-        .to include "undated reference ISO 123 should not contain specific elements"
+    INPUT
+    expect(File.read("test.err"))
+      .to include "undated reference ISO 123 should not contain "\
+                  "specific elements"
   end
 
   it "do not warn that undated reference which is a bibliographic reference has locality" do
@@ -545,9 +547,10 @@ RSpec.describe Asciidoctor::ISO do
       [bibliography]
       == Bibliography
       * [[[iso123,1]]] _Standard_
-      INPUT
-      expect(File.read("test.err"))
-        .not_to include "undated reference [1] should not contain specific elements"
+    INPUT
+    expect(File.read("test.err"))
+      .not_to include "undated reference [1] should not contain specific "\
+                      "elements"
   end
 
   it "do not warn that undated IEV reference has locality" do
@@ -560,9 +563,10 @@ RSpec.describe Asciidoctor::ISO do
       [bibliography]
       == Normative References
       * [[[iev,IEV]]] _Standard_
-      INPUT
-      expect(File.read("test.err"))
-        .not_to include "undated reference IEV should not contain specific elements"
+    INPUT
+    expect(File.read("test.err"))
+      .not_to include "undated reference IEV should not contain specific "\
+                      "elements"
   end
 
   it "do not warn that in print has locality" do
@@ -575,8 +579,10 @@ RSpec.describe Asciidoctor::ISO do
       [bibliography]
       == Normative References
       * [[[iev,ISO 123:--]]] _Standard_
-      INPUT
-      expect(File.read("test.err")).not_to include "undated reference ISO 123 should not contain specific elements"
+    INPUT
+    expect(File.read("test.err"))
+      .not_to include "undated reference ISO 123 should not contain specific "\
+                      "elements"
   end
 
   it "warns of Non-reference in bibliography" do
@@ -641,7 +647,8 @@ RSpec.describe Asciidoctor::ISO do
       == Clause
       ISO 12121
     INPUT
-    expect(File.read("test.err")).not_to include "number not broken up in threes"
+    expect(File.read("test.err"))
+      .not_to include "number not broken up in threes"
   end
 
   it "Style warning if decimal point" do
@@ -681,7 +688,8 @@ RSpec.describe Asciidoctor::ISO do
       == Clause
       95 ± 5 %
     INPUT
-    expect(File.read("test.err")).to include "unbracketed tolerance before percent sign"
+    expect(File.read("test.err"))
+      .to include "unbracketed tolerance before percent sign"
   end
 
   it "Style warning if dots in abbreviation" do
@@ -721,7 +729,8 @@ RSpec.describe Asciidoctor::ISO do
       == Clause
       5 °
     INPUT
-    expect(File.read("test.err")).to include "space between number and degrees/minutes/seconds"
+    expect(File.read("test.err"))
+      .to include "space between number and degrees/minutes/seconds"
   end
 
   it "Style warning if no space between number and SI unit" do
@@ -731,7 +740,8 @@ RSpec.describe Asciidoctor::ISO do
       == Clause
       A measurement of 5Bq was taken.
     INPUT
-    expect(File.read("test.err")).to include "no space between number and SI unit"
+    expect(File.read("test.err"))
+      .to include "no space between number and SI unit"
   end
 
   it "Style warning if mins used" do
@@ -777,7 +787,8 @@ RSpec.describe Asciidoctor::ISO do
       == Symbols and Abbreviated Terms
     INPUT
     expect(File.read("test.err"))
-      .to include "Only one Symbols and Abbreviated Terms section in the standard"
+      .to include "Only one Symbols and Abbreviated Terms section "\
+                  "in the standard"
   end
 
   it "Style warning if Symbols and Abbreviated Terms contains extraneous matter" do
@@ -789,7 +800,8 @@ RSpec.describe Asciidoctor::ISO do
       Paragraph
     INPUT
     expect(File.read("test.err"))
-      .to include "Symbols and Abbreviated Terms can only contain a definition list"
+      .to include "Symbols and Abbreviated Terms can only contain "\
+                  "a definition list"
   end
 
   it "Warning if missing foreword" do
@@ -902,7 +914,9 @@ RSpec.describe Asciidoctor::ISO do
 
       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 "Normative References must be followed by "\
+                  "Terms and Definitions"
 
     Asciidoctor.convert(<<~"INPUT", *OPTIONS)
       = Document title
@@ -924,7 +938,9 @@ RSpec.describe Asciidoctor::ISO do
 
       Paragraph
     INPUT
-    expect(File.read("test.err")).not_to include "Normative References must be followed by Terms and Definitions"
+    expect(File.read("test.err"))
+      .not_to include "Normative References must be followed by "\
+                      "Terms and Definitions"
   end
 
   it "Warning if there are no clauses in the document" do
@@ -944,7 +960,8 @@ RSpec.describe Asciidoctor::ISO do
       == Symbols and Abbreviated Terms
 
     INPUT
-    expect(File.read("test.err")).to include "Document must contain at least one clause"
+    expect(File.read("test.err"))
+      .to include "Document must contain at least one clause"
 
     Asciidoctor.convert(<<~"INPUT", *OPTIONS)
       = Document title
@@ -967,7 +984,8 @@ RSpec.describe Asciidoctor::ISO do
       == Symbols and Abbreviated Terms
 
     INPUT
-    expect(File.read("test.err")).not_to include "Document must contain at least one clause"
+    expect(File.read("test.err"))
+      .not_to include "Document must contain at least one clause"
   end
 
   it "Warning if scope occurs after Terms and Definitions" do
@@ -989,7 +1007,8 @@ RSpec.describe Asciidoctor::ISO do
       == Scope
 
     INPUT
-    expect(File.read("test.err")).to include "Scope must occur before Terms and Definitions"
+    expect(File.read("test.err"))
+      .to include "Scope must occur before Terms and Definitions"
 
     Asciidoctor.convert(<<~"INPUT", *OPTIONS)
       = Document title
@@ -1014,7 +1033,8 @@ RSpec.describe Asciidoctor::ISO do
       == Scope
 
     INPUT
-    expect(File.read("test.err")).not_to include "Scope must occur before Terms and Definitions"
+    expect(File.read("test.err"))
+      .not_to include "Scope must occur before Terms and Definitions"
   end
 
   it "Warning if Symbols and Abbreviated Terms does not occur immediately after Terms and Definitions" do
@@ -1036,7 +1056,8 @@ RSpec.describe Asciidoctor::ISO do
       == Symbols and Abbreviated Terms
 
     INPUT
-    expect(File.read("test.err")).to include "Only annexes and references can follow clauses"
+    expect(File.read("test.err"))
+      .to include "Only annexes and references can follow clauses"
 
     Asciidoctor.convert(<<~"INPUT", *OPTIONS)
       = Document title
@@ -1062,7 +1083,8 @@ RSpec.describe Asciidoctor::ISO do
       == Symbols and Abbreviated Terms
 
     INPUT
-    expect(File.read("test.err")).not_to include "Only annexes and references can follow clauses"
+    expect(File.read("test.err"))
+      .not_to include "Only annexes and references can follow clauses"
   end
 
   it "Warning if no normative references" do
@@ -1088,7 +1110,8 @@ RSpec.describe Asciidoctor::ISO do
       == Appendix C
 
     INPUT
-    expect(File.read("test.err")).to include "Document must include (references) Normative References"
+    expect(File.read("test.err"))
+      .to include "Document must include (references) Normative References"
 
     Asciidoctor.convert(<<~"INPUT", *OPTIONS)
       = Document title
@@ -1117,7 +1140,8 @@ RSpec.describe Asciidoctor::ISO do
       == Appendix C
 
     INPUT
-    expect(File.read("test.err")).not_to include "Document must include (references) Normative References"
+    expect(File.read("test.err"))
+      .not_to include "Document must include (references) Normative References"
   end
 
   it "Warning if final section is not named Bibliography" do
@@ -1149,7 +1173,8 @@ RSpec.describe Asciidoctor::ISO do
       == Appendix C
 
     INPUT
-    expect(File.read("test.err")).to include "There are sections after the final Bibliography"
+    expect(File.read("test.err"))
+      .to include "There are sections after the final Bibliography"
 
     Asciidoctor.convert(<<~"INPUT", *OPTIONS)
       = Document title
@@ -1184,7 +1209,8 @@ RSpec.describe Asciidoctor::ISO do
       == Appendix C
 
     INPUT
-    expect(File.read("test.err")).not_to include "There are sections after the final Bibliography"
+    expect(File.read("test.err"))
+      .not_to include "There are sections after the final Bibliography"
   end
 
   it "Warning if final section is not styled Bibliography" do
@@ -1212,7 +1238,8 @@ RSpec.describe Asciidoctor::ISO do
       == Bibliography
 
     INPUT
-    expect(File.read("test.err")).to include "Section not marked up as [bibliography]"
+    expect(File.read("test.err"))
+      .to include "Section not marked up as [bibliography]"
   end
 
   it "Warning if final section is not styled Bibliography false" do
@@ -1245,7 +1272,8 @@ RSpec.describe Asciidoctor::ISO do
       == Bibliography
 
     INPUT
-    expect(File.read("test.err")).not_to include "Section not marked up as [bibliography]"
+    expect(File.read("test.err"))
+      .not_to include "Section not marked up as [bibliography]"
   end
 
   it "Warning if English title intro and no French title intro" do
@@ -1536,7 +1564,8 @@ RSpec.describe Asciidoctor::ISO do
       [align=mid-air]
       Para
     INPUT
-    expect(File.read("test.err")).to include 'value of attribute "align" is invalid; must be equal to'
+    expect(File.read("test.err"))
+      .to include 'value of attribute "align" is invalid; must be equal to'
   end
 
   it "Warn if more than 7 levels of subclause" do
@@ -1568,7 +1597,8 @@ RSpec.describe Asciidoctor::ISO do
       ====== Clause
 
     INPUT
-    expect(File.read("test.err")).to include "Exceeds the maximum clause depth of 7"
+    expect(File.read("test.err"))
+      .to include "Exceeds the maximum clause depth of 7"
   end
 
   it "Do not warn if not more than 7 levels of subclause" do
@@ -1597,7 +1627,8 @@ RSpec.describe Asciidoctor::ISO do
       ====== Clause
 
     INPUT
-    expect(File.read("test.err")).not_to include "exceeds the maximum clause depth of 7"
+    expect(File.read("test.err"))
+      .not_to include "exceeds the maximum clause depth of 7"
   end
 
   it "Warn if term citation in Terms & Definitions not preceded with italicised term" do
@@ -1609,8 +1640,9 @@ RSpec.describe Asciidoctor::ISO do
       === Term
 
       The definition of a term (<<term>>) is a part of the specialized vocabulary of a particular field
-      INPUT
-      expect(File.read("test.err")).to include "term citation not preceded with italicised term"
+    INPUT
+    expect(File.read("test.err"))
+      .to include "term citation not preceded with italicised term"
   end
 
   it "Warn if an undated reference has no associated footnote" do
@@ -1621,7 +1653,8 @@ RSpec.describe Asciidoctor::ISO do
       == Bibliography
       * [[[ISO8,ISO 8:--]]], _Title_
     INPUT
-    expect(File.read("test.err")).to include \
-      "Reference ISO8 does not have an associated footnote indicating unpublished status"
+    expect(File.read("test.err"))
+      .to include "Reference ISO8 does not have an associated footnote "\
+                  "indicating unpublished status"
   end
 end

data/spec/isodoc/postproc_spec.rb

@@ -25,80 +25,86 @@ WORD_HTML_CSS_WORDINTRO = {
 
 RSpec.describe IsoDoc do
   it "generates file based on string input" do
-    IsoDoc::Iso::HtmlConvert.new(WORD_HTML_CSS.merge(filename: "test")).convert("test", <<~"INPUT", false)
-      <iso-standard xmlns="http://riboseinc.com/isoxml">
-        <bibdata>
-          <title>
-            <title format="text/plain" language="en" type="title-intro">Cereals and pulses</title>
-            <title format="text/plain" language="en" type="title-main">Specifications and test methods</title>
-            <title format="text/plain" language="en" type="title-part">Rice</title>
-          </title>
-        </bibdata>
-        <preface>
-          <foreword>
-            <note>
-              <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
-            </note>
-          </foreword>
-        </preface>
-      </iso-standard>
+    IsoDoc::Iso::HtmlConvert
+      .new(WORD_HTML_CSS.merge(filename: "test"))
+      .convert("test", <<~"INPUT", false)
+        <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <bibdata>
+            <title>
+              <title format="text/plain" language="en" type="title-intro">Cereals and pulses</title>
+              <title format="text/plain" language="en" type="title-main">Specifications and test methods</title>
+              <title format="text/plain" language="en" type="title-part">Rice</title>
+            </title>
+          </bibdata>
+          <preface>
+            <foreword>
+              <note>
+                <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
+              </note>
+            </foreword>
+          </preface>
+        </iso-standard>
     INPUT
     expect(File.exist?("test.html")).to be true
     html = File.read("test.html", encoding: "UTF-8")
-    expect(html).to match(
-      %r{<title>Cereals and pulses&#xA0;&#x2014; Specifications and test methods&#xA0;&#x2014; Rice</title>}
-    )
+    expect(html).to include "<title>Cereals and pulses&#xA0;&#x2014; "\
+      "Specifications and test methods&#xA0;&#x2014; Rice</title>"
     expect(html).to match(%r{cdnjs\.cloudflare\.com/ajax/libs/mathjax/})
     expect(html).to match(/delimiters: \[\['\(#\(', '\)#\)'\]\]/)
   end
 
   it "generates HTML output docs with null configuration" do
-    IsoDoc::Iso::HtmlConvert.new(WORD_HTML_CSS.dup).convert("test", <<~"INPUT", false)
-      <iso-standard xmlns="http://riboseinc.com/isoxml">
-        <bibdata>
-          <title>
-            <title format="text/plain" language="en" type="title-intro">Cereals and pulses</title>
-            <title format="text/plain" language="en" type="title-main">Specifications and test methods</title>
-            <title format="text/plain" language="en" type="title-part">Rice</title>
-          </title>
-        </bibdata>
-        <preface>
-          <foreword>
-            <note>
-              <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
-            </note>
-          </foreword>
-        </preface>
-      </iso-standard>
-    INPUT
+    IsoDoc::Iso::HtmlConvert
+      .new(WORD_HTML_CSS.dup)
+      .convert("test", <<~"INPUT", false)
+        <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <bibdata>
+            <title>
+              <title format="text/plain" language="en" type="title-intro">Cereals and pulses</title>
+              <title format="text/plain" language="en" type="title-main">Specifications and test methods</title>
+              <title format="text/plain" language="en" type="title-part">Rice</title>
+            </title>
+          </bibdata>
+          <preface>
+            <foreword>
+              <note>
+                <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
+              </note>
+            </foreword>
+          </preface>
+        </iso-standard>
+      INPUT
     expect(File.exist?("test.html")).to be true
     html = File.read("test.html", encoding: "UTF-8")
-    expect(html).to match(
-      %r{<title>Cereals and pulses&#xA0;&#x2014; Specifications and test methods&#xA0;&#x2014; Rice</title>}
-    )
+    expect(html).to include "title>Cereals and pulses&#xA0;&#x2014; "\
+      "Specifications and test methods&#xA0;&#x2014; Rice</title>"
     expect(html).to match(%r{cdnjs\.cloudflare\.com/ajax/libs/mathjax/})
     expect(html).to match(/delimiters: \[\['\(#\(', '\)#\)'\]\]/)
   end
 
   it "generates Word output docs with null configuration" do
-    IsoDoc::Iso::WordConvert.new(WORD_HTML_CSS.dup).convert("test", <<~"INPUT", false)
-      <iso-standard xmlns="http://riboseinc.com/isoxml">
-        <preface>
-          <foreword>
-            <note>
-              <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
-            </note>
-          </foreword>
-        </preface>
-      </iso-standard>
-    INPUT
+    IsoDoc::Iso::WordConvert
+      .new(WORD_HTML_CSS.dup)
+      .convert("test", <<~"INPUT", false)
+        <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <preface>
+            <foreword>
+              <note>
+                <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
+              </note>
+            </foreword>
+          </preface>
+        </iso-standard>
+      INPUT
     expect(File.exist?("test.doc")).to be true
     word = File.read("test.doc", encoding: "UTF-8")
     expect(word).to match(/<style>/)
   end
 
   it "generates HTML output docs with null configuration from file" do
-    IsoDoc::Iso::HtmlConvert.new(WORD_HTML_CSS_SUBDIR.dup).convert("spec/assets/iso.xml", nil, false)
+    IsoDoc::Iso::HtmlConvert
+      .new(WORD_HTML_CSS_SUBDIR.dup)
+      .convert("spec/assets/iso.xml", nil, false)
     expect(File.exist?("spec/assets/iso.html")).to be true
     html = File.read("spec/assets/iso.html", encoding: "UTF-8")
     expect(html).to match(/<style>/)
@@ -107,7 +113,9 @@ RSpec.describe IsoDoc do
   end
 
   it "generates Word output docs with null configuration from file" do
-    IsoDoc::Iso::WordConvert.new(WORD_HTML_CSS_SUBDIR.dup).convert("spec/assets/iso.xml", nil, false)
+    IsoDoc::Iso::WordConvert
+      .new(WORD_HTML_CSS_SUBDIR.dup)
+      .convert("spec/assets/iso.xml", nil, false)
     expect(File.exist?("spec/assets/iso.doc")).to be true
     word = File.read("spec/assets/iso.doc", encoding: "UTF-8")
     expect(word).to match(/<w:WordDocument>/)
@@ -116,28 +124,32 @@ RSpec.describe IsoDoc do
 
   it "generates Pdf output docs with null configuration from file" do
     mock_pdf
-    IsoDoc::Iso::PdfConvert.new(WORD_HTML_CSS.dup).convert("spec/assets/iso.xml", nil, false)
+    IsoDoc::Iso::PdfConvert
+      .new(WORD_HTML_CSS.dup)
+      .convert("spec/assets/iso.xml", nil, false)
     expect(File.exist?("spec/assets/iso.pdf")).to be true
   end
 
   it "converts annex subheadings to h2Annex class for Word" do
-    IsoDoc::Iso::WordConvert.new(WORD_HTML_CSS.dup).convert("test", <<~"INPUT", false)
-      <iso-standard xmlns="http://riboseinc.com/isoxml">
-        <annex id="P" inline-header="false" obligation="normative">
-          <title>Annex</title>
-          <clause id="Q" inline-header="false" obligation="normative">
-            <title>A.1
-              <tab/>
-              Annex A.1</title>
-          </clause>
-          <appendix id="Q2" inline-header="false" obligation="normative">
-            <title>Appendix 1
-              <tab/>
-              An Appendix</title>
-          </appendix>
-        </annex>
-      </iso-standard>
-    INPUT
+    IsoDoc::Iso::WordConvert
+      .new(WORD_HTML_CSS.dup)
+      .convert("test", <<~"INPUT", false)
+        <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <annex id="P" inline-header="false" obligation="normative">
+            <title>Annex</title>
+            <clause id="Q" inline-header="false" obligation="normative">
+              <title>A.1
+                <tab/>
+                Annex A.1</title>
+            </clause>
+            <appendix id="Q2" inline-header="false" obligation="normative">
+              <title>Appendix 1
+                <tab/>
+                An Appendix</title>
+            </appendix>
+          </annex>
+        </iso-standard>
+      INPUT
 
     word = File.read("test.doc", encoding: "UTF-8")
       .sub(/^.*<div class="WordSection3">/m, '<div class="WordSection3">')
@@ -170,33 +182,35 @@ RSpec.describe IsoDoc do
   end
 
   it "populates Word template with terms reference labels" do
-    IsoDoc::Iso::WordConvert.new(WORD_HTML_CSS.dup).convert("test", <<~"INPUT", false)
-      <iso-standard xmlns="http://riboseinc.com/isoxml">
-        <sections>
-          <terms id="_terms_and_definitions" obligation="normative">
-            <title>1
-              <tab/>
-              Terms and Definitions</title>
-            <term id="paddy1">
-              <name>1.1</name>
-              <preferred>paddy</preferred>
-              <definition>
-                <p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p>
-              </definition>
-              <termsource status="modified">
-                <origin bibitemid="ISO7301" citeas="ISO 7301:2011" type="inline">
-                  <locality type="clause">
-                    <referenceFrom>3.1</referenceFrom>
-                  </locality>ISO 7301:2011, 3.1</origin>
-                <modification>
-                  <p id="_e73a417d-ad39-417d-a4c8-20e4e2529489">The term &quot;cargo rice&quot; is shown as deprecated, and Note 1 to entry is not included here</p>
-                </modification>
-              </termsource>
-            </term>
-          </terms>
-        </sections>
-      </iso-standard>
-    INPUT
+    IsoDoc::Iso::WordConvert
+      .new(WORD_HTML_CSS.dup)
+      .convert("test", <<~"INPUT", false)
+        <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <sections>
+            <terms id="_terms_and_definitions" obligation="normative">
+              <title>1
+                <tab/>
+                Terms and Definitions</title>
+              <term id="paddy1">
+                <name>1.1</name>
+                <preferred>paddy</preferred>
+                <definition>
+                  <p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p>
+                </definition>
+                <termsource status="modified">
+                  <origin bibitemid="ISO7301" citeas="ISO 7301:2011" type="inline">
+                    <locality type="clause">
+                      <referenceFrom>3.1</referenceFrom>
+                    </locality>ISO 7301:2011, 3.1</origin>
+                  <modification>
+                    <p id="_e73a417d-ad39-417d-a4c8-20e4e2529489">The term &quot;cargo rice&quot; is shown as deprecated, and Note 1 to entry is not included here</p>
+                  </modification>
+                </termsource>
+              </term>
+            </terms>
+          </sections>
+        </iso-standard>
+      INPUT
 
     word = File.read("test.doc", encoding: "UTF-8")
       .sub(/^.*<div class="WordSection3">/m, '<div class="WordSection3">')
@@ -224,139 +238,144 @@ RSpec.describe IsoDoc do
   end
 
   it "populates Word header" do
-    IsoDoc::Iso::WordConvert.new(WORD_HTML_CSS_HEADER_HTML.dup).convert("test", <<~"INPUT", false)
-      <iso-standard xmlns="http://riboseinc.com/isoxml">
-        <bibdata type="article">
-          <docidentifier>
-            <project-number part="1">1000</project-number>
-          </docidentifier>
-        </bibdata>
-      </iso-standard>
-    INPUT
+    IsoDoc::Iso::WordConvert
+      .new(WORD_HTML_CSS_HEADER_HTML.dup)
+      .convert("test", <<~"INPUT", false)
+        <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <bibdata type="article">
+            <docidentifier>
+              <project-number part="1">1000</project-number>
+            </docidentifier>
+          </bibdata>
+        </iso-standard>
+      INPUT
     word = File.read("test.doc", encoding: "UTF-8")
     expect(word).to include('Content-Disposition: inline; filename="header.html"')
   end
 
   it "populates Word ToC" do
-    IsoDoc::Iso::WordConvert.new(WORD_HTML_CSS_WORDINTRO.dup).convert("test", <<~"INPUT", false)
-      <iso-standard xmlns="http://riboseinc.com/isoxml">
-        <sections>
-          <clause id="A" inline-header="false" obligation="normative">
-            <title>1
-              <tab/>
-              Clause 4</title>
-            <clause id="N" inline-header="false" obligation="normative">
-              <title>1.1
-                <tab/>
-                Introduction
-                <bookmark id="Q"/>
-                to this
-                <fn reference="1">
-                  <p id="_ff27c067-2785-4551-96cf-0a73530ff1e6">Formerly denoted as 15 % (m/m).</p></fn>
-              </title>
-            </clause>
-            <clause id="O" inline-header="false" obligation="normative">
-              <title>1.2
+    IsoDoc::Iso::WordConvert
+      .new(WORD_HTML_CSS_WORDINTRO.dup)
+      .convert("test", <<~"INPUT", false)
+        <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <sections>
+            <clause id="A" inline-header="false" obligation="normative">
+              <title>1
                 <tab/>
-                Clause 4.2</title>
-              <p>A
-                <fn reference="1">
-                  <p id="_ff27c067-2785-4551-96cf-0a73530ff1e6">Formerly denoted as 15 % (m/m).</p></fn>
-              </p>
+                Clause 4</title>
+              <clause id="N" inline-header="false" obligation="normative">
+                <title>1.1
+                  <tab/>
+                  Introduction
+                  <bookmark id="Q"/>
+                  to this
+                  <fn reference="1">
+                    <p id="_ff27c067-2785-4551-96cf-0a73530ff1e6">Formerly denoted as 15 % (m/m).</p></fn>
+                </title>
+              </clause>
+              <clause id="O" inline-header="false" obligation="normative">
+                <title>1.2
+                  <tab/>
+                  Clause 4.2</title>
+                <p>A
+                  <fn reference="1">
+                    <p id="_ff27c067-2785-4551-96cf-0a73530ff1e6">Formerly denoted as 15 % (m/m).</p></fn>
+                </p>
+              </clause>
             </clause>
-          </clause>
-        </sections>
-      </iso-standard>
-    INPUT
+          </sections>
+        </iso-standard>
+      INPUT
 
     word = File.read("test.doc", encoding: "UTF-8")
       .sub(/^.*An empty word intro page\./m, "")
       .sub(%r{</div>.*$}m, "</div>")
 
-    expect(xmlpp("<div>#{word.gsub(/_Toc\d\d+/, '_Toc')}")).to be_equivalent_to xmlpp(<<~'OUTPUT')
-      <div>
-        <p class="MsoToc1">
-          <span lang="EN-GB" xml:lang="EN-GB">
-            <span style="mso-element:field-begin"/>
-            <span style="mso-spacerun:yes"> </span>TOC
-               \o &quot;1-3&quot; \h \z \u
-            <span style="mso-element:field-separator"/></span>
-          <span class="MsoHyperlink">
-            <span lang="EN-GB" style="mso-no-proof:yes" xml:lang="EN-GB">
-              <a href="#_Toc">1 Clause 4
-                <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">
-                  <span style="mso-tab-count:1 dotted">. </span></span>
-                <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">
-                  <span style="mso-element:field-begin"/>
-                </span>
-                <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">PAGEREF _Toc \h </span>
-                <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">
-                  <span style="mso-element:field-separator"/>
-                </span>
-                <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">1</span>
-                <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB"/>
-                <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">
-                  <span style="mso-element:field-end"/>
-                </span>
-              </a>
+    expect(xmlpp("<div>#{word.gsub(/_Toc\d\d+/, '_Toc')}"))
+      .to be_equivalent_to xmlpp(<<~'OUTPUT')
+        <div>
+          <p class="MsoToc1">
+            <span lang="EN-GB" xml:lang="EN-GB">
+              <span style="mso-element:field-begin"/>
+              <span style="mso-spacerun:yes"> </span>TOC
+                 \o &quot;1-3&quot; \h \z \u
+              <span style="mso-element:field-separator"/></span>
+            <span class="MsoHyperlink">
+              <span lang="EN-GB" style="mso-no-proof:yes" xml:lang="EN-GB">
+                <a href="#_Toc">1 Clause 4
+                  <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">
+                    <span style="mso-tab-count:1 dotted">. </span></span>
+                  <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">
+                    <span style="mso-element:field-begin"/>
+                  </span>
+                  <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">PAGEREF _Toc \h </span>
+                  <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">
+                    <span style="mso-element:field-separator"/>
+                  </span>
+                  <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">1</span>
+                  <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB"/>
+                  <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">
+                    <span style="mso-element:field-end"/>
+                  </span>
+                </a>
+              </span>
             </span>
-          </span>
-        </p>
-        <p class="MsoToc2">
-          <span class="MsoHyperlink">
-            <span lang="EN-GB" style="mso-no-proof:yes" xml:lang="EN-GB">
-              <a href="#_Toc">1.1 Introduction to this
-                <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">
-                  <span style="mso-tab-count:1 dotted">. </span></span>
-                <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">
-                  <span style="mso-element:field-begin"/>
-                </span>
-                <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">PAGEREF _Toc \h </span>
-                <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">
-                  <span style="mso-element:field-separator"/>
-                </span>
-                <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">1</span>
-                <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB"/>
-                <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">
-                  <span style="mso-element:field-end"/>
-                </span>
-              </a>
+          </p>
+          <p class="MsoToc2">
+            <span class="MsoHyperlink">
+              <span lang="EN-GB" style="mso-no-proof:yes" xml:lang="EN-GB">
+                <a href="#_Toc">1.1 Introduction to this
+                  <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">
+                    <span style="mso-tab-count:1 dotted">. </span></span>
+                  <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">
+                    <span style="mso-element:field-begin"/>
+                  </span>
+                  <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">PAGEREF _Toc \h </span>
+                  <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">
+                    <span style="mso-element:field-separator"/>
+                  </span>
+                  <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">1</span>
+                  <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB"/>
+                  <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">
+                    <span style="mso-element:field-end"/>
+                  </span>
+                </a>
+              </span>
             </span>
-          </span>
-        </p>
-        <p class="MsoToc2">
-          <span class="MsoHyperlink">
-            <span lang="EN-GB" style="mso-no-proof:yes" xml:lang="EN-GB">
-              <a href="#_Toc">1.2 Clause 4.2
-                <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">
-                  <span style="mso-tab-count:1 dotted">. </span></span>
-                <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">
-                  <span style="mso-element:field-begin"/>
-                </span>
-                <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">PAGEREF _Toc \h </span>
-                <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">
-                  <span style="mso-element:field-separator"/>
-                </span>
-                <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">1</span>
-                <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB"/>
-                <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">
-                  <span style="mso-element:field-end"/>
-                </span>
-              </a>
+          </p>
+          <p class="MsoToc2">
+            <span class="MsoHyperlink">
+              <span lang="EN-GB" style="mso-no-proof:yes" xml:lang="EN-GB">
+                <a href="#_Toc">1.2 Clause 4.2
+                  <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">
+                    <span style="mso-tab-count:1 dotted">. </span></span>
+                  <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">
+                    <span style="mso-element:field-begin"/>
+                  </span>
+                  <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">PAGEREF _Toc \h </span>
+                  <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">
+                    <span style="mso-element:field-separator"/>
+                  </span>
+                  <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">1</span>
+                  <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB"/>
+                  <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">
+                    <span style="mso-element:field-end"/>
+                  </span>
+                </a>
+              </span>
             </span>
-          </span>
-        </p>
-        <p class="MsoToc1">
-          <span lang="EN-GB" xml:lang="EN-GB">
-            <span style="mso-element:field-end"/>
-          </span>
-          <span lang="EN-GB" xml:lang="EN-GB">
-            <p class="MsoNormal"> </p>
-          </span>
-        </p>
-        <p class="MsoNormal"> </p>
-      </div>
-    OUTPUT
+          </p>
+          <p class="MsoToc1">
+            <span lang="EN-GB" xml:lang="EN-GB">
+              <span style="mso-element:field-end"/>
+            </span>
+            <span lang="EN-GB" xml:lang="EN-GB">
+              <p class="MsoNormal"> </p>
+            </span>
+          </p>
+          <p class="MsoNormal"> </p>
+        </div>
+      OUTPUT
   end
 
   it "reorders footnote numbers" do
@@ -390,10 +409,13 @@ RSpec.describe IsoDoc do
       </iso-standard>
     INPUT
 
-    IsoDoc::Iso::HtmlConvert.new(WORD_HTML_CSS_WORDINTRO.dup).convert("test", input, false)
+    IsoDoc::Iso::HtmlConvert
+      .new(WORD_HTML_CSS_WORDINTRO.dup)
+      .convert("test", input, false)
 
     html = File.read("test.html", encoding: "UTF-8")
-      .sub(/^.*<main class="main-section">/m, '<main xmlns:epub="epub" class="main-section">')
+      .sub(/^.*<main class="main-section">/m,
+           '<main xmlns:epub="epub" class="main-section">')
       .sub(%r{</main>.*$}m, "</main>")
 
     expect(xmlpp(html)).to be_equivalent_to xmlpp(<<~"OUTPUT")
@@ -436,11 +458,15 @@ RSpec.describe IsoDoc do
       </main>
     OUTPUT
 
-    IsoDoc::Iso::WordConvert.new(WORD_HTML_CSS_WORDINTRO.dup).convert("test", input, false)
+    IsoDoc::Iso::WordConvert
+      .new(WORD_HTML_CSS_WORDINTRO.dup)
+      .convert("test", input, false)
 
     html = File.read("test.doc", encoding: "UTF-8")
-      .sub(/^.*<div class="WordSection3"/m, '<body xmlns:epub="epub"><div class="WordSection3"')
-      .sub(%r{</body>.*$}m, "</body>").gsub(/mso-bookmark:_Ref\d+/, "mso-bookmark:_Ref")
+      .sub(/^.*<div class="WordSection3"/m,
+           '<body xmlns:epub="epub"><div class="WordSection3"')
+      .sub(%r{</body>.*$}m, "</body>")
+      .gsub(/mso-bookmark:_Ref\d+/, "mso-bookmark:_Ref")
 
     expect(xmlpp(html)).to be_equivalent_to xmlpp(<<~"OUTPUT")
         <body xmlns:epub="epub">
@@ -529,75 +555,77 @@ RSpec.describe IsoDoc do
   end
 
   it "processes IsoXML terms for HTML" do
-    IsoDoc::Iso::HtmlConvert.new(WORD_HTML_CSS.dup).convert("test", <<~"INPUT", false)
-      <iso-standard xmlns="http://riboseinc.com/isoxml">
-        <sections>
-          <terms id="_terms_and_definitions" obligation="normative">
-            <title>Terms and Definitions</title>
-            <term id="paddy1">
-              <name>1.1</name>
-              <preferred>paddy</preferred>
-              <domain>rice</domain>
-              <definition>
-                <p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p>
-              </definition>
-              <termexample id="_bd57bbf1-f948-4bae-b0ce-73c00431f892">
-                <p id="_65c9a509-9a89-4b54-a890-274126aeb55c">Foreign seeds, husks, bran, sand, dust.</p>
-                <ul>
-                  <li>A</li>
-                </ul>
-              </termexample>
-              <termexample id="_bd57bbf1-f948-4bae-b0ce-73c00431f894">
-                <ul>
-                  <li>A</li>
-                </ul>
-              </termexample>
-              <termsource status="modified">
-                <origin bibitemid="ISO7301" citeas="ISO 7301:2011" type="inline">
-                  <locality type="clause">
-                    <referenceFrom>3.1</referenceFrom>
-                  </locality>
-                </origin>
-                <modification>
-                  <p id="_e73a417d-ad39-417d-a4c8-20e4e2529489">The term &quot;cargo rice&quot; is shown as deprecated, and Note 1 to entry is not included here</p>
-                </modification>
-              </termsource>
-            </term>
-            <term id="paddy">
-              <name>1.2</name>
-              <preferred>paddy</preferred>
-              <admitted>paddy rice</admitted>
-              <admitted>rough rice</admitted>
-              <deprecates>cargo rice</deprecates>
-              <definition>
-                <p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p>
-              </definition>
-              <termexample id="_bd57bbf1-f948-4bae-b0ce-73c00431f893">
-                <ul>
-                  <li>A</li>
-                </ul>
-              </termexample>
-              <termnote id="_671a1994-4783-40d0-bc81-987d06ffb74e">
-                <p id="_19830f33-e46c-42cc-94ca-a5ef101132d5">The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p>
-              </termnote>
-              <termnote id="_671a1994-4783-40d0-bc81-987d06ffb74f">
-                <ul>
-                  <li>A</li>
-                </ul>
-                <p id="_19830f33-e46c-42cc-94ca-a5ef101132d5">The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p>
-              </termnote>
-              <termsource status="identical">
-                <origin bibitemid="ISO7301" citeas="ISO 7301:2011" type="inline">
-                  <locality type="clause">
-                    <referenceFrom>3.1</referenceFrom>
-                  </locality>
-                </origin>
-              </termsource>
-            </term>
-          </terms>
-        </sections>
-      </iso-standard>
-    INPUT
+    IsoDoc::Iso::HtmlConvert
+      .new(WORD_HTML_CSS.dup)
+      .convert("test", <<~"INPUT", false)
+        <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <sections>
+            <terms id="_terms_and_definitions" obligation="normative">
+              <title>Terms and Definitions</title>
+              <term id="paddy1">
+                <name>1.1</name>
+                <preferred>paddy</preferred>
+                <domain>rice</domain>
+                <definition>
+                  <p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p>
+                </definition>
+                <termexample id="_bd57bbf1-f948-4bae-b0ce-73c00431f892">
+                  <p id="_65c9a509-9a89-4b54-a890-274126aeb55c">Foreign seeds, husks, bran, sand, dust.</p>
+                  <ul>
+                    <li>A</li>
+                  </ul>
+                </termexample>
+                <termexample id="_bd57bbf1-f948-4bae-b0ce-73c00431f894">
+                  <ul>
+                    <li>A</li>
+                  </ul>
+                </termexample>
+                <termsource status="modified">
+                  <origin bibitemid="ISO7301" citeas="ISO 7301:2011" type="inline">
+                    <locality type="clause">
+                      <referenceFrom>3.1</referenceFrom>
+                    </locality>
+                  </origin>
+                  <modification>
+                    <p id="_e73a417d-ad39-417d-a4c8-20e4e2529489">The term &quot;cargo rice&quot; is shown as deprecated, and Note 1 to entry is not included here</p>
+                  </modification>
+                </termsource>
+              </term>
+              <term id="paddy">
+                <name>1.2</name>
+                <preferred>paddy</preferred>
+                <admitted>paddy rice</admitted>
+                <admitted>rough rice</admitted>
+                <deprecates>cargo rice</deprecates>
+                <definition>
+                  <p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p>
+                </definition>
+                <termexample id="_bd57bbf1-f948-4bae-b0ce-73c00431f893">
+                  <ul>
+                    <li>A</li>
+                  </ul>
+                </termexample>
+                <termnote id="_671a1994-4783-40d0-bc81-987d06ffb74e">
+                  <p id="_19830f33-e46c-42cc-94ca-a5ef101132d5">The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p>
+                </termnote>
+                <termnote id="_671a1994-4783-40d0-bc81-987d06ffb74f">
+                  <ul>
+                    <li>A</li>
+                  </ul>
+                  <p id="_19830f33-e46c-42cc-94ca-a5ef101132d5">The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p>
+                </termnote>
+                <termsource status="identical">
+                  <origin bibitemid="ISO7301" citeas="ISO 7301:2011" type="inline">
+                    <locality type="clause">
+                      <referenceFrom>3.1</referenceFrom>
+                    </locality>
+                  </origin>
+                </termsource>
+              </term>
+            </terms>
+          </sections>
+        </iso-standard>
+      INPUT
     expect(File.exist?("test.html")).to be true
     html = File.read("test.html", encoding: "UTF-8")
     expect(html).to match(%r{<h2 class="TermNum" id="paddy1">1\.1</h2>})
@@ -605,18 +633,20 @@ RSpec.describe IsoDoc do
   end
 
   it "inserts default paragraph between two tables for Word" do
-    IsoDoc::Iso::WordConvert.new(WORD_HTML_CSS.dup).convert("test", <<~"INPUT", false)
-      <iso-standard xmlns="http://riboseinc.com/isoxml">
-        <annex id="P" inline-header="false" obligation="normative">
-          <example id="_63112cbc-cde0-435f-9553-e0b8c4f5851c">
-            <p id="_158d4efa-b1c9-4aec-b325-756de8e4c968">'1M', '01M', and '0001M' all describe the calendar month January.</p>
-          </example>
-          <example id="_63112cbc-cde0-435f-9553-e0b8c4f5851d">
-            <p id="_158d4efa-b1c9-4aec-b325-756de8e4c969">'2M', '02M', and '0002M' all describe the calendar month February.</p>
-          </example>
-        </annex>
-      </iso-standard>
-    INPUT
+    IsoDoc::Iso::WordConvert
+      .new(WORD_HTML_CSS.dup)
+      .convert("test", <<~"INPUT", false)
+        <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <annex id="P" inline-header="false" obligation="normative">
+            <example id="_63112cbc-cde0-435f-9553-e0b8c4f5851c">
+              <p id="_158d4efa-b1c9-4aec-b325-756de8e4c968">'1M', '01M', and '0001M' all describe the calendar month January.</p>
+            </example>
+            <example id="_63112cbc-cde0-435f-9553-e0b8c4f5851d">
+              <p id="_158d4efa-b1c9-4aec-b325-756de8e4c969">'2M', '02M', and '0002M' all describe the calendar month February.</p>
+            </example>
+          </annex>
+        </iso-standard>
+      INPUT
     word = File.read("test.doc", encoding: "UTF-8")
       .sub(/^.*<div class="WordSection3">/m, '<div class="WordSection3">')
       .sub(%r{<br[^>]*>\s*<div class="colophon".*$}m, "")
@@ -644,24 +674,26 @@ RSpec.describe IsoDoc do
   end
 
   it "processes figure keys (Word)" do
-    IsoDoc::Iso::WordConvert.new(WORD_HTML_CSS.dup).convert("test", <<~"INPUT", false)
-      <iso-standard xmlns="http://riboseinc.com/isoxml">
-        <annex id="P" inline-header="false" obligation="normative">
-          <figure id="samplecode">
-            <p>Hello</p>
-            <p>Key</p>
-            <dl>
-              <dt>
-                <p>A</p>
-              </dt>
-              <dd>
-                <p>B</p>
-              </dd>
-            </dl>
-          </figure>
-        </annex>
-      </iso-standard>
-    INPUT
+    IsoDoc::Iso::WordConvert
+      .new(WORD_HTML_CSS.dup)
+      .convert("test", <<~"INPUT", false)
+        <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <annex id="P" inline-header="false" obligation="normative">
+            <figure id="samplecode">
+              <p>Hello</p>
+              <p>Key</p>
+              <dl>
+                <dt>
+                  <p>A</p>
+                </dt>
+                <dd>
+                  <p>B</p>
+                </dd>
+              </dl>
+            </figure>
+          </annex>
+        </iso-standard>
+      INPUT
     word = File.read("test.doc", encoding: "UTF-8")
       .sub(/^.*<div class="WordSection3">/m, '<div class="WordSection3">')
       .sub(%r{<br[^>]*>\s*<div class="colophon".*$}m, "")
@@ -797,17 +829,22 @@ RSpec.describe IsoDoc do
       .sub(%r{<localized-strings>.*</localized-strings>}m, ""))
       .to be_equivalent_to xmlpp(presxml)
 
-    IsoDoc::Iso::HtmlConvert.new(WORD_HTML_CSS.dup).convert("test", presxml, false)
+    IsoDoc::Iso::HtmlConvert
+      .new(WORD_HTML_CSS.dup)
+      .convert("test", presxml, false)
 
     word = File.read("test.html", encoding: "UTF-8")
     expect((word)).to include '<h1 class="IntroTitle">Warning for Stuff</h1>'
     expect((word)).to include "I am the Walrus."
 
-    IsoDoc::Iso::WordConvert.new(WORD_HTML_CSS.dup).convert("test", presxml, false)
+    IsoDoc::Iso::WordConvert.new(WORD_HTML_CSS.dup)
+      .convert("test", presxml, false)
     word = File.read("test.doc", encoding: "UTF-8")
     expect(xmlpp(word
-      .sub(%r{^.*<div class="boilerplate-copyright">}m, '<div class="boilerplate-copyright">')
-      .sub(%r{</div>.*$}m, "</div></div>"))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+      .sub(%r{^.*<div class="boilerplate-copyright">}m,
+           '<div class="boilerplate-copyright">')
+      .sub(%r{</div>.*$}m, "</div></div>")))
+      .to be_equivalent_to xmlpp(<<~"OUTPUT")
         <div class="boilerplate-copyright">
           <div>
             <p class="zzCopyright">
@@ -839,125 +876,129 @@ RSpec.describe IsoDoc do
           </div>
         </div>
       OUTPUT
-    expect(word).to include '<p class="zzWarning">This document is not an ISO International Standard'
+    expect(word).to include '<p class="zzWarning">This document is not '\
+      "an ISO International Standard"
   end
 
   it "populates Word ToC" do
-    IsoDoc::WordConvert.new(WORD_HTML_CSS_WORDINTRO.dup).convert("test", <<~"INPUT", false)
-      <iso-standard xmlns="http://riboseinc.com/isoxml">
-        <sections>
-          <clause id="A" inline-header="false" obligation="normative">
-            <title>Clause 4</title>
-            <clause id="N" inline-header="false" obligation="normative">
-              <title>Introduction
-                <bookmark id="Q"/>
-                to this
-                <fn reference="1">
-                  <p id="_ff27c067-2785-4551-96cf-0a73530ff1e6">Formerly denoted as 15 % (m/m).</p></fn>
-              </title>
-            </clause>
-            <clause id="O" inline-header="false" obligation="normative">
-              <title>Clause 4.2</title>
-              <p>A
-                <fn reference="1">
-                  <p id="_ff27c067-2785-4551-96cf-0a73530ff1e6">Formerly denoted as 15 % (m/m).</p></fn>
-              </p>
-              <clause id="P" inline-header="false" obligation="normative">
-                <title>Clause 4.2.1</title>
+    IsoDoc::WordConvert.new(WORD_HTML_CSS_WORDINTRO.dup)
+      .convert("test", <<~"INPUT", false)
+        <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <sections>
+            <clause id="A" inline-header="false" obligation="normative">
+              <title>Clause 4</title>
+              <clause id="N" inline-header="false" obligation="normative">
+                <title>Introduction
+                  <bookmark id="Q"/>
+                  to this
+                  <fn reference="1">
+                    <p id="_ff27c067-2785-4551-96cf-0a73530ff1e6">Formerly denoted as 15 % (m/m).</p></fn>
+                </title>
+              </clause>
+              <clause id="O" inline-header="false" obligation="normative">
+                <title>Clause 4.2</title>
+                <p>A
+                  <fn reference="1">
+                    <p id="_ff27c067-2785-4551-96cf-0a73530ff1e6">Formerly denoted as 15 % (m/m).</p></fn>
+                </p>
+                <clause id="P" inline-header="false" obligation="normative">
+                  <title>Clause 4.2.1</title>
+                </clause>
               </clause>
             </clause>
-          </clause>
-        </sections>
-      </iso-standard>
-    INPUT
+          </sections>
+        </iso-standard>
+      INPUT
     word = File.read("test.doc")
-      .sub(/^.*<div class="WordSection2">/m, '<div class="WordSection2">')
+      .sub(/^.*<div class="WordSection2">/m,
+           '<div class="WordSection2">')
       .sub(%r{<p class="MsoNormal">\s*<br clear="all" class="section"/>\s*</p>\s*<div class="WordSection3">.*$}m, "")
 
-    expect(xmlpp(word.gsub(/_Toc\d\d+/, "_Toc"))).to be_equivalent_to xmlpp(<<~'OUTPUT')
-      <div class="WordSection2">An empty word intro page.
-        <p class="MsoToc1">
-          <span lang="EN-GB" xml:lang="EN-GB">
-            <span style="mso-element:field-begin"/>
-            <span style="mso-spacerun:yes"> </span>
-            TOC
-               \o &quot;1-2&quot; \h \z \u
-            <span style="mso-element:field-separator"/></span>
-          <span class="MsoHyperlink">
-            <span lang="EN-GB" style="mso-no-proof:yes" xml:lang="EN-GB">
-              <a href="#_Toc">Clause 4
-                <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">
-                  <span style="mso-tab-count:1 dotted">. </span></span>
-                <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">
-                  <span style="mso-element:field-begin"/>
-                </span>
-                <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">PAGEREF _Toc \h </span>
-                <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">
-                  <span style="mso-element:field-separator"/>
-                </span>
-                <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">1</span>
-                <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB"/>
-                <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">
-                  <span style="mso-element:field-end"/>
-                </span>
-              </a>
+    expect(xmlpp(word.gsub(/_Toc\d\d+/, "_Toc")))
+      .to be_equivalent_to xmlpp(<<~'OUTPUT')
+        <div class="WordSection2">An empty word intro page.
+          <p class="MsoToc1">
+            <span lang="EN-GB" xml:lang="EN-GB">
+              <span style="mso-element:field-begin"/>
+              <span style="mso-spacerun:yes"> </span>
+              TOC
+                 \o &quot;1-2&quot; \h \z \u
+              <span style="mso-element:field-separator"/></span>
+            <span class="MsoHyperlink">
+              <span lang="EN-GB" style="mso-no-proof:yes" xml:lang="EN-GB">
+                <a href="#_Toc">Clause 4
+                  <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">
+                    <span style="mso-tab-count:1 dotted">. </span></span>
+                  <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">
+                    <span style="mso-element:field-begin"/>
+                  </span>
+                  <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">PAGEREF _Toc \h </span>
+                  <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">
+                    <span style="mso-element:field-separator"/>
+                  </span>
+                  <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">1</span>
+                  <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB"/>
+                  <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">
+                    <span style="mso-element:field-end"/>
+                  </span>
+                </a>
+              </span>
             </span>
-          </span>
-        </p>
-        <p class="MsoToc2">
-          <span class="MsoHyperlink">
-            <span lang="EN-GB" style="mso-no-proof:yes" xml:lang="EN-GB">
-              <a href="#_Toc">Introduction to this
-                <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">
-                  <span style="mso-tab-count:1 dotted">. </span></span>
-                <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">
-                  <span style="mso-element:field-begin"/>
-                </span>
-                <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">PAGEREF _Toc \h </span>
-                <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">
-                  <span style="mso-element:field-separator"/>
-                </span>
-                <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">1</span>
-                <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB"/>
-                <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">
-                  <span style="mso-element:field-end"/>
-                </span>
-              </a>
+          </p>
+          <p class="MsoToc2">
+            <span class="MsoHyperlink">
+              <span lang="EN-GB" style="mso-no-proof:yes" xml:lang="EN-GB">
+                <a href="#_Toc">Introduction to this
+                  <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">
+                    <span style="mso-tab-count:1 dotted">. </span></span>
+                  <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">
+                    <span style="mso-element:field-begin"/>
+                  </span>
+                  <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">PAGEREF _Toc \h </span>
+                  <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">
+                    <span style="mso-element:field-separator"/>
+                  </span>
+                  <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">1</span>
+                  <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB"/>
+                  <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">
+                    <span style="mso-element:field-end"/>
+                  </span>
+                </a>
+              </span>
             </span>
-          </span>
-        </p>
-        <p class="MsoToc2">
-          <span class="MsoHyperlink">
-            <span lang="EN-GB" style="mso-no-proof:yes" xml:lang="EN-GB">
-              <a href="#_Toc">Clause 4.2
-                <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">
-                  <span style="mso-tab-count:1 dotted">. </span></span>
-                <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">
-                  <span style="mso-element:field-begin"/>
-                </span>
-                <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">PAGEREF _Toc \h </span>
-                <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">
-                  <span style="mso-element:field-separator"/>
-                </span>
-                <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">1</span>
-                <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB"/>
-                <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">
-                  <span style="mso-element:field-end"/>
-                </span>
-              </a>
+          </p>
+          <p class="MsoToc2">
+            <span class="MsoHyperlink">
+              <span lang="EN-GB" style="mso-no-proof:yes" xml:lang="EN-GB">
+                <a href="#_Toc">Clause 4.2
+                  <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">
+                    <span style="mso-tab-count:1 dotted">. </span></span>
+                  <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">
+                    <span style="mso-element:field-begin"/>
+                  </span>
+                  <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">PAGEREF _Toc \h </span>
+                  <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">
+                    <span style="mso-element:field-separator"/>
+                  </span>
+                  <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">1</span>
+                  <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB"/>
+                  <span class="MsoTocTextSpan" lang="EN-GB" xml:lang="EN-GB">
+                    <span style="mso-element:field-end"/>
+                  </span>
+                </a>
+              </span>
             </span>
-          </span>
-        </p>
-        <p class="MsoToc1">
-          <span lang="EN-GB" xml:lang="EN-GB">
-            <span style="mso-element:field-end"/>
-          </span>
-          <span lang="EN-GB" xml:lang="EN-GB">
-            <p class="MsoNormal"> </p>
-          </span>
-        </p>
-        <p class="MsoNormal"> </p>
-      </div>
-    OUTPUT
+          </p>
+          <p class="MsoToc1">
+            <span lang="EN-GB" xml:lang="EN-GB">
+              <span style="mso-element:field-end"/>
+            </span>
+            <span lang="EN-GB" xml:lang="EN-GB">
+              <p class="MsoNormal"> </p>
+            </span>
+          </p>
+          <p class="MsoNormal"> </p>
+        </div>
+      OUTPUT
   end
 end