isodoc 1.6.2 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4d6934377164c2124ffca74e9ac663f4761d9a2cd98724d3214282d92afd086
-  data.tar.gz: b4ee6a1da7b45282dc01c025495b0071a3dcd382a5d76d31d4caeb299c3bf1f9
+  metadata.gz: b9d5c91b697c02cdac2a8221f2995d29f812804b48039967bd94c8aef7ce10c0
+  data.tar.gz: cf66a1f8d4eb41297360341e0da8d16a9ddf0af2679f072d758a259186a291bd
 SHA512:
-  metadata.gz: f49d1f973ae0ee52d01c5d608057c04c44afe180427215a880158d13d322fb87fb0d8ee4d486dcdb35cf652645044194ac5bf322987fcbdc73aca3aae4966766
-  data.tar.gz: 190b64f33fff0f3455ed7efbbb22f3f917b1249253f745ee61c9314a3638ad904cf005c8916c7734da7c962765e458d25ded2712bdf155d2f0a221d60ee7e789
+  metadata.gz: 4cfa5637d6c22e73dd2a6c5bc32841183691a5db4121102787fad3caddd61815541e7128b624f03d20bf00d1e94fed81e43aaa19d1b84260e7bde5cfc69d924e
+  data.tar.gz: 7015f57396172858edb4b8499e6c4706894ef540f6b96c95d5c9bf445580003a8e68d4930204e5731ec57dafa460c2cfbcf4da5572e82713070fd214bef5974e

data/Rakefile

@@ -1,8 +1,8 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
-require 'isodoc/gem_tasks'
+require "isodoc/gem_tasks"
 
 IsoDoc::GemTasks.install
 RSpec::Core::RakeTask.new(:spec)
 
-task default: :spec
+task default: :spec

data/lib/isodoc/presentation_function/bibdata.rb

@@ -4,7 +4,7 @@ module IsoDoc
       a = bibdata_current(docxml) or return
       bibdata_i18n(a)
       a.next =
-        "<localized-strings>#{i8n_name(trim_hash(@i18n.get), "").join("")}"\
+        "<localized-strings>#{i8n_name(trim_hash(@i18n.get), '').join('')}"\
         "</localized-strings>"
     end
 
@@ -19,10 +19,10 @@ module IsoDoc
       a
     end
 
-    def bibdata_i18n(b)
-      hash_translate(b, @i18n.get["doctype_dict"], "./ext/doctype")
-      hash_translate(b, @i18n.get["stage_dict"], "./status/stage")
-      hash_translate(b, @i18n.get["substage_dict"], "./status/substage")
+    def bibdata_i18n(bib)
+      hash_translate(bib, @i18n.get["doctype_dict"], "./ext/doctype")
+      hash_translate(bib, @i18n.get["stage_dict"], "./status/stage")
+      hash_translate(bib, @i18n.get["substage_dict"], "./status/substage")
     end
 
     def hash_translate(bibdata, hash, xpath, lang = @lang)
@@ -46,8 +46,8 @@ module IsoDoc
     def i8n_name(h, pref)
       if h.is_a? Hash then i8n_name1(h, pref)
       elsif h.is_a? Array
-        h.reject { |a| blank?(a) }.each_with_object([]).
-          with_index do |(v1, g), i|
+        h.reject { |a| blank?(a) }.each_with_object([])
+          .with_index do |(v1, g), i|
           i8n_name(v1, "#{i18n_safe(k)}.#{i}").each { |x| g << x }
         end
       else [i18n_tag(pref, h)]
@@ -62,12 +62,12 @@ module IsoDoc
             i8n_name(v1, "#{i18n_safe(k)}.#{i}").each { |x| g << x }
           end
         else
-          g << i18n_tag("#{pref}#{pref.empty? ? "" : "."}#{i18n_safe(k)}", v)
+          g << i18n_tag("#{pref}#{pref.empty? ? '' : '.'}#{i18n_safe(k)}", v)
         end
       end
     end
 
-    #https://stackoverflow.com/a/31822406
+    # https://stackoverflow.com/a/31822406
     def blank?(v)
       v.nil? || v.respond_to?(:empty?) && v.empty?
     end
@@ -76,14 +76,17 @@ module IsoDoc
       loop do
         h_new = trim_hash1(h)
         break h if h==h_new
+
         h = h_new
       end
     end
 
     def trim_hash1(h)
       return h unless h.is_a? Hash
-      h.each_with_object({}) do |(k,v), g|
+
+      h.each_with_object({}) do |(k, v), g|
         next if blank?(v)
+
         g[k] = if v.is_a? Hash then trim_hash1(h[k])
                elsif v.is_a? Array
                  h[k].map { |a| trim_hash1(a) }.reject { |a| blank?(a) }

data/lib/isodoc/presentation_function/inline.rb

@@ -68,53 +68,53 @@ module IsoDoc
     # so not <origin bibitemid="ISO7301" citeas="ISO 7301">
     # <locality type="section"><reference>3.1</reference></locality></origin>
 
-    def eref_localities(refs, target, n)
+    def eref_localities(refs, target, node)
       ret = ""
       refs.each_with_index do |r, i|
         delim = ","
         delim = ";" if r.name == "localityStack" && i.positive?
-        ret = eref_locality_stack(r, i, target, delim, ret, n)
+        ret = eref_locality_stack(r, i, target, delim, ret, node)
       end
       ret
     end
 
