isodoc 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 271b0b210ccc7da3e9b0a09cf49fb248ff4708fd4f92adfb5529683db655fe63
-  data.tar.gz: 4345484709eba0f0ac06dc772fd62455c0f601c2f36c57b0ae1d8fdade47dbdd
+  metadata.gz: d6ad84f6e1f4b2fecf5c4590753f75c868580b8472b91a0c31310a7b0b9d8026
+  data.tar.gz: dedfd107403cfb17fd117bc6e30c2604b2fe2dcfdec40e6d70a3265edb2cf43a
 SHA512:
-  metadata.gz: 80a4d6a127130129671f6553283d7a09b2afb8f69756435cc5e20381309a92b5edd055eda730b10cf025fa6bb5169db65e38cff64cdfbf9d0dc20de415fe1f20
-  data.tar.gz: b90a49e79bf3b1d03c15adfcaed42b2e64293ab161b6e585448487db29e40129f8994da57d8429130c54bc66dc73640f5ca929d285c7d3528e44b341150ca2b5
+  metadata.gz: f2198c67222766d9f78c23357dd836c005196ef18774f2e3886d32016466489b1370c12d210d0397cb2e61a0dd9d7fe38ab7421181eff43ee03eda40839c38fd
+  data.tar.gz: 9b24ca85c9da14e7dcf255df3f9e84cb63788c9b66beea94bd7a2c4d52631c8747547b0f347640dcdd6985b1bbc1474835a249dd9281d5f763892d85945f8a02

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    isodoc (0.9.1)
+    isodoc (0.9.3)
       asciimath
       html2doc (~> 0.8.1)
       htmlentities (~> 4.3.4)
@@ -17,7 +17,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    asciimath (1.0.5)
+    asciimath (1.0.6)
     ast (2.4.0)
     byebug (9.1.0)
     coderay (1.1.2)
@@ -41,7 +41,7 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    html2doc (0.8.3)
+    html2doc (0.8.5)
       asciimath
       htmlentities (~> 4.3.4)
       image_size
@@ -67,7 +67,7 @@ GEM
     mime-types-data (3.2018.0812)
     mini_portile2 (2.3.0)
     nenv (0.3.0)
-    nokogiri (1.8.4)
+    nokogiri (1.8.5)
       mini_portile2 (~> 2.3.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
@@ -98,7 +98,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
-    rubocop (0.59.1)
+    rubocop (0.59.2)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
@@ -109,7 +109,7 @@ GEM
     ruby-progressbar (1.10.0)
     ruby-xslt (0.9.10)
     ruby_dep (1.5.0)
-    sass (3.5.7)
+    sass (3.6.0)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)

data/lib/isodoc/convert.rb

@@ -1,5 +1,6 @@
 require "isodoc/common"
 require "sassc"
+require "fileutils"
 
 module IsoDoc
   class Convert < ::IsoDoc::Common
@@ -148,7 +149,7 @@ module IsoDoc
       result = convert1(docxml, filename, dir)
       return result if debug
       postprocess(result, filename, dir)
-      system "rm -fr #{dir}"
+      FileUtils.rm_rf dir
     end
   end
 end

data/lib/isodoc/function/blocks.rb

@@ -151,6 +151,10 @@ module IsoDoc::Function
         div << "(#{get_anchors[node['id']][:label]})"
       end
       formula_where(node.at(ns("./dl")), out)
+      node.children.each do |n|
+        next if %w(stem dl).include? n.name
+        parse(n, out)
+      end
     end
 
     def para_attrs(node)

data/lib/isodoc/function/to_word_html.rb

@@ -1,3 +1,5 @@
+require "fileutils"
+
 module IsoDoc::Function
   module ToWordHtml
 
@@ -18,7 +20,7 @@ module IsoDoc::Function
       dir = "#{filename}_files"
       unless debug
         Dir.mkdir(dir) unless File.exists?(dir)
-        system "rm -r #{dir}/*"
+        FileUtils.rm_rf "#{dir}/*"
       end
       @filename = filename
       [filename, dir]

data/lib/isodoc/headlesshtml_convert.rb

@@ -1,6 +1,7 @@
 require_relative "html_function/comments.rb"
 require_relative "html_function/footnotes.rb"
 require_relative "html_function/html.rb"
+require "fileutils"
 
 module IsoDoc
   class HeadlessHtmlConvert < ::IsoDoc::Convert
@@ -21,9 +22,9 @@ module IsoDoc
       result = convert1(docxml, outname_html, dir)
       return result if debug
       postprocess(result, filename + ".tmp", dir)
-      system "rm -fr #{dir}"
+      FileUtils.rm_rf dir
       strip_head(filename + ".tmp.html", outname_html + ".headless.html")
-      system "rm -r #{filename + '.tmp.html'} #{tmpimagedir}"
+      FileUtils.rm_r ["#{filename}.tmp.html", tmpimagedir]
     end
 
     def strip_head(input, output)

data/lib/isodoc/html_function/html.rb

@@ -31,7 +31,7 @@ module IsoDoc::HtmlFunction
     def postprocess(result, filename, dir)
       result = from_xhtml(cleanup(to_xhtml(result)))
       toHTML(result, filename)
-      @files_to_delete.each { |f| system "rm -r #{f}" }
+      @files_to_delete.each { |f| FileUtils.rm_r f }
     end
 
     def script_cdata(result)
@@ -193,7 +193,8 @@ module IsoDoc::HtmlFunction
 
     # presupposes that the image source is local
     def move_images(docxml)
-      system "rm -r #{tmpimagedir}; mkdir #{tmpimagedir}"
+      FileUtils.rm_rf tmpimagedir
+      FileUtils.mkdir tmpimagedir
       docxml.xpath("//*[local-name() = 'img']").each do |i|
         next if /^data:image/.match i["src"]
         @datauriimage ? datauri(i) : move_image1(i)

data/lib/isodoc/pdf_convert.rb

@@ -26,9 +26,9 @@ module IsoDoc
       result = convert1(docxml, filename, dir)
       return result if debug
       postprocess(result, filename, dir)
-      system "rm -fr #{dir}"
+      FileUtils.rm_rf dir
       ::Metanorma::Output::Pdf.new.convert(filename + ".html", outname_html + ".pdf")
-      system "rm -r #{filename + '.html'} #{tmpimagedir}"
+      FileUtils.rm_r ["#{filename}.html", tmpimagedir]
     end
   end
 end

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "0.9.2".freeze
+  VERSION = "0.9.3".freeze
 end

data/lib/isodoc/word_function/body.rb

@@ -117,7 +117,7 @@ module IsoDoc::WordFunction
     def dl_parse_notes(node, v)
       return if node.elements.reject { |n| dt_dd? n }.empty?
       v.tr do |tr|
-        tr.td **{ rowspan: 2 } do |td|
+        tr.td **{ colspan: 2 } do |td|
           node.elements.reject { |n| dt_dd? n }.each { |n| parse(n, td) }
         end
       end

data/lib/isodoc/word_function/postprocess.rb

@@ -1,3 +1,5 @@
+require "fileutils"
+
 module IsoDoc::WordFunction
   module Postprocess
     def table_note_cleanup(docxml)
@@ -13,7 +15,7 @@ module IsoDoc::WordFunction
       header = generate_header(filename, dir)
       result = from_xhtml(cleanup(to_xhtml(result)))
       toWord(result, filename, dir, header)
-      @files_to_delete.each { |f| system "rm #{f}" }
+      @files_to_delete.each { |f| FileUtils.rm f }
     end
 
     def toWord(result, filename, dir, header)
@@ -28,9 +30,21 @@ module IsoDoc::WordFunction
     def word_cleanup(docxml)
       word_preface(docxml)
       word_annex_cleanup(docxml)
+      word_table_separator(docxml)
       docxml
     end
 
+           EMPTY_PARA = "<p style='margin-top:0cm;margin-right:0cm;"\
+      "margin-bottom:0cm;margin-left:0.0pt;margin-bottom:.0001pt'>"\
+      "<span lang=EN-GB style='display:none;mso-hide:all'>&nbsp;</span></p>"
+
+    def word_table_separator(docxml)
+      docxml.xpath("//table").each do |t|
+        next unless t&.next_element&.name == "table"
+        t.add_next_sibling(EMPTY_PARA)
+      end
+    end
+
     # force Annex h2 to be p.h2Annex, so it is not picked up by ToC
     def word_annex_cleanup(docxml)
       docxml.xpath("//h2[ancestor::*[@class = 'Section3']]").each do |h2|

data/spec/isodoc/blocks_spec.rb

@@ -503,7 +503,11 @@ INPUT
   <dd>
     <p id="_1b99995d-ff03-40f5-8f2e-ab9665a69b77">is the repeatability limit.</p>
   </dd>
-</dl></formula>
+</dl>
+    <note id="_83083c7a-6c85-43db-a9fa-4d8edd0c9fc0">
+  <p id="_511aaa98-4116-42af-8e5b-c87cdf5bfdc8">[durationUnits] is essentially a duration statement without the "P" prefix. "P" is unnecessary because between "G" and "U" duration is always expressed.</p>
+</note>
+    </formula>
     </foreword></preface>
     </iso-standard>
     INPUT
@@ -511,17 +515,16 @@ INPUT
                <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
-                 <div id="_be9158af-7e93-4ee2-90c5-26d31c181934" class="formula"><span class="stem">(#(r = 1 %)#)</span>&#160; (1)</div>
-                 <p>where</p>
-                 <dl id="_e4fe94fe-1cde-49d9-b1ad-743293b7e21d">
-                   <dt>
+                 <div id="_be9158af-7e93-4ee2-90c5-26d31c181934" class="formula"><span class="stem">(#(r = 1 %)#)</span>&#160; (1)</div><p>where</p><dl id="_e4fe94fe-1cde-49d9-b1ad-743293b7e21d"><dt>
            <span class="stem">(#(r)#)</span>
-         </dt>
-                   <dd>
+         </dt><dd>
            <p id="_1b99995d-ff03-40f5-8f2e-ab9665a69b77">is the repeatability limit.</p>
-         </dd>
-                 </dl>
-               </div>
+         </dd></dl>
+
+
+           <div id="_83083c7a-6c85-43db-a9fa-4d8edd0c9fc0" class="Note"><p><span class="note_label">NOTE</span>&#160; [durationUnits] is essentially a duration statement without the "P" prefix. "P" is unnecessary because between "G" and "U" duration is always expressed.</p></div>
+           </div>
+
                <p class="zzSTDTitle1"/>
              </div>
            </body>

data/spec/isodoc/footnotes_spec.rb

@@ -1,4 +1,5 @@
 require "spec_helper"
+require "fileutils"
 
 RSpec.describe IsoDoc do
   it "processes IsoXML footnotes" do
@@ -91,7 +92,7 @@ RSpec.describe IsoDoc do
   end
 
   it "processes IsoXML reviewer notes" do
-    system "rm -f test.html"
+    FileUtils.rm_f "test.html"
     IsoDoc::HtmlConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("test", <<~"INPUT", false)
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface>
@@ -186,7 +187,7 @@ RSpec.describe IsoDoc do
   end
 
   it "processes IsoXML reviewer notes (Word)" do
-    system "rm -f test.doc"
+    FileUtils.rm_f "test.doc"
     IsoDoc::WordConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("test", <<~"INPUT", false)
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface>

data/spec/isodoc/lists_spec.rb

@@ -226,7 +226,7 @@ RSpec.describe IsoDoc do
                       </td>
                     </tr>
                     <tr>
-                     <td rowspan="2">
+                     <td colspan="2">
                        <div id="" class="Note">
                          <p class="Note"><span class="note_label">NOTE</span><span style="mso-tab-count:1">&#160; </span>This is a note</p>
                        </div>

data/spec/isodoc/postproc_spec.rb

@@ -1,9 +1,10 @@
 require "spec_helper"
+require "fileutils"
 
 RSpec.describe IsoDoc do
   it "generates file based on string input" do
-    system "rm -f test.doc"
-    system "rm -f test.html"
+    FileUtils.rm_f "test.doc"
+    FileUtils.rm_f "test.html"
     IsoDoc::HtmlConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css", filename: "test"}).convert("test", <<~"INPUT", false)
         <iso-standard xmlns="http://riboseinc.com/isoxml">
         <bibdata>
@@ -25,8 +26,8 @@ RSpec.describe IsoDoc do
   end
 
   it "generates HTML output docs with null configuration" do
-    system "rm -f test.doc"
-    system "rm -f test.html"
+    FileUtils.rm_f "test.doc"
+    FileUtils.rm_f "test.html"
     IsoDoc::HtmlConvert.new({wordstylesheet: "spec/assets/word.css"}).convert("test", <<~"INPUT", false)
         <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
@@ -45,8 +46,8 @@ RSpec.describe IsoDoc do
   end
 
   it "generates Word output docs with null configuration" do
-    system "rm -f test.doc"
-    system "rm -f test.html"
+    FileUtils.rm_f "test.doc"
+    FileUtils.rm_f "test.html"
     IsoDoc::WordConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("test", <<~"INPUT", false)
         <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
@@ -62,8 +63,8 @@ RSpec.describe IsoDoc do
   end
 
   it "generates HTML output docs with null configuration from file" do
-    system "rm -f spec/assets/iso.doc"
-    system "rm -f spec/assets/iso.html"
+    FileUtils.rm_f "spec/assets/iso.doc"
+    FileUtils.rm_f "spec/assets/iso.html"
     IsoDoc::HtmlConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("spec/assets/iso.xml", nil, false)
     expect(File.exist?("spec/assets/iso.html")).to be true
     html = File.read("spec/assets/iso.html")
@@ -72,8 +73,8 @@ RSpec.describe IsoDoc do
     expect(html).to match(%r{libs/jquery})
   end
 
-    it "generates Headless HTML output docs with null configuration from file" do
-    system "rm -f spec/assets/iso.html"
+  it "generates Headless HTML output docs with null configuration from file" do
+    FileUtils.rm_f "spec/assets/iso.html"
     IsoDoc::HeadlessHtmlConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("spec/assets/iso.xml", nil, false)
     expect(File.exist?("spec/assets/iso.headless.html")).to be true
     html = File.read("spec/assets/iso.headless.html")
@@ -87,7 +88,7 @@ RSpec.describe IsoDoc do
   end
 
   it "generates Word output docs with null configuration from file" do
-    system "rm -f spec/assets/iso.doc"
+    FileUtils.rm_f "spec/assets/iso.doc"
     IsoDoc::WordConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("spec/assets/iso.xml", nil, false)
     expect(File.exist?("spec/assets/iso.doc")).to be true
     word = File.read("spec/assets/iso.doc")
@@ -95,15 +96,14 @@ RSpec.describe IsoDoc do
   end
 
   it "generates PDF output docs with null configuration from file" do
-    system "rm -f spec/assets/iso.pdf"
-    #require "byebug"; byebug
+    FileUtils.rm_f "spec/assets/iso.pdf"
     IsoDoc::PdfConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("spec/assets/iso.xml", nil, false)
     expect(File.exist?("spec/assets/iso.pdf")).to be true
   end
 
   it "generates HTML output docs with complete configuration" do
-    system "rm -f test.doc"
-    system "rm -f test.html"
+    FileUtils.rm_f "test.doc"
+    FileUtils.rm_f "test.html"
     IsoDoc::HtmlConvert.new({bodyfont: "Zapf", htmlstylesheet: "spec/assets/html.css", htmlcoverpage: "spec/assets/htmlcover.html", htmlintropage: "spec/assets/htmlintro.html", scripts: "spec/assets/scripts.html", i18nyaml: "spec/assets/i18n.yaml", ulstyle: "l1", olstyle: "l2"}).convert("test", <<~"INPUT", false)
         <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
@@ -124,8 +124,8 @@ RSpec.describe IsoDoc do
   end
 
   it "generates HTML output docs with default fonts" do
-    system "rm -f test.doc"
-    system "rm -f test.html"
+    FileUtils.rm_f "test.doc"
+    FileUtils.rm_f "test.html"
     IsoDoc::HtmlConvert.new({htmlstylesheet: "spec/assets/html.css", htmlcoverpage: "spec/assets/htmlcover.html", htmlintropage: "spec/assets/htmlintro.html", scripts: "spec/assets/scripts.html", i18nyaml: "spec/assets/i18n.yaml", ulstyle: "l1", olstyle: "l2"}).convert("test", <<~"INPUT", false)
         <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
@@ -146,8 +146,8 @@ RSpec.describe IsoDoc do
   end
 
   it "generates Word output docs with complete configuration" do
-    system "rm -f test.doc"
-    system "rm -f test.html"
+    FileUtils.rm_f "test.doc"
+    FileUtils.rm_f "test.html"
     IsoDoc::WordConvert.new({bodyfont: "Zapf", wordstylesheet: "spec/assets/html.css", standardstylesheet: "spec/assets/std.css", header: "spec/assets/header.html", wordcoverpage: "spec/assets/wordcover.html", wordintropage: "spec/assets/wordintro.html", i18nyaml: "spec/assets/i18n.yaml", ulstyle: "l1", olstyle: "l2"}).convert("test", <<~"INPUT", false)
         <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
@@ -169,8 +169,8 @@ RSpec.describe IsoDoc do
   end
 
   it "generates Word output docs with default fonts" do
-    system "rm -f test.doc"
-    system "rm -f test.html"
+    FileUtils.rm_f "test.doc"
+    FileUtils.rm_f "test.html"
     IsoDoc::WordConvert.new({wordstylesheet: "spec/assets/html.css", standardstylesheet: "spec/assets/std.css", header: "spec/assets/header.html", wordcoverpage: "spec/assets/wordcover.html", wordintropage: "spec/assets/wordintro.html", i18nyaml: "spec/assets/i18n.yaml", ulstyle: "l1", olstyle: "l2"}).convert("test", <<~"INPUT", false)
         <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
@@ -192,8 +192,8 @@ RSpec.describe IsoDoc do
   end
 
   it "converts definition lists to tables for Word" do
-    system "rm -f test.doc"
-    system "rm -f test.html"
+    FileUtils.rm_f "test.doc"
+    FileUtils.rm_f "test.html"
     IsoDoc::WordConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("test", <<~"INPUT", false)
      <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
@@ -234,8 +234,8 @@ RSpec.describe IsoDoc do
   end
 
   it "converts annex subheadings to h2Annex class for Word" do
-    system "rm -f test.doc"
-    system "rm -f test.html"
+    FileUtils.rm_f "test.doc"
+    FileUtils.rm_f "test.html"
     IsoDoc::WordConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("test", <<~"INPUT", false)
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <annex id="P" inline-header="false" obligation="normative">
@@ -262,9 +262,52 @@ RSpec.describe IsoDoc do
     OUTPUT
   end
 
+  it "inserts default paragraph between two tables for Word" do 
+    FileUtils.rm_f "test.doc"
+    FileUtils.rm_f "test.html"
+    IsoDoc::WordConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("test", <<~"INPUT", false)
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <annex id="P" inline-header="false" obligation="normative">
+    <example id="_63112cbc-cde0-435f-9553-e0b8c4f5851c">
+  <p id="_158d4efa-b1c9-4aec-b325-756de8e4c968">'1M', '01M', and '0001M' all describe the calendar month January.</p>
+</example>
+<example id="_63112cbc-cde0-435f-9553-e0b8c4f5851d">
+  <p id="_158d4efa-b1c9-4aec-b325-756de8e4c969">'2M', '02M', and '0002M' all describe the calendar month February.</p>
+</example>
+    </annex>
+    </iso-standard>
+    INPUT
+    word = File.read("test.doc").sub(/^.*<div class="WordSection3">/m, '<div class="WordSection3">').
+      sub(%r{<div style="mso-element:footnote-list"/>.*$}m, "")
+    expect(word).to be_equivalent_to <<~"OUTPUT"
+    <div class="WordSection3">
+             <p class="zzSTDTitle1"></p>
+             <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+             <div class="Section3"><a name="P" id="P"></a>
+               <table class="example"><a name="_63112cbc-cde0-435f-9553-e0b8c4f5851c" id="_63112cbc-cde0-435f-9553-e0b8c4f5851c"></a>
+                 <tr>
+                   <td valign="top" class="example_label" style="width:82.8pt;">EXAMPLE  1</td>
+                   <td valign="top" class="example">
+         <p class="example"><a name="_158d4efa-b1c9-4aec-b325-756de8e4c968" id="_158d4efa-b1c9-4aec-b325-756de8e4c968"></a>'1M', '01M', and '0001M' all describe the calendar month January.</p>
+       </td>
+                 </tr>
+               </table><p style="margin-top:0cm;margin-right:0cm;margin-bottom:0cm;margin-left:0.0pt;margin-bottom:.0001pt" class="MsoNormal"><span lang="EN-GB" style="display:none;mso-hide:all" xml:lang="EN-GB">&#xA0;</span></p>
+               <table class="example"><a name="_63112cbc-cde0-435f-9553-e0b8c4f5851d" id="_63112cbc-cde0-435f-9553-e0b8c4f5851d"></a>
+                 <tr>
+                   <td valign="top" class="example_label" style="width:82.8pt;">EXAMPLE  2</td>
+                   <td valign="top" class="example">
+         <p class="example"><a name="_158d4efa-b1c9-4aec-b325-756de8e4c969" id="_158d4efa-b1c9-4aec-b325-756de8e4c969"></a>'2M', '02M', and '0002M' all describe the calendar month February.</p>
+       </td>
+                 </tr>
+               </table>
+             </div>
+           </div>
+    OUTPUT
+  end
+
   it "populates Word template with terms reference labels" do
-    system "rm -f test.doc"
-    system "rm -f test.html"
+    FileUtils.rm_f "test.doc"
+    FileUtils.rm_f "test.html"
     IsoDoc::WordConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("test", <<~"INPUT", false)
         <iso-standard xmlns="http://riboseinc.com/isoxml">
     <sections>
@@ -294,12 +337,12 @@ RSpec.describe IsoDoc do
        <p class="MsoNormal">ISO and IEC maintain terminological databases for use in
        standardization at the following addresses:</p>
 
-       <ul>
-       <li class="MsoNormal"> <p class="MsoNormal">ISO Online browsing platform: available at
-         <a href="http://www.iso.org/obp">http://www.iso.org/obp</a></p> </li>
-       <li class="MsoNormal"> <p class="MsoNormal">IEC Electropedia: available at
+       <p class="MsoListParagraphCxSpFirst"> ISO Online browsing platform: available at
+        <a href="http://www.iso.org/obp">http://www.iso.org/obp</a> </p>
+        <p class="MsoListParagraphCxSpLast"> IEC Electropedia: available at
+
          <a href="http://www.electropedia.org">http://www.electropedia.org</a>
-       </p> </li> </ul>
+       </p> 
        <p class="TermNum"><a name="paddy1" id="paddy1"></a>1.1</p><p class="Terms" style="text-align:left;">paddy</p>
        <p class="MsoNormal"><a name="_eb29b35e-123e-4d1c-b50b-2714d41e747f" id="_eb29b35e-123e-4d1c-b50b-2714d41e747f"></a>rice retaining its husk after threshing</p>
        <p class="MsoNormal">[SOURCE: <a href="#ISO7301">ISO 7301:2011, Clause 3.1</a>, modified &mdash; The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here]</p></div>
@@ -308,7 +351,7 @@ RSpec.describe IsoDoc do
   end
 
   it "populates Word header" do
-    system "rm -f test.doc"
+    FileUtils.rm_f "test.doc"
     IsoDoc::WordConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css", header: "spec/assets/header.html"}).convert("test", <<~"INPUT", false)
         <iso-standard xmlns="http://riboseinc.com/isoxml">
                <bibdata type="article">
@@ -334,7 +377,7 @@ CkZJTEVOQU1FOiB0ZXN0Cgo=
   end
 
   it "populates Word ToC" do
-    system "rm -f test.doc"
+    FileUtils.rm_f "test.doc"
     IsoDoc::WordConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css", wordintropage: "spec/assets/wordintro.html"}).convert("test", <<~"INPUT", false)
         <iso-standard xmlns="http://riboseinc.com/isoxml">
         <sections>
@@ -413,7 +456,7 @@ CkZJTEVOQU1FOiB0ZXN0Cgo=
   end
 
   it "reorders footnote numbers in HTML" do
-    system "rm -f test.html"
+    FileUtils.rm_f "test.html"
     IsoDoc::HtmlConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css", wordintropage: "spec/assets/wordintro.html"}).convert("test", <<~"INPUT", false)
         <iso-standard xmlns="http://riboseinc.com/isoxml">
         <sections>
@@ -467,8 +510,8 @@ CkZJTEVOQU1FOiB0ZXN0Cgo=
   end
 
   it "moves images in HTML" do
-    system "rm -f test.html"
-    system "rm -rf test_images"
+    FileUtils.rm_f "test.html"
+    FileUtils.rm_rf "test_images"
     IsoDoc::HtmlConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("test", <<~"INPUT", false)
         <iso-standard xmlns="http://riboseinc.com/isoxml">
         <preface><foreword>
@@ -502,8 +545,8 @@ CkZJTEVOQU1FOiB0ZXN0Cgo=
   end
 
   it "encodes images in HTML as data URIs" do
-    system "rm -f test.html"
-    system "rm -rf test_images"
+    FileUtils.rm_f "test.html"
+    FileUtils.rm_rf "test_images"
     IsoDoc::HtmlConvert.new({htmlstylesheet: "spec/assets/html.css", datauriimage: true}).convert("test", <<~"INPUT", false)
         <iso-standard xmlns="http://riboseinc.com/isoxml">
         <preface><foreword>
@@ -532,8 +575,8 @@ CkZJTEVOQU1FOiB0ZXN0Cgo=
   end
 
   it "processes IsoXML terms for HTML" do
-    system "rm -f test.doc"
-    system "rm -f test.html"
+    FileUtils.rm_f "test.html"
+    FileUtils.rm_f "test.doc"
     IsoDoc::HtmlConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("test", <<~"INPUT", false)
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <sections>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-22 00:00:00.000000000 Z
+date: 2018-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath