isodoc 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 964f8f6c290c6f45bc7c21a4359426f86fe3237eeb993ec6a4145f323d21603d
-  data.tar.gz: 0bdf3ebd2dbb22e66a8eb5025916485da601d20c671eb36a825085318f4f0b97
+  metadata.gz: 79d66a49cb5bec7550c58e49fb9a278281d4f74ee4f49f92710ebeed8f2dab95
+  data.tar.gz: 2b7f2d96af993dc95c62b84f38f755c756eb060741428a8d76ab6ed2739dedfc
 SHA512:
-  metadata.gz: b5140c733c1d356934a84f645d3f44407208c20162ab5c71c62ed93adc5311f9364a051f460c1bef88896c195955b1b5a4d56fe8d5129a38343902365bf7961b
-  data.tar.gz: 4ea58c0144a66ef9a473f95711f67a35317f070140e20d564577d8c4c5ade4d421445cce46e1009b47d8d842647e6220762af670fb25c3838161b3defb0e8d51
+  metadata.gz: 3caa283c8fcda23c1d8203666ebe8c259491338b893343cf113de6ba2f05afe965ca774214ea97451b3542438b645c4dd74ec98b43584673f1ad8a11d4120614
+  data.tar.gz: '05924a7a7e0d532cc862718102c76f03a13f1cbf6e34fa4d9a3590da3553949a603df6d8db1a7a4aa736ec730055855686c12e48dd63a38b2b62312daa95bf68'

data/.github/workflows/macos.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Use Node
         uses: actions/setup-node@v1
         with:
-          node-version: '8'
+          node-version: '10'
       - name: Install Puppeteer
         run: |
           npm install -g puppeteer

data/.github/workflows/ubuntu.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Use Node
         uses: actions/setup-node@v1
         with:
-          node-version: '8'
+          node-version: '10'
       - name: Install Puppeteer
         run: |
           npm install -g puppeteer

data/.github/workflows/windows.yml

@@ -28,7 +28,7 @@ jobs:
       - name: Use Node
         uses: actions/setup-node@v1
         with:
-          node-version: '8'
+          node-version: '10'
       - name: Install Puppeteer
         run: |
           npm install -g puppeteer

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    isodoc (1.0.5)
+    isodoc (1.0.6)
       asciimath
-      html2doc (~> 0.8.11)
+      html2doc (~> 0.9.0)
       htmlentities (~> 4.3.4)
       liquid
       metanorma (~> 0.3.0)
@@ -18,7 +18,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     asciidoctor (2.0.10)
-    asciimath (1.0.8)
+    asciimath (1.0.9)
     ast (2.4.0)
     byebug (9.1.0)
     coderay (1.1.2)
@@ -42,8 +42,8 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    html2doc (0.8.14)
-      asciimath (~> 1.0.7)
+    html2doc (0.9.0)
+      asciimath (~> 1.0.9)
       htmlentities (~> 4.3.4)
       image_size
       mime-types

data/isodoc.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "nokogiri", ">= 1.10.4"
   spec.add_dependency "thread_safe"
   spec.add_dependency "uuidtools"
-  spec.add_dependency "html2doc", "~> 0.8.11"
+  spec.add_dependency "html2doc", "~> 0.9.0"
   spec.add_dependency "liquid"
   spec.add_dependency "roman-numerals"
   spec.add_dependency "sassc", "~> 2.2.1"

data/lib/isodoc/function/blocks.rb

@@ -139,8 +139,8 @@ module IsoDoc::Function
           parse(n, div) unless n.name == "name"
         end
         @sourcecode = false
-        sourcecode_name_parse(node, div, name) if name
       end
+      sourcecode_name_parse(node, out, name) if name
     end
 
     def pre_parse(node, out)

data/lib/isodoc/function/cleanup.rb

@@ -43,7 +43,7 @@ module IsoDoc::Function
     def figure_aside_process(f, aside, key)
       # get rid of footnote link, it is in diagram
       f&.at("./a[@class='TableFootnoteRef']")&.remove
-      fnref = f.at(".//a[@class='TableFootnoteRef']")
+      fnref = f.at(".//span[@class='TableFootnoteRef']/..")
       dt = key.add_child("<dt></dt>").first
       dd = key.add_child("<dd></dd>").first
       fnref.parent = dt
@@ -86,7 +86,7 @@ module IsoDoc::Function
     end
 
     def merge_fnref_into_fn_text(a)
-      fn = a.at('.//a[@class="TableFootnoteRef"]')
+      fn = a.at('.//span[@class="TableFootnoteRef"]/..')
       n = fn.next_element
       n&.children&.first&.add_previous_sibling(fn.remove)
     end

data/lib/isodoc/function/section.rb

@@ -48,7 +48,7 @@ module IsoDoc::Function
       div.h1 **attr_code(header_class) do |h1|
         if num && !@suppressheadingnumbers
           h1 << "#{num}#{clausedelim}"
-          insert_tab(h1, 1)
+          clausedelimspace(h1)
         end
         h1 << title
       end

data/lib/isodoc/function/xref_sect_gen.rb

@@ -102,7 +102,7 @@ module IsoDoc::Function
     def annex_names(clause, num)
       @anchors[clause["id"]] = { label: annex_name_lbl(clause, num), type: "clause",
                                  xref: "#{@annex_lbl} #{num}", level: 1 }
-      clause.xpath(ns("./clause | ./references")).each_with_index do |c, i|
+      clause.xpath(ns("./clause | ./references | ./term  | ./terms | ./definitions")).each_with_index do |c, i|
         annex_names1(c, "#{num}.#{i + 1}", 2)
       end
       hierarchical_asset_names(clause, num)
@@ -111,7 +111,7 @@ module IsoDoc::Function
     def annex_names1(clause, num, level)
       @anchors[clause["id"]] = { label: num, xref: "#{@annex_lbl} #{num}",
                                  level: level, type: "clause" }
-      clause.xpath(ns("./clause | ./references")).each_with_index do |c, i|
+      clause.xpath(ns("./clause | ./references | ./term  | ./terms | ./definitions")).each_with_index do |c, i|
         annex_names1(c, "#{num}.#{i + 1}", level + 1)
       end
     end

data/lib/isodoc/html_function/footnotes.rb

@@ -15,9 +15,11 @@ module IsoDoc::HtmlFunction
 
     def make_table_footnote_target(out, fnid, fnref)
       attrs = { id: fnid, class: "TableFootnoteRef" }
-      out.a **attrs do |a|
-        a << fnref
-        insert_tab(a, 1)
+      out.span do |s|
+        out.span **attrs do |a|
+          a << fnref
+        end
+        insert_tab(s, 1)
       end
     end
 

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "1.0.5".freeze
+  VERSION = "1.0.6".freeze
 end

data/lib/isodoc/word_function/body.rb

@@ -153,7 +153,7 @@ module IsoDoc::WordFunction
     def figure_aside_process(f, aside, key)
       # get rid of footnote link, it is in diagram
       f&.at("./a[@class='TableFootnoteRef']")&.remove
-      fnref = f.at(".//a[@class='TableFootnoteRef']")
+      fnref = f.at(".//span[@class='TableFootnoteRef']/..")
       tr = key.add_child("<tr></tr>").first
       dt = tr.add_child("<td valign='top' align='left'></td>").first
       dd = tr.add_child("<td valign='top'></td>").first

data/lib/isodoc/word_function/footnotes.rb

@@ -15,9 +15,11 @@ module IsoDoc::WordFunction
 
     def make_table_footnote_target(out, fnid, fnref)
       attrs = { id: fnid, class: "TableFootnoteRef" }
-      out.a **attrs do |a|
-        a << fnref
-        insert_tab(a, 1)
+      out.span do |s|
+        out.span **attrs do |a|
+          a << fnref
+        end
+        insert_tab(s, 1)
       end
     end
 

data/lib/isodoc/word_function/postprocess.rb

@@ -65,12 +65,14 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
     end
 
     def word_image_caption(docxml)
-      docxml.xpath("//p[@class = 'FigureTitle']").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>#{img.to_xml}</p>")
+          t.previous_element.swap("<p class=\'figure\'>#{img.to_xml}</p>")
         end
-        t.previous_element["style"] = t["style"].sub(/;?$/, ";page-break-after:avoid;")
+        t.previous_element["style"] = t.previous_element["style"] ?
+          t.previous_element["style"].sub(/;?$/, ";page-break-after:avoid;") :
+          "page-break-after:avoid;"
       end
     end
 

data/spec/isodoc/blocks_spec.rb

@@ -259,7 +259,7 @@ B</pre>
          <img src="rice_images/rice_image1.png" height="20" width="30" alt="alttext" title="titletxt"/>
          <img src="rice_images/rice_image1.png" height="20" width="auto"/>
          <img src="data:image/gif;base64,R0lGODlhEAAQAMQAAORHHOVSKudfOulrSOp3WOyDZu6QdvCchPGolfO0o/XBs/fNwfjZ0frl3/zy7////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAkAABAALAAAAAAQABAAAAVVICSOZGlCQAosJ6mu7fiyZeKqNKToQGDsM8hBADgUXoGAiqhSvp5QAnQKGIgUhwFUYLCVDFCrKUE1lBavAViFIDlTImbKC5Gm2hB0SlBCBMQiB0UjIQA7" height="20" width="auto"/>
-         <a href="#_" class="TableFootnoteRef">a</a><aside class="footnote"><div id="fn:_"><a id="_" class="TableFootnoteRef">a&#160; </a>
+         <a href="#_" class="TableFootnoteRef">a</a><aside class="footnote"><div id="fn:_"><span><span id="_" class="TableFootnoteRef">a</span>&#160; </span>
          <p id="_">The time <span class="stem">(#(t_90)#)</span> was estimated to be 18,2 min for this example.</p>
        </div></aside>
          <p><b>Key</b></p><dl><dt><p>A</p></dt><dd><p>B</p></dd></dl>
@@ -322,7 +322,7 @@ B</pre>
          <img src="rice_images/rice_image1.png" height="20" width="30" alt="alttext" title="titletext"/>
          <img src="rice_images/rice_image1.png"/>
          <img src="test_images/_.gif"/>
-         <a href="#_" class="TableFootnoteRef">a</a><aside><div id="ftn_"><a id="_" class="TableFootnoteRef">a<span style="mso-tab-count:1">&#160; </span></a>
+         <a href="#_" class="TableFootnoteRef">a</a><aside><div id="ftn_"><span><span id="_" class="TableFootnoteRef">a</span><span style="mso-tab-count:1">&#160; </span></span>
          <p id="_">The time <span class="stem">(#(t_90)#)</span> was estimated to be 18,2 min for this example.</p>
        </div></aside>
          <p><b>Key</b></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>B</p></td></tr></table>
@@ -463,7 +463,7 @@ B</pre>
              </p>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
-                 <p id="samplecode" class="Sourcecode"><br/>&#160;&#160;&#160; <br/>&#160; puts x<br/><p class="SourceTitle" style="text-align:center;">Ruby <i>code</i></p></p>
+                 <p id="samplecode" class="Sourcecode"><br/>&#160;&#160;&#160; <br/>&#160; puts x<br/></p><p class="SourceTitle" style="text-align:center;">Ruby <i>code</i></p>
                </div>
                   <p>&#160;</p>
  </div>

data/spec/isodoc/cleanup_spec.rb

@@ -31,7 +31,7 @@ RSpec.describe IsoDoc do
     <body>
       <div class="figure">
         <p>Warning</p>
-        <a href="#tableD-1a" class="TableFootnoteRef">a</a><aside><div id="ftntableD-1a"><a id="tableD-1a" class="TableFootnoteRef">a<span style="mso-tab-count:1">&#160; </span></a>
+        <a href="#tableD-1a" class="TableFootnoteRef">a</a><aside><div id="ftntableD-1a"><span><span id="tableD-1a" class="TableFootnoteRef">a</span>&#160; </span>
          <p id="_0fe65e9a-5531-408e-8295-eeff35f41a55">Parboiled rice.</p>
        </div></aside>
       </div>
@@ -46,7 +46,7 @@ RSpec.describe IsoDoc do
            <aside><div id="ftntableD-1a">
 
           </div></aside>
-         <p><b/></p><dl><dt><a id="tableD-1a" class="TableFootnoteRef">a<span style="mso-tab-count:1">&#xA0; </span></a></dt><dd><p id="_0fe65e9a-5531-408e-8295-eeff35f41a55">Parboiled rice.</p></dd></dl></div>
+         <p><b/></p><dl><dt><span><span id="tableD-1a" class="TableFootnoteRef">a</span>&#xA0; </span></dt><dd><p id="_0fe65e9a-5531-408e-8295-eeff35f41a55">Parboiled rice.</p></dd></dl></div>
        </body>
        </html>
     OUTPUT
@@ -58,7 +58,7 @@ RSpec.describe IsoDoc do
     <body>
       <div class="figure">
         <p>Warning</p>
-        <a href="#tableD-1a" class="TableFootnoteRef">a</a><aside><div id="ftntableD-1a"><a id="tableD-1a" class="TableFootnoteRef">a<span style="mso-tab-count:1">&#160; </span></a>
+        <a href="#tableD-1a" class="TableFootnoteRef">a</a><aside><div id="ftntableD-1a"><span><span id="tableD-1a" class="TableFootnoteRef">a</span><span style="mso-tab-count:1">&#160; </span></span>
          <p id="_0fe65e9a-5531-408e-8295-eeff35f41a55">Parboiled rice.</p>
        </div></aside>
       </div>
@@ -73,7 +73,7 @@ RSpec.describe IsoDoc do
            <aside><div id="ftntableD-1a">
 
           </div></aside>
-          <p><b/></p><table class="dl"><tr><td valign="top" align="left"><a id="tableD-1a" class="TableFootnoteRef">a<span style="mso-tab-count:1">&#xA0; </span></a></td><td valign="top"><p id="_0fe65e9a-5531-408e-8295-eeff35f41a55">Parboiled rice.</p></td></tr></table></div>
+          <p><b/></p><table class="dl"><tr><td valign="top" align="left"><span><span id="tableD-1a" class="TableFootnoteRef">a</span><span style="mso-tab-count:1">&#xA0; </span></span></td><td valign="top"><p id="_0fe65e9a-5531-408e-8295-eeff35f41a55">Parboiled rice.</p></td></tr></table></div>
        </body>
        </html>
     OUTPUT
@@ -150,71 +150,115 @@ RSpec.describe IsoDoc do
 
   it "cleans up footnotes" do
     expect(IsoDoc::HtmlConvert.new({}).cleanup(Nokogiri::XML(<<~"INPUT")).to_s).to be_equivalent_to <<~"OUTPUT"
-              <html xmlns:epub="http://www.idpf.org/2007/ops">
-         <head>
-           <title>test</title>
-           <body lang="EN-US" link="blue" vlink="#954F72">
-             <div class="WordSection1">
-               <p>&#160;</p>
-             </div>
-             <br clear="all" class="section"/>
-             <div class="WordSection2">
-               <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+    #{HTML_HDR}
+    <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
-                 <p>A.<a href="#ftn2" epub:type="footnote"><sup>2</sup></a></p>
-                 <p>B.<a href="#ftn2" epub:type="footnote"><sup>2</sup></a></p>
-                 <p>C.<a href="#ftn1" epub:type="footnote"><sup>1</sup></a></p>
+                <p>A.<a rel="footnote" href="#fn:2" epub:type="footnote"><sup>2</sup></a></p>
+                <p>B.<a rel="footnote" href="#fn:2" epub:type="footnote"><sup>2</sup></a></p>
+                <p>C.<a rel="footnote" href="#fn:1" epub:type="footnote"><sup>1</sup></a></p>
                </div>
-               <p>&#160;</p>
-             </div>
-             <br clear="all" class="section"/>
-             <div class="WordSection3">
                <p class="zzSTDTitle1"/>
-               <aside id="ftn2">
-         <p id="_1e228e29-baef-4f38-b048-b05a051747e4">Formerly denoted as 15 % (m/m).</p>
-       </aside>
-               <aside id="ftn1">
-         <p id="_1e228e29-baef-4f38-b048-b05a051747e4">Hello! denoted as 15 % (m/m).</p>
-       </aside>
+                             <aside id="fn:2" class="footnote">
+          <p id="_1e228e29-baef-4f38-b048-b05a051747e4">Formerly denoted as 15 % (m/m).</p>
+        </aside>
+              <aside id="fn:1" class="footnote">
+          <p id="_1e228e29-baef-4f38-b048-b05a051747e4">Hello! denoted as 15 % (m/m).</p>
+        </aside>
              </div>
            </body>
-         </head>
        </html>
        INPUT
-             <?xml version="1.0"?>
-       <html xmlns:epub="http://www.idpf.org/2007/ops">
-         <head>
-           <title>test</title>
+       #{HTML_HDR}
+       <br/>
+                  <div>
+                    <h1 class="ForewordTitle">Foreword</h1>
+                   <p>A.<a rel="footnote" href="#fn:2" epub:type="footnote"><sup>1</sup></a></p>
+                   <p>B.<a rel="footnote" href="#fn:2" epub:type="footnote"><sup>2</sup></a></p>
+                   <p>C.<a rel="footnote" href="#fn:1" epub:type="footnote"><sup>3</sup></a></p>
+                  </div>
+                  <p class="zzSTDTitle1"/>
+                                <aside id="fn:2" class="footnote">
+             <p id="_1e228e29-baef-4f38-b048-b05a051747e4">Formerly denoted as 15 % (m/m).</p>
+           </aside>
+                 <aside id="fn:1" class="footnote">
+             <p id="_1e228e29-baef-4f38-b048-b05a051747e4">Hello! denoted as 15 % (m/m).</p>
+           </aside>
+                </div>
+              </body>
+          </html>
+    OUTPUT
+  end
+
+    it "cleans up footnotes (Word)" do
+    expect(IsoDoc::WordConvert.new({}).cleanup(Nokogiri::XML(<<~"INPUT")).to_s).to be_equivalent_to <<~"OUTPUT"
+     <html xmlns:epub="http://www.idpf.org/2007/ops" lang="en">
+         <head/>
            <body lang="EN-US" link="blue" vlink="#954F72">
              <div class="WordSection1">
-               <p>&#xA0;</p>
+               <p>&#160;</p>
              </div>
-             <br clear="all" class="section"/>
+             <p><br clear="all" class="section"/></p>
              <div class="WordSection2">
-               <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+               <p><br clear="all" style="mso-special-character:line-break;page-break-before:always"/></p>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
-                 <p>A.<a href="#ftn2" epub:type="footnote"><sup>1</sup></a></p>
+                 <p>A.<a href="#ftn1" epub:type="footnote"><sup>1</sup></a></p>
                  <p>B.<a href="#ftn2" epub:type="footnote"><sup>2</sup></a></p>
-                 <p>C.<a href="#ftn1" epub:type="footnote"><sup>3</sup></a></p>
+                 <p>C.<a href="#ftn3" epub:type="footnote"><sup>3</sup></a></p>
                </div>
-               <p>&#xA0;</p>
+               <p>&#160;</p>
              </div>
-             <br clear="all" class="section"/>
+             <p><br clear="all" class="section"/></p>
              <div class="WordSection3">
                <p class="zzSTDTitle1"/>
+               <aside id="ftn1">
+         <p id="_1e228e29-baef-4f38-b048-b05a051747e4">Formerly denoted as 15 % (m/m).</p>
+       </aside>
                <aside id="ftn2">
          <p id="_1e228e29-baef-4f38-b048-b05a051747e4">Formerly denoted as 15 % (m/m).</p>
        </aside>
-               <aside id="ftn1">
+               <aside id="ftn3">
          <p id="_1e228e29-baef-4f38-b048-b05a051747e4">Hello! denoted as 15 % (m/m).</p>
        </aside>
              </div>
            </body>
-         </head>
        </html>
-    OUTPUT
+   INPUT
+   <?xml version="1.0"?>
+       <html xmlns:epub="http://www.idpf.org/2007/ops" lang="en">
+           <head/>
+             <body lang="EN-US" link="blue" vlink="#954F72">
+               <div class="WordSection1">
+                 <p>&#xA0;</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>A.<a href="#ftn1" epub:type="footnote"><sup>1</sup></a></p>
+                   <p>B.<a href="#ftn2" epub:type="footnote"><sup>2</sup></a></p>
+                   <p>C.<a href="#ftn3" epub:type="footnote"><sup>3</sup></a></p>
+                 </div>
+                 <p>&#xA0;</p>
+               </div>
+               <p><br clear="all" class="section"/></p>
+               <div class="WordSection3">
+                 <p class="zzSTDTitle1"/>
+                 <aside id="ftn1">
+           <p id="_1e228e29-baef-4f38-b048-b05a051747e4">Formerly denoted as 15 % (m/m).</p>
+         </aside>
+                 <aside id="ftn2">
+           <p id="_1e228e29-baef-4f38-b048-b05a051747e4">Formerly denoted as 15 % (m/m).</p>
+         </aside>
+                 <aside id="ftn3">
+           <p id="_1e228e29-baef-4f38-b048-b05a051747e4">Hello! denoted as 15 % (m/m).</p>
+         </aside>
+               </div>
+             </body>
+         </html>
+   OUTPUT
   end
 
   it "cleans up tables with tfoot" do
@@ -242,7 +286,7 @@ RSpec.describe IsoDoc do
                      </tr>
                      <tr>
                        <td align="left" style="border-top:none;border-bottom:solid windowtext 1.5pt;">Arborio</td>
-                       <td align="center" style="border-top:none;border-bottom:solid windowtext 1.5pt;">Drago<a href="#tableD-1a" class="TableFootnoteRef">a</a><aside><div id="ftntableD-1a"><a id="tableD-1a" class="TableFootnoteRef">a<span style="mso-tab-count:1">&#160; </span></a>
+                       <td align="center" style="border-top:none;border-bottom:solid windowtext 1.5pt;">Drago<a href="#tableD-1a" class="TableFootnoteRef">a</a><aside><div id="ftntableD-1a"><span><span id="tableD-1a" class="TableFootnoteRef">a</span>&#160; </span>
          <p id="_0fe65e9a-5531-408e-8295-eeff35f41a55">Parboiled rice.</p>
        </div></aside></td>
        <td align="center" style="border-top:none;border-bottom:solid windowtext 1.5pt;">Balilla<a href="#tableD-1a" class="TableFootnoteRef">a</a></td>
@@ -351,7 +395,7 @@ INPUT
                     <tr><td colspan="5" style="border-top:0pt;border-bottom:solid windowtext 1.5pt;"><div id="" class="Note">
                       <p class="Note">NOTE<span style="mso-tab-count:1">&#xA0; </span>This is a table about rice</p>
                     </div><div class="TableFootnote"><div id="ftntableD-1a">
-          <p id="_0fe65e9a-5531-408e-8295-eeff35f41a55" class="TableFootnote"><a id="tableD-1a" class="TableFootnoteRef">a<span style="mso-tab-count:1">&#xA0; </span></a>Parboiled rice.</p>
+          <p id="_0fe65e9a-5531-408e-8295-eeff35f41a55" class="TableFootnote"><span><span id="tableD-1a" class="TableFootnoteRef">a</span>&#xA0; </span>Parboiled rice.</p>
         </div></div></td></tr></tfoot>
                     <dl>
                       <dt>
@@ -399,7 +443,7 @@ INPUT
                      </tr>
                      <tr>
                        <td align="left" style="border-top:none;border-bottom:solid windowtext 1.5pt;">Arborio</td>
-                       <td align="center" style="border-top:none;border-bottom:solid windowtext 1.5pt;">Drago<a href="#tableD-1a" class="TableFootnoteRef">a</a><aside><div id="ftntableD-1a"><a id="tableD-1a" class="TableFootnoteRef">a<span style="mso-tab-count:1">&#160; </span></a>
+                       <td align="center" style="border-top:none;border-bottom:solid windowtext 1.5pt;">Drago<a href="#tableD-1a" class="TableFootnoteRef">a</a><aside><div id="ftntableD-1a"><span><span id="tableD-1a" class="TableFootnoteRef">a</span><span style="mso-tab-count:1">&#160; </span></span>
          <p id="_0fe65e9a-5531-408e-8295-eeff35f41a55">Parboiled rice.</p>
        </div></aside></td>
        <td align="center" style="border-top:none;border-bottom:solid windowtext 1.5pt;">Balilla<a href="#tableD-1a" class="TableFootnoteRef">a</a></td>
@@ -508,7 +552,7 @@ INPUT
                     <tr><td colspan="5" style="border-top:0pt;mso-border-top-alt:0pt;border-bottom:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;"><div id="" class="Note">
                       <p class="Note">NOTE<span style="mso-tab-count:1">&#xA0; </span>This is a table about rice</p>
                     </div><div class="TableFootnote"><div id="ftntableD-1a">
-          <p id="_0fe65e9a-5531-408e-8295-eeff35f41a55" class="TableFootnote"><a id="tableD-1a" class="TableFootnoteRef">a<span style="mso-tab-count:1">&#xA0; </span></a>Parboiled rice.</p>
+          <p id="_0fe65e9a-5531-408e-8295-eeff35f41a55" class="TableFootnote"><span><span id="tableD-1a" class="TableFootnoteRef">a</span><span style="mso-tab-count:1">&#xA0; </span></span>Parboiled rice.</p>
         </div></div></td></tr></tfoot>
                     <dl>
                       <dt>
@@ -557,7 +601,7 @@ INPUT
                      </tr>
                      <tr>
                        <td align="left" style="border-top:none;border-bottom:solid windowtext 1.5pt;">Arborio</td>
-                       <td align="center" style="border-top:none;border-bottom:solid windowtext 1.5pt;">Drago<a href="#tableD-1a" class="TableFootnoteRef">a</a><aside><div id="ftntableD-1a"><a id="tableD-1a" class="TableFootnoteRef">a<span style="mso-tab-count:1">&#160; </span></a>
+                       <td align="center" style="border-top:none;border-bottom:solid windowtext 1.5pt;">Drago<a href="#tableD-1a" class="TableFootnoteRef">a</a><aside><div id="ftntableD-1a"><span><span id="tableD-1a" class="TableFootnoteRef">a</span>&#160; </span>
          <p id="_0fe65e9a-5531-408e-8295-eeff35f41a55">Parboiled rice.</p>
        </div></aside></td>
        <td align="center" style="border-top:none;border-bottom:solid windowtext 1.5pt;">Balilla<a href="#tableD-1a" class="TableFootnoteRef">a</a></td>
@@ -656,7 +700,7 @@ INPUT
                  <tfoot><tr><td colspan="5" style="border-top:0pt;border-bottom:solid windowtext 1.5pt;"><div id="" class="Note">
                      <p class="Note">NOTE<span style="mso-tab-count:1">&#xA0; </span>This is a table about rice</p>
                    </div><div class="TableFootnote"><div id="ftntableD-1a">
-         <p id="_0fe65e9a-5531-408e-8295-eeff35f41a55" class="TableFootnote"><a id="tableD-1a" class="TableFootnoteRef">a<span style="mso-tab-count:1">&#xA0; </span></a>Parboiled rice.</p>
+         <p id="_0fe65e9a-5531-408e-8295-eeff35f41a55" class="TableFootnote"><span><span id="tableD-1a" class="TableFootnoteRef">a</span>&#xA0; </span>Parboiled rice.</p>
        </div></div></td></tr></tfoot></table>
                </div>
                <p>&#xA0;</p>

data/spec/isodoc/postproc_spec.rb

@@ -853,7 +853,7 @@ TOCLEVEL
       </p>
       <div>
         <h1 class="ForewordTitle">Foreword</h1>
-        <p class="Sourcecode"><a name="samplecode" id="samplecode"></a><br/>&#xA0;&#xA0;&#xA0; <br/>&#xA0; &lt;xml&gt; &amp;<br/><p class="SourceTitle" style="text-align:center;">XML code</p></p>
+        <p class="Sourcecode" style="page-break-after:avoid;"><a name="samplecode" id="samplecode"></a><br/>&#xA0;&#xA0;&#xA0; <br/>&#xA0; &lt;xml&gt; &amp;<br/></p><p class="SourceTitle" style="text-align:center;">XML code</p>
       </div>
       <p class="MsoNormal">&#xA0;</p>
     </div>
@@ -916,7 +916,7 @@ FileUtils.rm_f "test.doc"
                <h1 class="ForewordTitle">Foreword</h1>
                <div class="figure"><a name="fig1" id="fig1"></a>
 
-         <p style="text-align:center;page-break-after:avoid;" class="MsoNormal"><img src="_" width="400" height="337"/></p>
+         <p style="page-break-after:avoid;" class="figure"><img src="_" width="400" height="337"/></p>
          <p class="FigureTitle" style="text-align:center;">Figure 1&#xA0;&#x2014; Typical arrangement of the far-field scan set-up</p></div>
              </div>
              <p class="MsoNormal">&#xA0;</p>

data/spec/isodoc/table_spec.rb

@@ -79,7 +79,7 @@ RSpec.describe IsoDoc do
                    </tr>
                    <tr>
                      <td style="text-align:left;border-top:none;border-bottom:solid windowtext 1.5pt;padding:0;" scope="col">Arborio</td>
-                     <td style="text-align:center;border-top:none;border-bottom:solid windowtext 1.5pt;padding:0;" scope="col">Drago<a href="#tableD-1a" class="TableFootnoteRef">a</a><aside class="footnote"><div id="fn:tableD-1a"><a id="tableD-1a" class="TableFootnoteRef">a&#160; </a>
+                     <td style="text-align:center;border-top:none;border-bottom:solid windowtext 1.5pt;padding:0;" scope="col">Drago<a href="#tableD-1a" class="TableFootnoteRef">a</a><aside class="footnote"><div id="fn:tableD-1a"><span><span id="tableD-1a" class="TableFootnoteRef">a</span>&#160; </span>
          <p id="_0fe65e9a-5531-408e-8295-eeff35f41a55">Parboiled rice.</p>
        </div></aside></td>
                      <td style="text-align:center;border-top:none;border-bottom:solid windowtext 1.5pt;padding:0;" scope="col">Balilla<a href="#tableD-1a" class="TableFootnoteRef">a</a></td>
@@ -229,7 +229,7 @@ RSpec.describe IsoDoc do
                      </tr>
                      <tr>
                        <td align="left" style="border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;">Arborio</td>
-                       <td align="center" style="border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;">Drago<a href="#tableD-1a" class="TableFootnoteRef">a</a><aside><div id="ftntableD-1a"><a id="tableD-1a" class="TableFootnoteRef">a<span style="mso-tab-count:1">&#160; </span></a>
+                       <td align="center" style="border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;">Drago<a href="#tableD-1a" class="TableFootnoteRef">a</a><aside><div id="ftntableD-1a"><span><span id="tableD-1a" class="TableFootnoteRef">a</span><span style="mso-tab-count:1">&#160; </span></span>
          <p id="_0fe65e9a-5531-408e-8295-eeff35f41a55">Parboiled rice.</p>
        </div></aside></td>
                        <td align="center" style="border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;">Balilla<a href="#tableD-1a" class="TableFootnoteRef">a</a></td>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-20 00:00:00.000000000 Z
+date: 2019-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.11
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.11
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: liquid
   requirement: !ruby/object:Gem::Requirement