-    def eref_locality_stack(r, idx, target, delim, ret, n)
-      if r.name == "localityStack"
-        r.elements.each_with_index do |rr, j|
-          ret += eref_localities0(rr, j, target, delim, n)
+    def eref_locality_stack(ref, idx, target, delim, ret, node)
+      if ref.name == "localityStack"
+        ref.elements.each_with_index do |rr, j|
+          ret += eref_localities0(rr, j, target, delim, node)
           delim = ","
         end
       else
-        ret += eref_localities0(r, idx, target, delim, n)
+        ret += eref_localities0(ref, idx, target, delim, node)
       end
       ret
     end
 
-    def eref_localities0(r, _i, target, delim, n)
-      if r["type"] == "whole" then l10n("#{delim} #{@i18n.wholeoftext}")
+    def eref_localities0(ref, _i, target, delim, node)
+      if ref["type"] == "whole" then l10n("#{delim} #{@i18n.wholeoftext}")
       else
-        eref_localities1(target, r["type"], r.at(ns("./referenceFrom")),
-                         r.at(ns("./referenceTo")), delim, n, @lang)
+        eref_localities1(target, ref["type"], ref.at(ns("./referenceFrom")),
+                         ref.at(ns("./referenceTo")), delim, node, @lang)
       end
     end
 
     # TODO: move to localization file
-    def eref_localities1_zh(_target, type, from, to, n, delim)
+    def eref_localities1_zh(_target, type, from, to, node, delim)
       ret = "#{delim} 第#{from.text}" if from
       ret += "&ndash;#{to.text}" if to
       loc = (@i18n.locality[type] || type.sub(/^locality:/, "").capitalize)
-      ret += " #{loc}" unless n["droploc"] == "true"
+      ret += " #{loc}" unless node["droploc"] == "true"
       ret
     end
 
     # TODO: move to localization file
-    def eref_localities1(target, type, from, to, delim, n, lang = "en")
+    def eref_localities1(target, type, from, to, delim, node, lang = "en")
       return "" if type == "anchor"
 
       lang == "zh" and
-        return l10n(eref_localities1_zh(target, type, from, to, n, delim))
+        return l10n(eref_localities1_zh(target, type, from, to, node, delim))
       ret = delim
-      ret += eref_locality_populate(type, n)
+      ret += eref_locality_populate(type, node)
       ret += " #{from.text}" if from
       ret += "&ndash;#{to.text}" if to
       l10n(ret)
@@ -158,12 +158,14 @@ module IsoDoc
     end
 
     def concept1(node)
-      content = node.first_element_child.children.select do |c|
-        !%w{locality localityStack}.include? c.name
+      content = node.first_element_child.children.reject do |c|
+        %w{locality localityStack}.include? c.name
       end.select { |c| !c.text? || /\S/.match(c) }
-      node.replace content.empty? ?
-        @i18n.term_defined_in.sub(/%/, node.first_element_child.to_xml) :
+      if node.replace content.empty?
+        @i18n.term_defined_in.sub(/%/, node.first_element_child.to_xml)
+      else
         "<em>#{node.children.to_xml}</em>"
+      end
     end
 
     def variant(docxml)

data/lib/isodoc/presentation_function/section.rb

@@ -2,20 +2,21 @@ module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
     def clause(docxml)
       docxml.xpath(ns("//clause | "\
-                      "//terms | //definitions | //references")).
-                     each do |f|
+                      "//terms | //definitions | //references"))
+        .each do |f|
         clause1(f)
       end
     end
 
-    def clause1(f)
-      level = @xrefs.anchor(f['id'], :level, false) || "1"
-      t = f.at(ns("./title")) and t["depth"] = level
-      return if !f.ancestors("boilerplate").empty?
-      return if @suppressheadingnumbers || f["unnumbered"]
-      lbl = @xrefs.anchor(f['id'], :label,
-                          f.parent.name != "sections") or return
-      prefix_name(f, "<tab/>", "#{lbl}#{clausedelim}", "title")
+    def clause1(elem)
+      level = @xrefs.anchor(elem["id"], :level, false) || "1"
+      t = elem.at(ns("./title")) and t["depth"] = level
+      return if !elem.ancestors("boilerplate").empty? ||
+        @suppressheadingnumbers || elem["unnumbered"]
+
+      lbl = @xrefs.anchor(elem["id"], :label,
+                          elem.parent.name != "sections") or return
+      prefix_name(elem, "<tab/>", "#{lbl}#{clausedelim}", "title")
     end
 
     def annex(docxml)
@@ -24,12 +25,12 @@ module IsoDoc
       end
     end
 
-    def annex1(f)
-      lbl = @xrefs.anchor(f['id'], :label)
-      if t = f.at(ns("./title"))
+    def annex1(elem)
+      lbl = @xrefs.anchor(elem["id"], :label)
+      if t = elem.at(ns("./title"))
         t.children = "<strong>#{t.children.to_xml}</strong>"
       end
-      prefix_name(f, "<br/><br/>", lbl, "title")
+      prefix_name(elem, "<br/><br/>", lbl, "title")
     end
 
     def term(docxml)
@@ -38,18 +39,15 @@ module IsoDoc
       end
     end
 
-    def term1(f)
-      lbl = @xrefs.get[f["id"]][:label] or return
-      prefix_name(f, "", "#{lbl}#{clausedelim}", "name")
+    def term1(elem)
+      lbl = @xrefs.get[elem["id"]][:label] or return
+      prefix_name(elem, "", "#{lbl}#{clausedelim}", "name")
     end
 
-    def references(docxml)
-    end
+    def references(docxml); end
 
     def index(docxml)
-      docxml.xpath(ns("//index | //index-xref | //indexsect")).each do |f|
-        f.remove
-      end
+      docxml.xpath(ns("//index | //index-xref | //indexsect")).each(&:remove)
     end
   end
 end

data/lib/isodoc/sassc_importer.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'sassc'
+require "sassc"
 
 class SasscImporter < SassC::Importer
   def imports(path, _parent_path)

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "1.6.2".freeze
+  VERSION = "1.6.3".freeze
 end

data/lib/isodoc/xref/xref_counter.rb

@@ -49,8 +49,7 @@ module IsoDoc::XrefGen
           @base = node["number"][0..-2]
           @letter = @letter_override = node["number"][-1]
         else
-          @number_override = node["number"]
-          @num = n.to_i
+          @number_override = @num = n.to_i
           @base = b
           @letter = ""
         end

data/lib/isodoc/xref/xref_gen.rb

@@ -10,7 +10,7 @@ module IsoDoc::XrefGen
         autonum = amend_autonums(a)
         NUMBERED_BLOCKS.each do |b|
           a.xpath(ns("./newcontent//#{b}")).each_with_index do |e, i|
-            autonum[b] and i == 0 and e["number"] = autonum[b]
+            autonum[b] && i.zero? and e["number"] = autonum[b]
             !autonum[b] and e["unnumbered"] = "true"
           end
         end
@@ -29,6 +29,13 @@ module IsoDoc::XrefGen
       @labels["termnote"].gsub(/%/, note.to_s)
     end
 
+    def increment_label(elems, node, counter, increment = true)
+      return "" if elems.size == 1 && !node["number"]
+
+      counter.increment(node) if increment
+      " #{counter.print}"
+    end
+
     def termnote_anchor_names(docxml)
       docxml.xpath(ns("//term[descendant::termnote]")).each do |t|
         c = Counter.new
@@ -39,7 +46,7 @@ module IsoDoc::XrefGen
           @anchors[n["id"]] =
             { label: termnote_label(c.print), type: "termnote", value: c.print,
               xref: l10n("#{anchor(t['id'], :xref)}, "\
-                         "#{@labels["note_xref"]} #{c.print}") }
+                         "#{@labels['note_xref']} #{c.print}") }
         end
       end
     end
@@ -52,11 +59,11 @@ module IsoDoc::XrefGen
           next if n["id"].nil? || n["id"].empty?
 
           c.increment(n)
-          idx = examples.size == 1 && !n["number"] ? "" : c.print
+          idx = increment_label(examples, n, c, false)
           @anchors[n["id"]] = {
             type: "termexample", label: idx, value: c.print,
             xref: l10n("#{anchor(t['id'], :xref)}, "\
-                       "#{@labels["example_xref"]} #{c.print}") }
+                       "#{@labels['example_xref']} #{c.print}") }
         end
       end
     end
@@ -84,9 +91,9 @@ module IsoDoc::XrefGen
         notes.each do |n|
           next if @anchors[n["id"]] || n["id"].nil? || n["id"].empty?
 
-          idx = notes.size == 1 && !n["number"] ? "" : " #{c.increment(n).print}"
-          @anchors[n["id"]] = anchor_struct(idx, n, @labels["note_xref"], 
-                                            "note", false)
+          @anchors[n["id"]] =
+            anchor_struct(increment_label(notes, n, c), n,
+                          @labels["note_xref"], "note", false)
         end
         note_anchor_names(s.xpath(ns(CHILD_SECTIONS)))
       end
@@ -107,10 +114,9 @@ module IsoDoc::XrefGen
         notes.each do |n|
           next if @anchors[n["id"]] || n["id"].nil? || n["id"].empty?
 
-          idx = notes.size == 1 && !n["number"]  ? "" :
-            " #{c.increment(n).print}"
-          @anchors[n["id"]] = anchor_struct(idx, n, @labels["example_xref"],
-                                            "example", n["unnumbered"])
+          @anchors[n["id"]] =
+            anchor_struct(increment_label(notes, n, c), n,
+                          @labels["example_xref"], "example", n["unnumbered"])
         end
         example_anchor_names(s.xpath(ns(CHILD_SECTIONS)))
       end
@@ -124,9 +130,8 @@ module IsoDoc::XrefGen
         notes.each do |n|
           next if n["id"].nil? || n["id"].empty?
 
-          idx = notes.size == 1 && !n["number"] ? "" : " #{c.increment(n).print}"
-          @anchors[n["id"]] = anchor_struct(idx, n, @labels["list"], "list",
-                                            false)
+          @anchors[n["id"]] = anchor_struct(increment_label(notes, n, c), n,
+                                            @labels["list"], "list", false)
           list_item_anchor_names(n, @anchors[n["id"]], 1, "", notes.size != 1)
         end
         list_anchor_names(s.xpath(ns(CHILD_SECTIONS)))
@@ -151,9 +156,11 @@ module IsoDoc::XrefGen
     def bookmark_anchor_names(docxml)
       docxml.xpath(ns(".//bookmark")).each do |n|
         next if n["id"].nil? || n["id"].empty?
+
         parent = nil
         n.ancestors.each do |a|
           next unless a["id"] && parent = @anchors.dig(a["id"], :xref)
+
           break
         end
         @anchors[n["id"]] = { type: "bookmark", label: nil, value: nil,

data/lib/isodoc/xref/xref_sect_gen.rb

@@ -14,20 +14,20 @@ module IsoDoc::XrefGen
       end
     end
 
-    def initial_anchor_names(d)
-      d.xpath(ns("//preface/*")).each { |c| c.element? and preface_names(c) }
+    def initial_anchor_names(doc)
+      doc.xpath(ns("//preface/*")).each { |c| c.element? and preface_names(c) }
       # potentially overridden in middle_section_asset_names()
-      sequential_asset_names(d.xpath(ns("//preface/*")))
+      sequential_asset_names(doc.xpath(ns("//preface/*")))
       n = Counter.new
-      n = section_names(d.at(ns("//clause[@type = 'scope']")), n, 1)
-      n = section_names(d.at(ns(@klass.norm_ref_xpath)), n, 1)
-      n = section_names(d.at(ns("//sections/terms | "\
+      n = section_names(doc.at(ns("//clause[@type = 'scope']")), n, 1)
+      n = section_names(doc.at(ns(@klass.norm_ref_xpath)), n, 1)
+      n = section_names(doc.at(ns("//sections/terms | "\
                                 "//sections/clause[descendant::terms]")), n, 1)
-      n = section_names(d.at(ns("//sections/definitions")), n, 1)
-      clause_names(d, n)
-      middle_section_asset_names(d)
-      termnote_anchor_names(d)
-      termexample_anchor_names(d)
+      n = section_names(doc.at(ns("//sections/definitions")), n, 1)
+      clause_names(doc, n)
+      middle_section_asset_names(doc)
+      termnote_anchor_names(doc)
+      termexample_anchor_names(doc)
     end
 
     def preface_clause_name(clause)

data/spec/isodoc/blocks_spec.rb

@@ -23,7 +23,7 @@ RSpec.describe IsoDoc do
                <title>Change Clause</title>
                <amend id='B' change='modify' path='//table[2]' path_end='//table[2]/following-sibling:example[1]' title='Change'>
                  <autonumber type='table'>2</autonumber>
-                 <autonumber type='example'>7</autonumber>
+                 <autonumber type='example'>A.7</autonumber>
                  <description>
                    <p id='C'>
                      <em>
@@ -150,7 +150,7 @@ RSpec.describe IsoDoc do
                         </tbody>
                       </table>
                       <figure id="H" unnumbered="true"><name>Figure</name></figure>
-                      <example id="F" number="7"><name>EXAMPLE  7</name>
+                      <example id="F" number="A.7"><name>EXAMPLE  A.7</name>
                         <p id="G">This is not generalised further.</p>
                       </example>
                     </quote>
@@ -225,7 +225,7 @@ RSpec.describe IsoDoc do
                      <p class='FigureTitle' style='text-align:center;'>Figure</p>
                    </div>
                    <div id='F' class='example'>
-                     <p class='example-title'>EXAMPLE 7</p>
+                     <p class='example-title'>EXAMPLE A.7</p>
                      <p id='G'>This is not generalised further.</p>
                    </div>
                  </div>
@@ -242,294 +242,233 @@ RSpec.describe IsoDoc do
       .convert("test", presxml, true))).to be_equivalent_to xmlpp(html)
   end
 
-  it "processes unlabelled notes (Presentation XML)" do
+  it "processes unlabelled notes" do
+    input = <<~INPUT
+          <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <preface><foreword>
+          <note id="A" keep-with-next="true" keep-lines-together="true">
+        <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
+    presxml = <<~OUTPUT
+          <?xml version='1.0'?>
+      <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
+        <preface>
+          <foreword>
+            <note id='A' keep-with-next='true' keep-lines-together='true'>
+              <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>
+          </foreword>
+        </preface>
+      </iso-standard>
+    OUTPUT
+    html = <<~OUTPUT
+      #{HTML_HDR}
+        <br/>
+        <div>
+        <h1 class="ForewordTitle">Foreword</h1>
+        <div id="A" class="Note" style="page-break-after: avoid;page-break-inside: avoid;">
+        <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>
+        <p class="zzSTDTitle1"/>
+        </div>
+        </body>
+        </html>
+    OUTPUT
+    doc = <<~OUTPUT
+        <html xmlns:epub="http://www.idpf.org/2007/ops" lang="en">
+        <head><style/></head>
+        <body lang="EN-US" link="blue" vlink="#954F72">
+          <div class="WordSection1">
+            <p>&#160;</p>
+          </div>
+          <p><br clear="all" class="section"/></p>
+          <div class="WordSection2">
+            <p><br clear="all" style="mso-special-character:line-break;page-break-before:always"/></p>
+            <div>
+              <h1 class="ForewordTitle">Foreword</h1>
+              <div id="A" class="Note"  style='page-break-after: avoid;page-break-inside: avoid;'>
+                <p class="Note"><span class="note_label">NOTE</span><span style="mso-tab-count:1">&#160; </span>These results are based on a study carried out on three different types of kernel.</p>
+              </div>
+            </div>
+            <p>&#160;</p>
+          </div>
+          <p><br clear="all" class="section"/></p>
+          <div class="WordSection3">
+            <p class="zzSTDTitle1"/>
+          </div>
+        </body>
+      </html>
+    OUTPUT
     expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
-      .convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-            <iso-standard xmlns="http://riboseinc.com/isoxml">
-            <preface><foreword>
-            <note id="A" keep-with-next="true" keep-lines-together="true">
-          <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
-            <?xml version='1.0'?>
-        <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
-          <preface>
-            <foreword>
-              <note id='A' keep-with-next='true' keep-lines-together='true'>
-                <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>
-            </foreword>
-          </preface>
-        </iso-standard>
-      OUTPUT
-  end
-
-  it "processes unlabelled notes (HTML)" do
+      .convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
     expect(xmlpp(IsoDoc::HtmlConvert.new({})
-      .convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-            <iso-standard xmlns='http://riboseinc.com/isoxml'>
-          <preface>
-            <foreword>
-              <note id='A' keep-with-next='true' keep-lines-together='true'>
-                <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>
-            </foreword>
-          </preface>
-        </iso-standard>
-      INPUT
-        #{HTML_HDR}
-                     <br/>
-                     <div>
-                       <h1 class="ForewordTitle">Foreword</h1>
-                       <div id="A" class="Note" style="page-break-after: avoid;page-break-inside: avoid;">
-                         <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>
-                     <p class="zzSTDTitle1"/>
-                   </div>
-                 </body>
-             </html>
-      OUTPUT
-  end
-
-  it "processes unlabelled notes (Word)" do
+      .convert("test", presxml, true))).to be_equivalent_to xmlpp(html)
     expect(xmlpp(IsoDoc::WordConvert.new({})
-      .convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-            <iso-standard xmlns='http://riboseinc.com/isoxml'>
-          <preface>
-            <foreword>
-              <note id='A' keep-with-next='true' keep-lines-together='true'>
-                <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>
-            </foreword>
-          </preface>
-        </iso-standard>
-      INPUT
-            <html xmlns:epub="http://www.idpf.org/2007/ops" lang="en">
-          <head><style/></head>
-          <body lang="EN-US" link="blue" vlink="#954F72">
-            <div class="WordSection1">
-              <p>&#160;</p>
-            </div>
-            <p><br clear="all" class="section"/></p>
-            <div class="WordSection2">
-              <p><br clear="all" style="mso-special-character:line-break;page-break-before:always"/></p>
-              <div>
-                <h1 class="ForewordTitle">Foreword</h1>
-                <div id="A" class="Note"  style='page-break-after: avoid;page-break-inside: avoid;'>
-                  <p class="Note"><span class="note_label">NOTE</span><span style="mso-tab-count:1">&#160; </span>These results are based on a study carried out on three different types of kernel.</p>
-                </div>
-              </div>
-              <p>&#160;</p>
-            </div>
-            <p><br clear="all" class="section"/></p>
-            <div class="WordSection3">
-              <p class="zzSTDTitle1"/>
-            </div>
-          </body>
-        </html>
-      OUTPUT
+      .convert("test", presxml, true))).to be_equivalent_to xmlpp(doc)
   end
 
-  it "processes sequences of notes (Presentation XML)" do
-    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
-      .convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-            <iso-standard xmlns="http://riboseinc.com/isoxml">
-            <preface><foreword>
-            <note id="note1">
-          <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">
-          <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83a">These results are based on a study carried out on three different types of kernel.</p>
-        </note>
-            </foreword></preface>
-            </iso-standard>
-      INPUT
-        <?xml version='1.0'?>
-        <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
-          <preface>
-            <foreword>
-              <note id='note1'>
-                <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='note2'>
-                <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>
-            </foreword>
-          </preface>
-        </iso-standard>
-      OUTPUT
-  end
+  it "processes sequences of notes" do
+    input = <<~INPUT
+          <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <preface><foreword>
+          <note id="note1">
+        <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">
+        <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83a">These results are based on a study carried out on three different types of kernel.</p>
+      </note>
+          </foreword></preface>
+          </iso-standard>
+    INPUT
+    presxml = <<~OUTPUT
+      <?xml version='1.0'?>
+      <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
+        <preface>
+          <foreword>
+            <note id='note1'>
+              <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='note2'>
+              <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>
+          </foreword>
+        </preface>
+      </iso-standard>
+    OUTPUT
 
-  it "processes sequences of notes (HTML)" do
-    expect(xmlpp(IsoDoc::HtmlConvert.new({})
-      .convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-            <iso-standard xmlns='http://riboseinc.com/isoxml'>
-          <preface>
-            <foreword>
-              <note id='note1'>
-                <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='note2'>
-                <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>
-            </foreword>
-          </preface>
-        </iso-standard>
-      INPUT
-        #{HTML_HDR}
-                     <br/>
-                     <div>
-                       <h1 class="ForewordTitle">Foreword</h1>
-                       <div id="note1" 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="note2" 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>
+    output = <<~OUTPUT
+      #{HTML_HDR}
+                   <br/>
+                   <div>
+                     <h1 class="ForewordTitle">Foreword</h1>
+                     <div id="note1" 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="note2" 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>
-                     <p class="zzSTDTitle1"/>
                    </div>
-                 </body>
-             </html>
-      OUTPUT
+                   <p class="zzSTDTitle1"/>
+                 </div>
+               </body>
+           </html>
+    OUTPUT
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
+      .convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::HtmlConvert.new({})
+      .convert("test", presxml, true))).to be_equivalent_to xmlpp(output)
   end
 
   it "processes multi-para notes" do
-    expect(xmlpp(IsoDoc::HtmlConvert.new({})
-      .convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-            <iso-standard xmlns="http://riboseinc.com/isoxml">
-            <preface><foreword>
-            <note>
-            <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>
-          <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83a">These results are based on a study carried out on three different types of kernel.</p>
-        </note>
-            </foreword></preface>
-            </iso-standard>
-      INPUT
-        #{HTML_HDR}
-                  <br/>
-                  <div>
-                    <h1 class="ForewordTitle">Foreword</h1>
-                    <div 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>
-                      <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83a">These results are based on a study carried out on three different types of kernel.</p>
-                    </div>
+    input = <<~INPUT
+          <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <preface><foreword>
+          <note>
+          <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>
+        <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83a">These results are based on a study carried out on three different types of kernel.</p>
+      </note>
+          </foreword></preface>
+          </iso-standard>
+    INPUT
+    output = <<~OUTPUT
+      #{HTML_HDR}
+                <br/>
+                <div>
+                  <h1 class="ForewordTitle">Foreword</h1>
+                  <div 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>
+                    <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83a">These results are based on a study carried out on three different types of kernel.</p>
                   </div>
-                  <p class="zzSTDTitle1"/>
                 </div>
-              </body>
-          </html>
-      OUTPUT
-  end
-
-  it "processes non-para notes" do
+                <p class="zzSTDTitle1"/>
+              </div>
+            </body>
+        </html>
+    OUTPUT
     expect(xmlpp(IsoDoc::HtmlConvert.new({})
-      .convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-            <iso-standard xmlns="http://riboseinc.com/isoxml">
-            <preface><foreword>
-            <note id="A"><name>NOTE</name>
-            <dl>
-            <dt>A</dt>
-            <dd><p>B</p></dd>
-            </dl>
-            <ul>
-            <li>C</li></ul>
-        </note>
-            </foreword></preface>
-            </iso-standard>
-      INPUT
-        #{HTML_HDR}
-                  <br/>
-                  <div>
-                    <h1 class="ForewordTitle">Foreword</h1>
-                    <div id="A" class="Note"><p><span class="note_label">NOTE</span>&#160; </p>
-              <dl><dt><p>A</p></dt><dd><p>B</p></dd></dl>
-              <ul>
-              <li>C</li></ul>
-          </div>
-                  </div>
-                  <p class="zzSTDTitle1"/>
-                </div>
-              </body>
-          </html>
-
-      OUTPUT
+      .convert("test", input, true))).to be_equivalent_to xmlpp(output)
   end
 
-  it "processes non-para notes (Word)" do
-    expect(xmlpp(IsoDoc::WordConvert.new({})
-      .convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-            <iso-standard xmlns="http://riboseinc.com/isoxml">
-            <preface><foreword>
-            <note id="A"><name>NOTE</name>
-            <dl>
-            <dt>A</dt>
-            <dd><p>B</p></dd>
-            </dl>
-            <ul>
-            <li>C</li></ul>
-        </note>
-            </foreword></preface>
-            </iso-standard>
-      INPUT
-            <html xmlns:epub="http://www.idpf.org/2007/ops" lang="en">
-          <head><style/></head>
-          <body lang="EN-US" link="blue" vlink="#954F72">
-            <div class="WordSection1">
-              <p>&#160;</p>
-            </div>
-            <p><br clear="all" class="section"/></p>
-            <div class="WordSection2">
-              <p><br clear="all" style="mso-special-character:line-break;page-break-before:always"/></p>
-              <div>
-                <h1 class="ForewordTitle">Foreword</h1>
-                <div id="A" class="Note"><p class="Note"><span class="note_label">NOTE</span><span style="mso-tab-count:1">&#160; </span></p>
-            <table class="dl"><tr><td valign="top" align="left"><p align="left" style="margin-left:0pt;text-align:left;">A</p></td><td valign="top"><p class="Note">B</p></td></tr></table>
+  it "processes non-para notes" do
+    input = <<~INPUT
+          <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <preface><foreword>
+          <note id="A"><name>NOTE</name>
+          <dl>
+          <dt>A</dt>
+          <dd><p>B</p></dd>
+          </dl>
+          <ul>
+          <li>C</li></ul>
+      </note>
+          </foreword></preface>
+          </iso-standard>
+    INPUT
+    html = <<~OUTPUT
+      #{HTML_HDR}
+                <br/>
+                <div>
+                  <h1 class="ForewordTitle">Foreword</h1>
+                  <div id="A" class="Note"><p><span class="note_label">NOTE</span>&#160; </p>
+            <dl><dt><p>A</p></dt><dd><p>B</p></dd></dl>
             <ul>
             <li>C</li></ul>
         </div>
+                </div>
+                <p class="zzSTDTitle1"/>
               </div>
-              <p>&#160;</p>
-            </div>
-            <p><br clear="all" class="section"/></p>
-            <div class="WordSection3">
-              <p class="zzSTDTitle1"/>
-            </div>
-          </body>
+            </body>
         </html>
+
     OUTPUT
+    doc = <<~OUTPUT
+          <html xmlns:epub="http://www.idpf.org/2007/ops" lang="en">
+        <head><style/></head>
+        <body lang="EN-US" link="blue" vlink="#954F72">
+          <div class="WordSection1">
+            <p>&#160;</p>
+          </div>
+          <p><br clear="all" class="section"/></p>
+          <div class="WordSection2">
+            <p><br clear="all" style="mso-special-character:line-break;page-break-before:always"/></p>
+            <div>
+              <h1 class="ForewordTitle">Foreword</h1>
+              <div id="A" class="Note"><p class="Note"><span class="note_label">NOTE</span><span style="mso-tab-count:1">&#160; </span></p>
+          <table class="dl"><tr><td valign="top" align="left"><p align="left" style="margin-left:0pt;text-align:left;">A</p></td><td valign="top"><p class="Note">B</p></td></tr></table>
+          <ul>
+          <li>C</li></ul>
+      </div>
+            </div>
+            <p>&#160;</p>
+          </div>
+          <p><br clear="all" class="section"/></p>
+          <div class="WordSection3">
+            <p class="zzSTDTitle1"/>
+          </div>
+        </body>
+      </html>
+    OUTPUT
+    expect(xmlpp(IsoDoc::HtmlConvert.new({})
+      .convert("test", input, true))).to be_equivalent_to xmlpp(html)
+    expect(xmlpp(IsoDoc::WordConvert.new({})
+      .convert("test", input, true))).to be_equivalent_to xmlpp(doc)
   end
 
   it "processes paragraphs containing notes" do
@@ -896,41 +835,41 @@ RSpec.describe IsoDoc do
           </foreword></preface>
           </iso-standard>
     INPUT
-                    <html xmlns:epub='http://www.idpf.org/2007/ops' lang='en'>
-                <head>
-                <style>
-                        </style>
-                  </head>
-                  <body lang='EN-US' link='blue' vlink='#954F72'>
-                    <div class='WordSection1'>
-                      <p>&#160;</p>
-                    </div>
-                    <p>
-                      <br clear='all' class='section'/>
-                    </p>
-                    <div class='WordSection2'>
-                      <p>
-                        <br clear='all' style='mso-special-character:line-break;page-break-before:always'/>
-                      </p>
-                      <div>
-                        <h1 class='ForewordTitle'>Foreword</h1>
-                        <div id='figureA-1' class='figure'>
-                          <img src='spec/assets/odf.emf'/>
-                          <img src='spec/assets/odf1.emf'/>
-                          <img src='_.emf' height='auto' width='auto'/>
-                           <img src='_.xml' height='20' width='auto'/>
-                        </div>
-                      </div>
-                      <p>&#160;</p>
-                    </div>
-                    <p>
-                      <br clear='all' class='section'/>
-                    </p>
-                    <div class='WordSection3'>
-                      <p class='zzSTDTitle1'/>
-                    </div>
-                  </body>
-                </html>
+          <html xmlns:epub='http://www.idpf.org/2007/ops' lang='en'>
+      <head>
+      <style>
+              </style>
+        </head>
+        <body lang='EN-US' link='blue' vlink='#954F72'>
+          <div class='WordSection1'>
+            <p>&#160;</p>
+          </div>
+          <p>
+            <br clear='all' class='section'/>
+          </p>
+          <div class='WordSection2'>
+            <p>
+              <br clear='all' style='mso-special-character:line-break;page-break-before:always'/>
+            </p>
+            <div>
+              <h1 class='ForewordTitle'>Foreword</h1>
+              <div id='figureA-1' class='figure'>
+                <img src='spec/assets/odf.emf'/>
+                <img src='spec/assets/odf1.emf'/>
+                <img src='_.emf' height='auto' width='auto'/>
+                 <img src='_.xml' height='20' width='auto'/>
+              </div>
+            </div>
+            <p>&#160;</p>
+          </div>
+          <p>
+            <br clear='all' class='section'/>
+          </p>
+          <div class='WordSection3'>
+            <p class='zzSTDTitle1'/>
+          </div>
+        </body>
+      </html>
     OUTPUT
   end
 
@@ -944,50 +883,50 @@ RSpec.describe IsoDoc do
 
       expect(xmlpp(strip_guid(IsoDoc::WordConvert.new({})
 .convert("test", <<~"INPUT", true).gsub(/['"][^'".]+(?<!odf1)(?<!odf)\.svg['"]/, "'_.svg'").gsub(/mso-bookmark:_Ref\d+/, "mso-bookmark:_Ref")))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-            <iso-standard xmlns="http://riboseinc.com/isoxml">
-            <preface><foreword>
-            <figure id="figureA-1">
-          <image src="spec/assets/odf.svg" mimetype="image/svg+xml"/>
-          <image src="spec/assets/odf1.svg" mimetype="image/svg+xml"/>
-          <image src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxMDAgMTAwIj4KICA8Y2lyY2xlIGZpbGw9IiMwMDkiIHI9IjQ1IiBjeD0iNTAiIGN5PSI1MCIvPgogIDxwYXRoIGQ9Ik0zMywyNkg3OEEzNywzNywwLDAsMSwzMyw4M1Y1N0g1OVY0M0gzM1oiIGZpbGw9IiNGRkYiLz4KPC9zdmc+Cg==" id="_d3731866-1a07-435a-a6c2-1acd41023a4e" mimetype="image/svg+xml" height="auto" width="auto"/>
-        </figure>
-            </foreword></preface>
-            </iso-standard>
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+      <preface><foreword>
+      <figure id="figureA-1">
+    <image src="spec/assets/odf.svg" mimetype="image/svg+xml"/>
+    <image src="spec/assets/odf1.svg" mimetype="image/svg+xml"/>
+    <image src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxMDAgMTAwIj4KICA8Y2lyY2xlIGZpbGw9IiMwMDkiIHI9IjQ1IiBjeD0iNTAiIGN5PSI1MCIvPgogIDxwYXRoIGQ9Ik0zMywyNkg3OEEzNywzNywwLDAsMSwzMyw4M1Y1N0g1OVY0M0gzM1oiIGZpbGw9IiNGRkYiLz4KPC9zdmc+Cg==" id="_d3731866-1a07-435a-a6c2-1acd41023a4e" mimetype="image/svg+xml" height="auto" width="auto"/>
+  </figure>
+      </foreword></preface>
+      </iso-standard>
       INPUT
-                     <html xmlns:epub='http://www.idpf.org/2007/ops' lang='en'>
-                    <head>
-                    <style>
-                            </style>
-                      </head>
-                      <body lang='EN-US' link='blue' vlink='#954F72'>
-                        <div class='WordSection1'>
-                          <p>&#160;</p>
-                        </div>
-                        <p>
-                          <br clear='all' class='section'/>
-                        </p>
-                        <div class='WordSection2'>
-                          <p>
-                            <br clear='all' style='mso-special-character:line-break;page-break-before:always'/>
-                          </p>
-                          <div>
-                            <h1 class='ForewordTitle'>Foreword</h1>
-                            <div id='figureA-1' class='figure'>
-                              <img src='spec/assets/odf.emf'/>
-                              <img src='spec/assets/odf1.svg'/>
-                              <img src='_.svg' height='auto' width='auto'/>
-                            </div>
-                          </div>
-                          <p>&#160;</p>
-                        </div>
-                        <p>
-                          <br clear='all' class='section'/>
-                        </p>
-                        <div class='WordSection3'>
-                          <p class='zzSTDTitle1'/>
-                        </div>
-                      </body>
-                    </html>
+   <html xmlns:epub='http://www.idpf.org/2007/ops' lang='en'>
+  <head>
+  <style>
+          </style>
+    </head>
+    <body lang='EN-US' link='blue' vlink='#954F72'>
+      <div class='WordSection1'>
+        <p>&#160;</p>
+      </div>
+      <p>
+        <br clear='all' class='section'/>
+      </p>
+      <div class='WordSection2'>
+        <p>
+          <br clear='all' style='mso-special-character:line-break;page-break-before:always'/>
+        </p>
+        <div>
+          <h1 class='ForewordTitle'>Foreword</h1>
+          <div id='figureA-1' class='figure'>
+            <img src='spec/assets/odf.emf'/>
+            <img src='spec/assets/odf1.svg'/>
+            <img src='_.svg' height='auto' width='auto'/>
+          </div>
+        </div>
+        <p>&#160;</p>
+      </div>
+      <p>
+        <br clear='all' class='section'/>
+      </p>
+      <div class='WordSection3'>
+        <p class='zzSTDTitle1'/>
+      </div>
+    </body>
+  </html>
       OUTPUT
     end
   end
@@ -1639,15 +1578,15 @@ RSpec.describe IsoDoc do
 
   it "processes blockquotes (Presentation XML)" do
     expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-                    <iso-standard xmlns="http://riboseinc.com/isoxml">
-                    <preface><foreword>
-                    <quote id="_044bd364-c832-4b78-8fea-92242402a1d1">
-                  <source type="inline" bibitemid="ISO7301" citeas="ISO 7301:2011"><locality type="clause"><referenceFrom>1</referenceFrom></locality></source>
-                  <author>ISO</author>
-                  <p id="_d4fd0a61-f300-4285-abe6-602707590e53">This International Standard gives the minimum specifications for rice (<em>Oryza sativa</em> L.) which is subject to international trade. It is applicable to the following types: husked rice and milled rice, parboiled or not, intended for direct human consumption. It is neither applicable to other products derived from rice, nor to waxy rice (glutinous rice).</p>
-                </quote>
-                    </foreword></preface>
-                    </iso-standard>
+          <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <preface><foreword>
+          <quote id="_044bd364-c832-4b78-8fea-92242402a1d1">
+        <source type="inline" bibitemid="ISO7301" citeas="ISO 7301:2011"><locality type="clause"><referenceFrom>1</referenceFrom></locality></source>
+        <author>ISO</author>
+        <p id="_d4fd0a61-f300-4285-abe6-602707590e53">This International Standard gives the minimum specifications for rice (<em>Oryza sativa</em> L.) which is subject to international trade. It is applicable to the following types: husked rice and milled rice, parboiled or not, intended for direct human consumption. It is neither applicable to other products derived from rice, nor to waxy rice (glutinous rice).</p>
+      </quote>
+          </foreword></preface>
+          </iso-standard>
     INPUT
       <?xml version='1.0'?>
          <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
@@ -1678,15 +1617,15 @@ RSpec.describe IsoDoc do
 
   it "processes blockquotes (HTML)" do
     expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-                    <iso-standard xmlns="http://riboseinc.com/isoxml">
-                    <preface><foreword>
-                    <quote id="_044bd364-c832-4b78-8fea-92242402a1d1">
-                  <source type="inline" bibitemid="ISO7301" citeas="ISO 7301:2011"><locality type="clause"><referenceFrom>1</referenceFrom></locality>ISO 7301:2011, Clause 1</source>
-                  <author>ISO</author>
-                  <p id="_d4fd0a61-f300-4285-abe6-602707590e53">This International Standard gives the minimum specifications for rice (<em>Oryza sativa</em> L.) which is subject to international trade. It is applicable to the following types: husked rice and milled rice, parboiled or not, intended for direct human consumption. It is neither applicable to other products derived from rice, nor to waxy rice (glutinous rice).</p>
-                </quote>
-                    </foreword></preface>
-                    </iso-standard>
+          <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <preface><foreword>
+          <quote id="_044bd364-c832-4b78-8fea-92242402a1d1">
+        <source type="inline" bibitemid="ISO7301" citeas="ISO 7301:2011"><locality type="clause"><referenceFrom>1</referenceFrom></locality>ISO 7301:2011, Clause 1</source>
+        <author>ISO</author>
+        <p id="_d4fd0a61-f300-4285-abe6-602707590e53">This International Standard gives the minimum specifications for rice (<em>Oryza sativa</em> L.) which is subject to international trade. It is applicable to the following types: husked rice and milled rice, parboiled or not, intended for direct human consumption. It is neither applicable to other products derived from rice, nor to waxy rice (glutinous rice).</p>
+      </quote>
+          </foreword></preface>
+          </iso-standard>
     INPUT
       #{HTML_HDR}
                      <br/>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-10 00:00:00.000000000 Z
+date: 2021-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath