RubyGems - isodoc - Versions diffs - 1.6.3 → 1.6.4 - Mend

isodoc 1.6.3 → 1.6.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (31) hide show

checksums.yaml +4 -4
data/.github/workflows/rake.yml +2 -12
data/.hound.yml +3 -1
data/.rubocop.yml +3 -5
data/isodoc.gemspec +1 -1
data/lib/isodoc.rb +0 -2
data/lib/isodoc/convert.rb +4 -0
data/lib/isodoc/function/cleanup.rb +52 -43
data/lib/isodoc/function/inline.rb +7 -7
data/lib/isodoc/function/section.rb +29 -16
data/lib/isodoc/function/to_word_html.rb +6 -3
data/lib/isodoc/function/utils.rb +181 -163
data/lib/isodoc/headlesshtml_convert.rb +8 -7
data/lib/isodoc/html_function/comments.rb +2 -0
data/lib/isodoc/html_function/footnotes.rb +14 -7
data/lib/isodoc/html_function/html.rb +30 -26
data/lib/isodoc/html_function/postprocess.rb +16 -13
data/lib/isodoc/pdf_convert.rb +11 -13
data/lib/isodoc/presentation_function/bibdata.rb +43 -22
data/lib/isodoc/presentation_function/inline.rb +20 -15
data/lib/isodoc/version.rb +1 -1
data/lib/isodoc/word_function/postprocess.rb +50 -36
data/lib/isodoc/xref/xref_gen_seq.rb +60 -35
data/lib/isodoc/xref/xref_sect_gen.rb +4 -4
data/spec/assets/scripts_override.html +3 -0
data/spec/isodoc/blocks_spec.rb +196 -245
data/spec/isodoc/inline_spec.rb +442 -289
data/spec/isodoc/postproc_spec.rb +111 -50
data/spec/isodoc/presentation_xml_spec.rb +354 -277
data/spec/isodoc/terms_spec.rb +83 -83
metadata +5 -4

data/lib/isodoc/version.rb CHANGED Viewed

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

data/lib/isodoc/word_function/postprocess.rb CHANGED Viewed

@@ -1,17 +1,17 @@
 require "fileutils"
-require_relative "./postprocess_cover.rb"
+require_relative "./postprocess_cover"
 module IsoDoc::WordFunction
   module Postprocess
     # add namespaces for Word fragments
     WORD_NOKOHEAD = <<~HERE.freeze
-    <!DOCTYPE html SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-    <html xmlns="http://www.w3.org/1999/xhtml"
-xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
-    <head> <title></title> <meta charset="UTF-8" /> </head>
-    <body> </body> </html>
+      <!DOCTYPE html SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+      <html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office"
+      xmlns:w="urn:schemas-microsoft-com:office:word"
+      xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
+      <head> <title></title> <meta charset="UTF-8" /> </head>
+      <body> </body> </html>
     HERE
     def to_word_xhtml_fragment(xml)
@@ -22,7 +22,8 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
     def table_note_cleanup(docxml)
       super
       # preempt html2doc putting MsoNormal there
-      docxml.xpath("//p[not(self::*[@class])][ancestor::*[@class = 'Note']]").each do |p|
+      docxml.xpath("//p[not(self::*[@class])][ancestor::*[@class = 'Note']]")
+        .each do |p|
         p["class"] = "Note"
       end
     end
@@ -38,16 +39,21 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
     def toWord(result, filename, dir, header)
       result = from_xhtml(word_cleanup(to_xhtml(result)))
       @wordstylesheet = wordstylesheet_update
-      Html2Doc.process(result, filename: filename, stylesheet: @wordstylesheet&.path,
-                       header_file: header&.path, dir: dir,
-                       asciimathdelims: [@openmathdelim, @closemathdelim],
-                       liststyles: { ul: @ulstyle, ol: @olstyle })
+      Html2Doc.process(
+        result,
+        filename: filename,
+        stylesheet: @wordstylesheet&.path,
+        header_file: header&.path, dir: dir,
+        asciimathdelims: [@openmathdelim, @closemathdelim],
+        liststyles: { ul: @ulstyle, ol: @olstyle }
+      )
       header&.unlink
-      @wordstylesheet&.unlink if @wordstylesheet&.is_a?(Tempfile)
+      @wordstylesheet.unlink if @wordstylesheet.is_a?(Tempfile)
     end
-    def wordstylesheet_update()
+    def wordstylesheet_update
       return if @wordstylesheet.nil?
       f = File.open(@wordstylesheet.path, "a")
       @landscapestyle.empty? or f.write(@landscapestyle)
       if @wordstylesheet_override && @wordstylesheet
@@ -62,7 +68,8 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
     def word_admonition_images(docxml)
       docxml.xpath("//div[@class = 'Admonition']//img").each do |i|
-        i["width"], i["height"] = Html2Doc.image_resize(i, image_localfile(i), @maxheight, 300)
+        i["width"], i["height"] =
+          Html2Doc.image_resize(i, image_localfile(i), @maxheight, 300)
       end
     end
@@ -88,21 +95,23 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
       cells2d = {}
       docxml.xpath("//table[colgroup]").each do |t|
         w = colgroup_widths(t)
-        t.xpath(".//tr").each_with_index { |tr, r| cells2d[r] = {} }
+        t.xpath(".//tr").each_with_index { |_tr, r| cells2d[r] = {} }
         t.xpath(".//tr").each_with_index do |tr, r|
-          tr.xpath("./td | ./th").each_with_index do |td, i|
+          tr.xpath("./td | ./th").each_with_index do |td, _i|
             x = 0
             rs = td&.attr("rowspan")&.to_i || 1
             cs = td&.attr("colspan")&.to_i || 1
-            while cells2d[r][x] do
-              x += 1
+            while cells2d[r][x]
+              x += 1
             end
-            for y2 in r..(r + rs - 1)
-              for x2 in x..(x + cs - 1)
+            (r..(r + rs - 1)).each do |y2|
+              (x..(x + cs - 1)).each do |x2|
                 cells2d[y2][x2] = 1
               end
             end
-            width = (x..(x+cs-1)).each_with_object({width: 0}) { |z, m| m[:width] += w[z] }
+            width = (x..(x + cs - 1)).each_with_object({ width: 0 }) do |z, m|
+              m[:width] += w[z]
+            end
             td["width"] = "#{width[:width]}%"
             x += cs
           end
@@ -111,8 +120,8 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
     end
     # assume percentages
-    def colgroup_widths(t)
-      t.xpath("./colgroup/col").each_with_object([]) do |c, m|
+    def colgroup_widths(table)
+      table.xpath("./colgroup/col").each_with_object([]) do |c, m|
         m << c["width"].sub(/%$/, "").to_f
       end
     end
@@ -127,12 +136,13 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
     def style_update(node, css)
       return unless node
-      node["style"] = node["style"] ?  node["style"].sub(/;?$/, ";#{css}") : css
+      node["style"] = node["style"] ? node["style"].sub(/;?$/, ";#{css}") : css
     end
     def word_image_caption(docxml)
-      docxml.xpath("//p[@class = 'FigureTitle' or @class = 'SourceTitle']").
-        each do |t|
+      docxml.xpath("//p[@class = 'FigureTitle' or @class = 'SourceTitle']")
+        .each do |t|
         if t&.previous_element&.name == "img"
           img = t.previous_element
           t.previous_element.swap("<p class=\'figure\'>#{img.to_xml}</p>")
@@ -150,7 +160,8 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
       xpath.each do |list|
         (list.xpath(".//li") - list.xpath(".//ol//li | .//ul//li")).each do |l|
           l.xpath("./p | ./div | ./table").each_with_index do |p, i|
-            next if i == 0
+            next if i.zero?
             p.wrap(%{<div class="ListContLevel#{lvl}"/>})
           end
           list_add(l.xpath(".//ul") - l.xpath(".//ul//ul | .//ol//ul"), lvl + 1)
@@ -162,20 +173,21 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
     def word_table_align(docxml)
       docxml.xpath("//td[@align]/p | //th[@align]/p").each do |p|
         next if p["align"]
-        style_update(p, "text-align: #{p.parent["align"]}")
+        style_update(p, "text-align: #{p.parent['align']}")
       end
     end
     def word_table_separator(docxml)
       docxml.xpath("//p[@class = 'TableTitle']").each do |t|
         next unless t.children.empty?
         t["style"] = t["style"].sub(/;?$/, ";font-size:0pt;")
         t.children = "&nbsp;"
       end
     end
-    def word_annex_cleanup(docxml)
-    end
+    def word_annex_cleanup(docxml); end
     def word_example_cleanup(docxml)
       docxml.xpath("//div[@class = 'example']//p[not(@class)]").each do |p|
@@ -194,19 +206,21 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
       docxml.xpath("//div[p/br]").each do |d|
         /^WordSection\d+_\d+$/.match(d["class"]) or next
         d.elements[0].name == "p" && !d.elements[0].elements.empty? or next
-        d.elements[0].elements[0].name == "br" && d.elements[0].elements[0]["style"] ==
-          "mso-special-character:line-break;page-break-before:always" or next
+        d.elements[0].elements[0].name == "br" &&
+          d.elements[0].elements[0]["style"] ==
+            "mso-special-character:line-break;page-break-before:always" or next
         d.elements[0].remove
       end
     end
     def word_footnote_format(docxml)
-      # the content is in a[@epub:type = 'footnote']//sup, but in Word,
+      # the content is in a[@epub:type = 'footnote']//sup, but in Word,
       # we need to inject content around the autonumbered footnote reference
       docxml.xpath("//a[@epub:type = 'footnote']").each do |x|
         footnote_reference_format(x)
       end
-      docxml.xpath("//a[@class = 'TableFootnoteRef'] | //span[@class = 'TableFootnoteRef']").each do |x|
+      docxml.xpath("//a[@class = 'TableFootnoteRef'] | "\
+                   "//span[@class = 'TableFootnoteRef']").each do |x|
         table_footnote_reference_format(x)
       end
       docxml

data/lib/isodoc/xref/xref_gen_seq.rb CHANGED Viewed

@@ -8,25 +8,27 @@ module IsoDoc::XrefGen
       "-"
     end
-    def subfigure_increment(j, c, t)
-      if t.parent.name == "figure" then j += 1
+    def subfigure_increment(idx, counter, elem)
+      if elem.parent.name == "figure" then idx += 1
       else
-        j = 0
-        c.increment(t)
+        idx = 0
+        counter.increment(elem)
       end
-      j
+      idx
     end
     def sequential_figure_names(clause)
       c = Counter.new
       j = 0
-      clause.xpath(ns(".//figure | .//sourcecode[not(ancestor::example)]")).
-        each do |t|
+      clause.xpath(ns(".//figure | .//sourcecode[not(ancestor::example)]"))
+        .each do |t|
         j = subfigure_increment(j, c, t)
         label = c.print + (j.zero? ? "" : "-#{j}")
         next if t["id"].nil? || t["id"].empty?
-        @anchors[t["id"]] =
-          anchor_struct(label, nil, @labels["figure"], "figure", t["unnumbered"])
+        @anchors[t["id"]] = anchor_struct(
+          label, nil, @labels["figure"], "figure", t["unnumbered"]
+        )
       end
     end
@@ -34,8 +36,11 @@ module IsoDoc::XrefGen
       c = Counter.new
       clause.xpath(ns(".//table")).each do |t|
         next if t["id"].nil? || t["id"].empty?
-        @anchors[t["id"]] = anchor_struct(c.increment(t).print, nil,
-                                          @labels["table"], "table", t["unnumbered"])
+        @anchors[t["id"]] = anchor_struct(
+          c.increment(t).print, nil,
+          @labels["table"], "table", t["unnumbered"]
+        )
       end
     end
@@ -43,10 +48,12 @@ module IsoDoc::XrefGen
       c = Counter.new
       clause.xpath(ns(".//formula")).each do |t|
         next if t["id"].nil? || t["id"].empty?
-        @anchors[t["id"]] =
-          anchor_struct(c.increment(t).print, t,
-                        t["inequality"] ? @labels["inequality"] : @labels["formula"],
-                        "formula", t["unnumbered"])
+        @anchors[t["id"]] = anchor_struct(
+          c.increment(t).print, t,
+          t["inequality"] ? @labels["inequality"] : @labels["formula"],
+          "formula", t["unnumbered"]
+        )
       end
     end
@@ -57,22 +64,27 @@ module IsoDoc::XrefGen
       c = Counter.new
       clause.xpath(ns(".//#{klass}#{FIRST_LVL_REQ}")).each do |t|
         next if t["id"].nil? || t["id"].empty?
         id = c.increment(t).print
         @anchors[t["id"]] = anchor_struct(id, t, label, klass, t["unnumbered"])
         sequential_permission_names2(t, id)
       end
     end
-    def sequential_permission_names2(t, id)
-      sequential_permission_names1(t, id, "permission", @labels["permission"])
-      sequential_permission_names1(t, id, "requirement", @labels["requirement"])
-      sequential_permission_names1(t, id, "recommendation", @labels["recommendation"])
+    def sequential_permission_names2(elem, ident)
+      sequential_permission_names1(elem, ident, "permission",
+                                   @labels["permission"])
+      sequential_permission_names1(elem, ident, "requirement",
+                                   @labels["requirement"])
+      sequential_permission_names1(elem, ident, "recommendation",
+                                   @labels["recommendation"])
     end
     def sequential_permission_names1(block, lbl, klass, label)
       c = Counter.new
       block.xpath(ns("./#{klass}")).each do |t|
         next if t["id"].nil? || t["id"].empty?
         id = "#{lbl}#{hierfigsep}#{c.increment(t).print}"
         @anchors[t["id"]] = anchor_struct(id, t, label, klass, t["unnumbered"])
         sequential_permission_names2(t, id)
@@ -85,20 +97,22 @@ module IsoDoc::XrefGen
       sequential_formula_names(clause)
       sequential_permission_names(clause, "permission", @labels["permission"])
       sequential_permission_names(clause, "requirement", @labels["requirement"])
-      sequential_permission_names(clause, "recommendation", @labels["recommendation"])
+      sequential_permission_names(clause, "recommendation",
+                                  @labels["recommendation"])
     end
     def hierarchical_figure_names(clause, num)
       c = Counter.new
       j = 0
-      clause.xpath(ns(".//figure |  .//sourcecode[not(ancestor::example)]")).
-        each do |t|
+      clause.xpath(ns(".//figure |  .//sourcecode[not(ancestor::example)]"))
+        .each do |t|
         j = subfigure_increment(j, c, t)
         label = "#{num}#{hiersep}#{c.print}" +
           (j.zero? ? "" : "#{hierfigsep}#{j}")
         next if t["id"].nil? || t["id"].empty?
-        @anchors[t["id"]] = anchor_struct(label, nil, @labels["figure"], "figure",
-                                          t["unnumbered"])
+        @anchors[t["id"]] = anchor_struct(label, nil, @labels["figure"],
+                                          "figure", t["unnumbered"])
       end
     end
@@ -106,6 +120,7 @@ module IsoDoc::XrefGen
       c = Counter.new
       clause.xpath(ns(".//table")).each do |t|
         next if t["id"].nil? || t["id"].empty?
         @anchors[t["id"]] =
           anchor_struct("#{num}#{hiersep}#{c.increment(t).print}",
                         nil, @labels["table"], "table", t["unnumbered"])
@@ -116,7 +131,8 @@ module IsoDoc::XrefGen
       hierarchical_table_names(clause, num)
       hierarchical_figure_names(clause, num)
       hierarchical_formula_names(clause, num)
-      hierarchical_permission_names(clause, num, "permission", @labels["permission"])
+      hierarchical_permission_names(clause, num, "permission",
+                                    @labels["permission"])
       hierarchical_permission_names(clause, num, "requirement",
                                     @labels["requirement"])
       hierarchical_permission_names(clause, num, "recommendation",
@@ -127,10 +143,12 @@ module IsoDoc::XrefGen
       c = Counter.new
       clause.xpath(ns(".//formula")).each do |t|
         next if t["id"].nil? || t["id"].empty?
-        @anchors[t["id"]] =
-          anchor_struct("#{num}#{hiersep}#{c.increment(t).print}", nil,
-                        t["inequality"] ? @labels["inequality"] : @labels["formula"],
-                        "formula", t["unnumbered"])
+        @anchors[t["id"]] = anchor_struct(
+          "#{num}#{hiersep}#{c.increment(t).print}", nil,
+          t["inequality"] ? @labels["inequality"] : @labels["formula"],
+          "formula", t["unnumbered"]
+        )
       end
     end
@@ -138,24 +156,31 @@ module IsoDoc::XrefGen
       c = Counter.new
       clause.xpath(ns(".//#{klass}#{FIRST_LVL_REQ}")).each do |t|
         next if t["id"].nil? || t["id"].empty?
         id = "#{num}#{hiersep}#{c.increment(t).print}"
-        @anchors[t["id"]] = anchor_struct(id, nil, label, klass, t["unnumbered"])
+        @anchors[t["id"]] =
+          anchor_struct(id, nil, label, klass, t["unnumbered"])
         hierarchical_permission_names2(t, id)
       end
     end
-    def hierarchical_permission_names2(t, id)
-      hierarchical_permission_names1(t, id, "permission", @labels["permission"])
-      hierarchical_permission_names1(t, id, "requirement", @labels["requirement"])
-      hierarchical_permission_names1(t, id, "recommendation", @labels["recommendation"])
+    def hierarchical_permission_names2(elem, ident)
+      hierarchical_permission_names1(elem, ident, "permission",
+                                     @labels["permission"])
+      hierarchical_permission_names1(elem, ident, "requirement",
+                                     @labels["requirement"])
+      hierarchical_permission_names1(elem, ident, "recommendation",
+                                     @labels["recommendation"])
     end
     def hierarchical_permission_names1(block, lbl, klass, label)
       c = Counter.new
       block.xpath(ns("./#{klass}")).each do |t|
         next if t["id"].nil? || t["id"].empty?
         id = "#{lbl}#{hierfigsep}#{c.increment(t).print}"
-        @anchors[t["id"]] = anchor_struct(id, nil, label, klass, t["unnumbered"])
+        @anchors[t["id"]] =
+          anchor_struct(id, nil, label, klass, t["unnumbered"])
         hierarchical_permission_names2(t, id)
       end
     end

data/lib/isodoc/xref/xref_sect_gen.rb CHANGED Viewed

@@ -60,17 +60,17 @@ module IsoDoc::XrefGen
       end
     end
-    def middle_section_asset_names(d)
+    def middle_section_asset_names(doc)
       middle_sections = "//clause[@type = 'scope'] | "\
         "#{@klass.norm_ref_xpath} | "\
         "//sections/terms | //preface/* | "\
         "//sections/definitions | //clause[parent::sections]"
-      sequential_asset_names(d.xpath(ns(middle_sections)))
+      sequential_asset_names(doc.xpath(ns(middle_sections)))
     end
-    def clause_names(docxml, n)
+    def clause_names(docxml, num)
       docxml.xpath(ns(@klass.middle_clause(docxml))).each_with_index do |c, _i|
-        section_names(c, n, 1)
+        section_names(c, num, 1)
       end
     end

data/spec/assets/scripts_override.html ADDED Viewed

@@ -0,0 +1,3 @@
+<script>
+  This is > also a script
+</script>

data/spec/isodoc/blocks_spec.rb CHANGED Viewed

@@ -472,96 +472,90 @@ RSpec.describe IsoDoc do
   end
   it "processes paragraphs containing notes" do
-    expect(xmlpp(strip_guid(IsoDoc::HtmlConvert.new({})
-      .convert("test", <<~"INPUT", true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-                <iso-standard xmlns="http://riboseinc.com/isoxml">
-            <preface><foreword>
-            <p id="A">ABC <note id="B"><name>NOTE 1</name><p id="C">XYZ</p></note>
-        <note id="B1"><name>NOTE 2</name><p id="C1">XYZ1</p></note></p>
-        </foreword></preface>
-            </iso-standard>
-      INPUT
-        #{HTML_HDR}
-                  <br/>
-                  <div>
-                    <h1 class='ForewordTitle'>Foreword</h1>
-                    <p id='A'>
-                      ABC
-                      <div id='B' class='Note'>
-                        <p>
-                          <span class='note_label'>NOTE 1</span>
-                          &#160; XYZ
-                        </p>
-                      </div>
-                      <div id='B1' class='Note'>
-                        <p>
-                          <span class='note_label'>NOTE 2</span>
-                          &#160; XYZ1
-                        </p>
-                      </div>
-                    </p>
-                  </div>
-                  <p class='zzSTDTitle1'/>
-                </div>
-              </body>
-            </html>
-      OUTPUT
-  end
-  it "processes paragraphs containing notes (Word)" do
-    expect(xmlpp(strip_guid(IsoDoc::WordConvert.new({})
-      .convert("test", <<~"INPUT", true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-                <iso-standard xmlns="http://riboseinc.com/isoxml">
-            <preface><foreword>
-            <p id="A">ABC <note id="B"><name>NOTE 1</name><p id="C">XYZ</p></note>
-        <note id="B1"><name>NOTE 2</name><p id="C1">XYZ1</p></note></p>
-        </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>
-                <p id='A'>ABC </p>
-                <div id='B' class='Note'>
-                  <p class='Note'>
-                    <span class='note_label'>NOTE 1</span>
-                    <span style='mso-tab-count:1'>&#160; </span>
-                    XYZ
-                  </p>
-                </div>
-                <div id='B1' class='Note'>
-                  <p class='Note'>
-                    <span class='note_label'>NOTE 2</span>
-                    <span style='mso-tab-count:1'>&#160; </span>
-                    XYZ1
+    input = <<~INPUT
+              <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <preface><foreword>
+          <p id="A">ABC <note id="B"><name>NOTE 1</name><p id="C">XYZ</p></note>
+      <note id="B1"><name>NOTE 2</name><p id="C1">XYZ1</p></note></p>
+      </foreword></preface>
+          </iso-standard>
+    INPUT
+    html = <<~OUTPUT
+      #{HTML_HDR}
+                <br/>
+                <div>
+                  <h1 class='ForewordTitle'>Foreword</h1>
+                  <p id='A'>
+                    ABC
+                    <div id='B' class='Note'>
+                      <p>
+                        <span class='note_label'>NOTE 1</span>
+                        &#160; XYZ
+                      </p>
+                    </div>
+                    <div id='B1' class='Note'>
+                      <p>
+                        <span class='note_label'>NOTE 2</span>
+                        &#160; XYZ1
+                      </p>
+                    </div>
                   </p>
                 </div>
+                <p class='zzSTDTitle1'/>
               </div>
-              <p>&#160;</p>
-            </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' class='section'/>
+              <br clear='all' style='mso-special-character:line-break;page-break-before:always'/>
             </p>
-            <div class='WordSection3'>
-              <p class='zzSTDTitle1'/>
+            <div>
+              <h1 class='ForewordTitle'>Foreword</h1>
+              <p id='A'>ABC </p>
+              <div id='B' class='Note'>
+                <p class='Note'>
+                  <span class='note_label'>NOTE 1</span>
+                  <span style='mso-tab-count:1'>&#160; </span>
+                  XYZ
+                </p>
+              </div>
+              <div id='B1' class='Note'>
+                <p class='Note'>
+                  <span class='note_label'>NOTE 2</span>
+                  <span style='mso-tab-count:1'>&#160; </span>
+                  XYZ1
+                </p>
+              </div>
             </div>
-          </body>
-        </html>
-      OUTPUT
+            <p>&#160;</p>
+          </div>
+          <p>
+            <br clear='all' class='section'/>
+          </p>
+          <div class='WordSection3'>
+            <p class='zzSTDTitle1'/>
+          </div>
+        </body>
+      </html>
+    OUTPUT
+    expect(xmlpp(strip_guid(IsoDoc::HtmlConvert.new({})
+      .convert("test", input, true)))).to be_equivalent_to xmlpp(html)
+    expect(xmlpp(strip_guid(IsoDoc::WordConvert.new({})
+      .convert("test", input, true)))).to be_equivalent_to xmlpp(doc)
   end
   it "processes figures" do
@@ -823,7 +817,7 @@ RSpec.describe IsoDoc do
   it "converts SVG (Word)" do
     FileUtils.rm_rf "spec/assets/odf1.emf"
-    expect(xmlpp(strip_guid(IsoDoc::WordConvert.new({}).convert("test", <<~"INPUT", true).gsub(/['"][^'".]+(?<!odf1)(?<!odf)\.emf['"]/, "'_.emf'").gsub(/['"][^'".]+\.(gif|xml)['"]/, "'_.\\1'").gsub(/mso-bookmark:_Ref\d+/, "mso-bookmark:_Ref")))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
           <iso-standard xmlns="http://riboseinc.com/isoxml">
           <preface><foreword>
           <figure id="figureA-1">
@@ -835,6 +829,7 @@ RSpec.describe IsoDoc do
           </foreword></preface>
           </iso-standard>
     INPUT
+    output = <<~OUTPUT
           <html xmlns:epub='http://www.idpf.org/2007/ops' lang='en'>
       <head>
       <style>
@@ -871,6 +866,12 @@ RSpec.describe IsoDoc do
         </body>
       </html>
     OUTPUT
+    expect(xmlpp(strip_guid(IsoDoc::WordConvert.new({})
+      .convert("test", input, true)
+      .gsub(/['"][^'".]+(?<!odf1)(?<!odf)\.emf['"]/, "'_.emf'")
+      .gsub(/['"][^'".]+\.(gif|xml)['"]/, "'_.\\1'")
+      .gsub(/mso-bookmark:_Ref\d+/, "mso-bookmark:_Ref"))))
+      .to be_equivalent_to xmlpp(output)
   end
   context "disable inkscape" do
@@ -881,58 +882,63 @@ RSpec.describe IsoDoc do
       allow_any_instance_of(IsoDoc::WordFunction::Body)
         .to receive(:inkscape_installed?)
-      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>
+      input = <<~INPUT
+            <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>
+      output = <<~OUTPUT
+         <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
+      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)
     end
   end
-  it "processes examples (Presentation XML)" do
-    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+  it "processes examples" do
+    input = <<~INPUT
           <iso-standard xmlns="http://riboseinc.com/isoxml">
           <preface><foreword>
           <example id="samplecode" keep-with-next="true" keep-lines-together="true">
@@ -945,6 +951,7 @@ RSpec.describe IsoDoc do
           </foreword></preface>
           </iso-standard>
     INPUT
+    presxml = <<~OUTPUT
           <?xml version='1.0'?>
       <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
         <preface>
@@ -960,22 +967,8 @@ RSpec.describe IsoDoc do
         </preface>
       </iso-standard>
     OUTPUT
-  end
-  it "processes examples (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>
-            <example id='samplecode' keep-with-next='true' keep-lines-together='true'>
-              <name>EXAMPLE&#xA0;&#x2014; Title</name>
-              <p>Hello</p>
-              <sourcecode id='X'><name>Sample</name></sourcecode>
-            </example>
-          </foreword>
-        </preface>
-      </iso-standard>
-    INPUT
+    html = <<~OUTPUT
       #{HTML_HDR}
                        <br/>
                        <div>
@@ -983,7 +976,12 @@ RSpec.describe IsoDoc do
                          <div id="samplecode" class="example" style="page-break-after: avoid;page-break-inside: avoid;">
                          <p class="example-title">EXAMPLE&#160;&#8212; Title</p>
                  <p>Hello</p>
-                 <pre id='X' class='prettyprint '/>
+                 <pre id='X' class='prettyprint '>
+          <br/>
+          &#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;
+          <br/>
+          &#160;&#160;&#160;&#160;&#160;&#160;&#160;
+             </pre>
           <p class='SourceTitle' style='text-align:center;'>Sample</p>
                          </div>
                        </div>
@@ -992,22 +990,7 @@ RSpec.describe IsoDoc do
                    </body>
                </html>
     OUTPUT
-  end
-  it "processes examples (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>
-            <example id='samplecode' keep-with-next='true' keep-lines-together='true'>
-              <name>EXAMPLE&#xA0;&#x2014; Title</name>
-              <p>Hello</p>
-              <sourcecode id='X'><name>Sample</name></sourcecode>
-            </example>
-          </foreword>
-        </preface>
-      </iso-standard>
-    INPUT
+    doc = <<~OUTPUT
           <html  xmlns:epub='http://www.idpf.org/2007/ops' lang='en'><head><style>
               </style>
         </head>
@@ -1027,7 +1010,12 @@ RSpec.describe IsoDoc do
               <div id='samplecode' class='example' style='page-break-after: avoid;page-break-inside: avoid;'>
                 <p class='example-title'>EXAMPLE&#160;&#8212; Title</p>
                 <p>Hello</p>
-                <p id='X' class='Sourcecode'/>
+                <p id='X' class='Sourcecode'>
+          <br/>
+          &#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;
+          <br/>
+          &#160;&#160;&#160;&#160;&#160;&#160;&#160;
+          </p>
                 <p class='SourceTitle' style='text-align:center;'>Sample</p>
               </div>
             </div>
@@ -1042,10 +1030,13 @@ RSpec.describe IsoDoc do
         </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(html)
+    expect(xmlpp(IsoDoc::WordConvert.new({}).convert("test", presxml, true))).to be_equivalent_to xmlpp(doc)
   end
   it "processes sequences of examples" do
-    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
           <iso-standard xmlns="http://riboseinc.com/isoxml">
           <preface><foreword>
           <example id="samplecode">
@@ -1061,6 +1052,7 @@ RSpec.describe IsoDoc do
           </foreword></preface>
           </iso-standard>
     INPUT
+    output = <<~OUTPUT
           <?xml version='1.0'?>
       <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
         <preface>
@@ -1081,10 +1073,11 @@ RSpec.describe IsoDoc do
         </preface>
       </iso-standard>
     OUTPUT
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", input, true))).to be_equivalent_to xmlpp(output)
   end
-  it "processes sourcecode (Presentation XML)" do
-    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+  it "processes sourcecode" do
+    input = <<~INPUT
           <iso-standard xmlns="http://riboseinc.com/isoxml">
           <preface><foreword>
           <sourcecode lang="ruby" id="samplecode">
@@ -1097,6 +1090,7 @@ RSpec.describe IsoDoc do
           </foreword></preface>
           </iso-standard>
     INPUT
+    presxml = <<~OUTPUT
           <?xml version='1.0'?>
       <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
         <preface>
@@ -1113,98 +1107,55 @@ RSpec.describe IsoDoc do
         </preface>
       </iso-standard>
     OUTPUT
-  end
-  it "processes sourcecode (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>
-            <sourcecode lang='ruby' id='samplecode'>
-              <name>
-                Figure 1&#xA0;&#x2014; Ruby
-                <em>code</em>
-              </name>
-        puts x
-      </sourcecode>
-            <sourcecode unnumbered='true'>
-      Que?
-      </sourcecode>
-          </foreword>
-        </preface>
-      </iso-standard>
-    INPUT
+    html = <<~OUTPUT
       #{HTML_HDR}
                          <br/>
                          <div>
                            <h1 class="ForewordTitle">Foreword</h1>
-                           <pre id="samplecode" class="prettyprint lang-rb"><br/>&#160;&#160;&#160;&#160;&#160;&#160;&#160; <br/>&#160; puts x<br/></pre>
+                           <pre id="samplecode" class="prettyprint lang-rb"><br/>&#160;&#160;&#160;&#160;&#160;&#160;&#160; <br/>&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160; puts x<br/>&#160;&#160;&#160;&#160;&#160;</pre>
                            <p class="SourceTitle" style="text-align:center;">Figure 1&#160;&#8212; Ruby <i>code</i></p>
-                           <pre class='prettyprint '>
-            <br/>
-            Que?
-            <br/>
-          </pre>
+                           <pre class='prettyprint '> Que? </pre>
                          </div>
                          <p class="zzSTDTitle1"/>
                        </div>
                      </body>
                  </html>
     OUTPUT
-  end
-  it "processes sourcecode (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>
-            <sourcecode lang='ruby' id='samplecode'>
-              <name>
-                Figure 1&#xA0;&#x2014; Ruby
-                <em>code</em>
-              </name>
-        puts x
-      </sourcecode>
-            <sourcecode unnumbered='true'>
-      Que?
-      </sourcecode>
-          </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>
-                       <p id="samplecode" class="Sourcecode"><br/>&#160;&#160;&#160;&#160;&#160;&#160;&#160; <br/>&#160; puts x<br/></p><p class="SourceTitle" style="text-align:center;">Figure 1&#160;&#8212; Ruby <i>code</i></p>
-                       <p class='Sourcecode'>
-        <br/>
-        Que?
-        <br/>
+    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>
+                      <p id="samplecode" class="Sourcecode"><br/>&#160;&#160;&#160;&#160;&#160;&#160;&#160; <br/>&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160; puts x<br/>&#160;&#160;&#160;&#160;&#160; </p><p class="SourceTitle" style="text-align:center;">Figure 1&#160;&#8212; Ruby <i>code</i></p>
+                      <p class='Sourcecode'> Que? </p>
+                    </div>
+                       <p>&#160;</p>
+      </div>
+      <p>
+        <br clear="all" class="section"/>
       </p>
-                     </div>
-                        <p>&#160;</p>
-       </div>
-       <p>
-         <br clear="all" class="section"/>
-       </p>
-       <div class="WordSection3">
-                     <p class="zzSTDTitle1"/>
-                   </div>
-                 </body>
-             </html>
+      <div class="WordSection3">
+                    <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(html)
+    expect(xmlpp(IsoDoc::WordConvert.new({}).convert("test", presxml, true))).to be_equivalent_to xmlpp(doc)
   end
   it "processes sourcecode with escapes preserved" do