isodoc 0.8.1 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6d2dab4cea8fcb1ace19dc45b56bd22e2760d90e95ace97fa1baccfb9b202fa
-  data.tar.gz: be7c14b98bb593ebcf3e268f0f4b01e4537d3ffb1df91f079bca644ba9540653
+  metadata.gz: 0321e7f3851982b8a41f0b4ad71cb942c8e559121780f3089bc3954ea06438d4
+  data.tar.gz: 5f86453bbf454a1d430a31b8cfaa5bab753b19b7117e5fec70ae34b15dad419b
 SHA512:
-  metadata.gz: de177f5b8d07b4e34cb0c35059017bc14d15d6079893a811f6a2f6faa6fc3cb350fd3a9bdc1f93edba8466e0695081eb4da4a376c126bec52bad61934f285ed8
-  data.tar.gz: 66a28cfc65f4d953469a6676515dc532aec51c0a06d971281e9eecc1c1c7fa769b3f635e3ec657d7f07db620ba9bf32d53169b6e6de88a02c54bec629db28fd2
+  metadata.gz: '01875c7a9de4657a22eec95a6a9a613e1f227ab5d345015d8ff83478cb03019a5dec57fea43e8c08e114fd05ac3597e285c1d0cdf757d6a51a71a73ab8e6522d'
+  data.tar.gz: a7160ab90056650b4e72ab7df23549442f9938ec1a3c9b96cb8ef32b6b700fa4dd6c30edadb380bf85d3e131b0ddb4871c2e005c5b135cdbc3435bd19eea5725

data/.travis.yml

@@ -0,0 +1,13 @@
+sudo: false
+language: ruby
+
+rvm:
+  - 2.5
+  - 2.4
+  - ruby-head
+
+before_install: gem install bundler -v 1.16.2
+
+matrix:
+  allow_failures:
+    - rvm: ruby-head

data/Gemfile.lock

@@ -1,8 +1,8 @@
 GIT
   remote: https://github.com/riboseinc/html2doc.git
-  revision: ae15cfc0a4c8ebeb74193a8aa4a7884938a08434
+  revision: e9c0077be0c3d36bb09fa35743a79b00dd5ac560
   specs:
-    html2doc (0.8.0)
+    html2doc (0.8.1)
       asciimath
       htmlentities (~> 4.3.4)
       image_size
@@ -15,13 +15,11 @@ GIT
 PATH
   remote: .
   specs:
-    isodoc (0.8)
+    isodoc (0.8.3)
       asciimath
-      html2doc (>= 0.7.1)
+      html2doc (~> 0.8.1)
       htmlentities (~> 4.3.4)
-      image_size
       liquid
-      mime-types
       nokogiri
       roman-numerals
       ruby-xslt
@@ -72,13 +70,13 @@ GEM
     mime-types-data (3.2016.0521)
     mini_portile2 (2.3.0)
     nenv (0.3.0)
-    nokogiri (1.8.3)
+    nokogiri (1.8.4)
       mini_portile2 (~> 2.3.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
     parallel (1.12.1)
-    parser (2.5.1.0)
+    parser (2.5.1.2)
       ast (~> 2.4.0)
     powerpack (0.1.2)
     pry (0.11.3)
@@ -103,10 +101,10 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.1)
-    rubocop (0.57.2)
+    rubocop (0.58.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.5)
+      parser (>= 2.5, != 2.5.1.1)
       powerpack (~> 0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)

data/isodoc.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   DESCRIPTION
 
   spec.homepage      = "https://github.com/riboseinc/isodoc"
-  spec.license       = "MIT"
+  spec.license       = "BSD-2-Clause"
 
   spec.bindir        = "bin"
   spec.require_paths = ["lib"]
@@ -30,13 +30,11 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "asciimath"
   spec.add_dependency "htmlentities", "~> 4.3.4"
-  spec.add_dependency "image_size"
-  spec.add_dependency "mime-types"
   spec.add_dependency "nokogiri"
   spec.add_dependency "ruby-xslt"
   spec.add_dependency "thread_safe"
   spec.add_dependency "uuidtools"
-  spec.add_dependency "html2doc", ">= 0.7.1"
+  spec.add_dependency "html2doc", "~> 0.8.1"
   spec.add_dependency "liquid"
   spec.add_dependency "roman-numerals"
   spec.add_dependency "sass"

data/lib/isodoc-yaml/i18n-zh-Hans.yaml

@@ -12,7 +12,7 @@ table_of_contents: 目次
 introduction: 引言
 foreword: 前言
 termsdef: 术语和定义
-termsdefsymbols_lbl: 术语、定义、符号、代号和缩略语
+termsdefsymbols: 术语、定义、符号、代号和缩略语
 normref: 规范性引用文件
 bibliography: 参考文献
 clause: 条

data/lib/isodoc/convert.rb

@@ -95,6 +95,7 @@ module IsoDoc
       result = convert1(docxml, filename, dir)
       return result if debug
       postprocess(result, filename, dir)
+      system "rm -fr #{dir}"
     end
   end
 end

data/lib/isodoc/function/blocks.rb

@@ -9,7 +9,7 @@ module IsoDoc::Function
     end
 
     def note_p_parse(node, div)
-      div.p **{ class: "Note" } do |p|
+      div.p do |p|
         p.span **{ class: "note_label" } do |s|
           s << note_label(node)
         end
@@ -20,7 +20,7 @@ module IsoDoc::Function
     end
 
     def note_parse1(node, div)
-      div.p **{ class: "Note" } do |p|
+      div.p do |p|
         p.span **{ class: "note_label" } do |s|
           s << note_label(node)
         end
@@ -155,7 +155,6 @@ module IsoDoc::Function
 
     def para_attrs(node)
       classtype = nil
-      classtype = "Note" if @note
       classtype = "MsoCommentText" if in_comment
       classtype = "Sourcecode" if @annotation
       attrs = { class: classtype, id: node["id"] }
@@ -204,8 +203,11 @@ module IsoDoc::Function
       end
     end
 
-    def image_parse(url, out, caption)
-      out.img **attr_code(src: url)
+    def image_parse(node, out, caption)
+      attrs = { src: node["src"], 
+                height: node["height"] || "auto", 
+                width: node["width"] || "auto" }
+      out.img **attr_code(attrs)
       image_title_parse(out, caption)
     end
   end

data/lib/isodoc/function/cleanup.rb

@@ -143,11 +143,6 @@ module IsoDoc::Function
           d.parent = insert_here
         end
       end
-      # preempt html2doc putting MsoNormal there
-      docxml.xpath("//p[not(self::*[@class])]"\
-                   "[ancestor::*[@class = 'Note']]").each do |p|
-        p["class"] = "Note"
-      end
     end
 
     def table_cleanup(docxml)

data/lib/isodoc/function/inline.rb

@@ -11,7 +11,13 @@ module IsoDoc::Function
     def link_parse(node, out)
       linktext = node.text
       linktext = node["target"] if linktext.empty?
-      out.a(**{ "href": node["target"] }) { |l| l << linktext }
+      out.a(**{ "href": node["target"] }) do |l|
+        if node.text.empty?
+          l << linktext 
+        else
+          node.children.each { |n| parse(n, l) }
+        end
+      end
     end
 
     def callout_parse(node, out)

data/lib/isodoc/function/lists.rb

@@ -50,7 +50,8 @@ module IsoDoc::Function
 
     def dt_parse(dt, term)
       if dt.elements.empty?
-        term.p **attr_code(class: note? ? "Note" : nil) do |p|
+        #term.p **attr_code(class: note? ? "Note" : nil) do |p|
+        term.p do |p|
           p << dt.text
         end
       else

data/lib/isodoc/function/references.rb

@@ -73,7 +73,7 @@ module IsoDoc::Function
 
     # TODO generate formatted ref if not present
     def noniso_bibitem(list, b, ordinal, bibliography)
-      list.p **attr_code("id": b["id"], class: "Biblio") do |r|
+      list.p **attr_code(iso_bibitem_entry_attrs(b, bibliography)) do |r|
         if bibliography
           id = docid_l10n(b.at(ns("./docidentifier")).text.gsub(/[\[\]]/, ""))
           ref_entry_code(r, ordinal, id)

data/lib/isodoc/function/section.rb

@@ -125,7 +125,7 @@ module IsoDoc::Function
     end
 
     def terms_defs_title(f)
-      symbols = f.at(".//definitions")
+      symbols = f.at(ns(".//definitions"))
       return @termsdefsymbols_lbl if symbols
       @termsdef_lbl
     end

data/lib/isodoc/function/terms.rb

@@ -42,7 +42,7 @@ module IsoDoc::Function
     def termnote_parse(node, out)
       out.div **{ class: "Note" } do |div|
         first = node.first_element_child
-        div.p **{ class: "Note" } do |p|
+        div.p do |p|
           p << "#{get_anchors[node['id']][:label]}: "
           para_then_remainder(first, node, p, div)
         end

data/lib/isodoc/function/to_word_html.rb

@@ -157,7 +157,7 @@ module IsoDoc::Function
         when "table" then table_parse(node, out)
         when "figure" then figure_parse(node, out)
         when "example" then example_parse(node, out)
-        when "image" then image_parse(node["src"], out, nil)
+        when "image" then image_parse(node, out, nil)
         when "sourcecode" then sourcecode_parse(node, out)
         when "annotation" then annotation_parse(node, out)
         when "term" then termdef_parse(node, out)

data/lib/isodoc/html_function/html.rb

@@ -194,37 +194,18 @@ module IsoDoc::HtmlFunction
         matched = /\.(?<suffix>\S+)$/.match i["src"]
         uuid = UUIDTools::UUID.random_create.to_s
         new_full_filename = File.join("_images", "#{uuid}.#{matched[:suffix]}")
-        system "cp #{i['src']} #{new_full_filename}"
-        i["src"] = new_full_filename
-        i["width"], i["height"] = Html2Doc.image_resize(i, 800, 1200)
+        move_image1(i, new_full_filename)
       end
       docxml
     end
 
-    #def html_toc1(h, ret, prevname)
-      #h["id"] = UUIDTools::UUID.random_create.to_s unless h["id"]
-      #li = "<li><a href='##{h["id"]}'>#{header_strip(h)}</a></li>"
-      #if h.name == "h1"
-        #ret += "</ul>" if prevname == "h2"
-      #else
-        #ret += "<ul>" if prevname == "h1"
-      #end
-      #ret + li
-    #end
-#
-    #def html_toc_obsolete(docxml)
-      #return docxml unless @htmlintropage
-      #ret = ""
-      #prevname = ""
-      #docxml.xpath("//h1 | //h2").each do |h|
-        #next if ["toc-contents", "TermNum"].include? h["class"]
-        #ret = html_toc1(h, ret, prevname)
-        #prevname = h.name
-      #end
-      #ret += "<ul>" if prevname == "h2"
-      #docxml.at("//*[@id='toc-list']").replace("<ul>#{ret}</ret>")
-      #docxml
-    #end
+    def move_image1(i, new_full_filename)
+      system "cp #{i['src']} #{new_full_filename}"
+      i["src"] = new_full_filename
+      if i["width"] != "auto" && i["height"] != "auto"
+        i["width"], i["height"] = Html2Doc.image_resize(i, 800, 1200)
+      end
+    end
 
     def html_toc(docxml)
       docxml

data/lib/isodoc/iso/html/isodoc.scss

@@ -32,6 +32,23 @@ p.Biblio, li.Biblio, div.Biblio
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;
 	mso-ansi-language:EN-GB;}
+p.NormRef, li.NormRef, div.NormRef
+        {mso-style-unhide:no;
+        mso-style-qformat:yes;
+        mso-style-parent:"";
+        margin-top:0cm;
+        margin-right:0cm;
+        margin-bottom:12.0pt;
+    margin-left:0pt;
+    text-indent:0pt;
+    tab-stops: 33.15pt;
+        line-height:12.0pt;
+        mso-pagination:widow-orphan;
+        font-size:11.0pt;
+        font-family:$bodyfont;
+        mso-fareast-font-family:$bodyfont;
+        mso-bidi-font-family:$bodyfont;
+        mso-ansi-language:EN-GB;}
 p.FigureTitle
 	{mso-style-unhide:no;
 	mso-style-qformat:yes;

data/lib/isodoc/iso/html/style-human.scss

@@ -91,7 +91,7 @@ dd {
   grid-column-start: 2;
 }
 
-dd p {
+dd p, dt p {
   margin-top: 0px;
 }
 
@@ -590,7 +590,7 @@ ul, ol {margin-left: 2em;}
 3.5 Bibliograhy
 */
 
-p.Biblio {
+p.Biblio, p.NormRef {
 margin-top: 1em;
 margin-left: 2em;
 }

data/lib/isodoc/iso/html/style-iso.scss

@@ -86,7 +86,7 @@ dd {
   grid-column-start: 2;
 }
 
-dd p {
+dd p, dt p {
   margin-top: 0px;
 }
 
@@ -574,7 +574,7 @@ ul, ol {margin-left: 2em;}
 3.5 Bibliograhy
 */
 
-p.Biblio {
+p.Biblio, p.NormRef {
 margin-top: 1em;
 margin-left: 2em;
 }

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "0.8.1".freeze
+  VERSION = "0.8.3".freeze
 end

data/lib/isodoc/word_function/body.rb

@@ -145,5 +145,61 @@ module IsoDoc::WordFunction
         a.parent = dd
       end
     end
+
+    def note_p_parse(node, div)
+      div.p **{ class: "Note" } do |p|
+        p.span **{ class: "note_label" } do |s|
+          s << note_label(node)
+        end
+        insert_tab(p, 1)
+        node.first_element_child.children.each { |n| parse(n, p) }
+      end
+      node.element_children[1..-1].each { |n| parse(n, div) }
+    end
+
+    def note_parse1(node, div)
+      div.p **{ class: "Note" } do |p|
+        p.span **{ class: "note_label" } do |s|
+          s << note_label(node)
+        end
+        insert_tab(p, 1)
+      end
+      node.children.each { |n| parse(n, div) }
+    end
+
+    def termnote_parse(node, out)
+      out.div **{ class: "Note" } do |div|
+        first = node.first_element_child
+        div.p **{ class: "Note" } do |p|
+          p << "#{get_anchors[node['id']][:label]}: "
+          para_then_remainder(first, node, p, div)
+        end
+      end
+    end
+
+    def para_attrs(node)
+      classtype = nil
+      classtype = "Note" if @note
+      classtype = "MsoCommentText" if in_comment
+      classtype = "Sourcecode" if @annotation
+      attrs = { class: classtype, id: node["id"] }
+      unless node["align"].nil?
+        attrs[:align] = node["align"] unless node["align"] == "justify"
+        attrs[:style] = "text-align:#{node['align']}"
+      end
+      attrs
+    end
+
+    def image_parse(node, out, caption)
+      attrs = { src: node["src"],
+                height: node["height"],
+                width: node["width"] }
+      if node["height"] == "auto" || node["width"] == "auto"
+        attrs[:height] = nil
+        attrs[:width] = nil
+      end
+      out.img **attr_code(attrs)
+      image_title_parse(out, caption)
+    end
   end
 end

data/lib/isodoc/word_function/postprocess.rb

@@ -1,5 +1,13 @@
 module IsoDoc::WordFunction
   module Postprocess
+    def table_note_cleanup(docxml)
+      super
+      # preempt html2doc putting MsoNormal there
+      docxml.xpath("//p[not(self::*[@class])]"\
+                   "[ancestor::*[@class = 'Note']]").each do |p|
+        p["class"] = "Note"
+      end
+    end
 
     def postprocess(result, filename, dir)
       header = generate_header(filename, dir)

data/spec/isodoc/blocks_spec.rb

@@ -16,7 +16,7 @@ RSpec.describe IsoDoc do
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
                  <div id="" class="Note">
-                   <p class="Note"><span class="note_label">NOTE</span>&#160; These results are based on a study carried out on three different types of kernel.</p>
+                   <p><span class="note_label">NOTE</span>&#160; These results are based on a study carried out on three different types of kernel.</p>
                  </div>
                </div>
                <p class="zzSTDTitle1"/>
@@ -26,6 +26,45 @@ RSpec.describe IsoDoc do
     OUTPUT
   end
 
+  it "processes unlabelled notes (Word)" do
+    expect(IsoDoc::WordConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <preface><foreword>
+    <note>
+  <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
+</note>
+    </foreword></preface>
+    </iso-standard>
+    INPUT
+           <html xmlns:epub="http://www.idpf.org/2007/ops">
+         <head>
+           <title>test</title>
+         </head>
+         <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"/>
+             <div>
+               <h1 class="ForewordTitle">Foreword</h1>
+               <div id="" class="Note">
+                 <p class="Note"><span class="note_label">NOTE</span><span style="mso-tab-count:1">&#160; </span>These results are based on a study carried out on three different types of kernel.</p>
+               </div>
+             </div>
+             <p>&#160;</p>
+           </div>
+           <br clear="all" class="section"/>
+           <div class="WordSection3">
+             <p class="zzSTDTitle1"/>
+           </div>
+         </body>
+       </html>
+    OUTPUT
+  end
+
+
   it "processes labelled notes" do
     expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
@@ -41,7 +80,7 @@ INPUT
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
                  <div id="note1" class="Note">
-                   <p class="Note"><span class="note_label">NOTE</span>&#160; These results are based on a study carried out on three different types of kernel.</p>
+                   <p><span class="note_label">NOTE</span>&#160; These results are based on a study carried out on three different types of kernel.</p>
                  </div>
                </div>
                <p class="zzSTDTitle1"/>
@@ -69,10 +108,10 @@ INPUT
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
                  <div id="note1" class="Note">
-                   <p class="Note"><span class="note_label">NOTE  1</span>&#160; These results are based on a study carried out on three different types of kernel.</p>
+                   <p><span class="note_label">NOTE  1</span>&#160; These results are based on a study carried out on three different types of kernel.</p>
                  </div>
                  <div id="note2" class="Note">
-                   <p class="Note"><span class="note_label">NOTE  2</span>&#160; These results are based on a study carried out on three different types of kernel.</p>
+                   <p><span class="note_label">NOTE  2</span>&#160; These results are based on a study carried out on three different types of kernel.</p>
                  </div>
                </div>
                <p class="zzSTDTitle1"/>
@@ -98,8 +137,8 @@ INPUT
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
                  <div id="" class="Note">
-                   <p class="Note"><span class="note_label">NOTE</span>&#160; These results are based on a study carried out on three different types of kernel.</p>
-                   <p class="Note" id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83a">These results are based on a study carried out on three different types of kernel.</p>
+                   <p><span class="note_label">NOTE</span>&#160; These results are based on a study carried out on three different types of kernel.</p>
+                   <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83a">These results are based on a study carried out on three different types of kernel.</p>
                  </div>
                </div>
                <p class="zzSTDTitle1"/>
@@ -128,8 +167,8 @@ INPUT
                <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
-                 <div id="" class="Note"><p class="Note"><span class="note_label">NOTE</span>&#160; </p>
-           <dl><dt><p class="Note">A</p></dt><dd><p class="Note">B</p></dd></dl>
+                 <div id="" class="Note"><p><span class="note_label">NOTE</span>&#160; </p>
+           <dl><dt><p>A</p></dt><dd><p>B</p></dd></dl>
            <ul>
            <li>C</li></ul>
        </div>
@@ -142,13 +181,59 @@ INPUT
     OUTPUT
   end
 
+  it "processes non-para notes (Word)" do
+    expect(IsoDoc::WordConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <preface><foreword>
+    <note>
+    <dl>
+    <dt>A</dt>
+    <dd><p>B</p></dd>
+    </dl>
+    <ul>
+    <li>C</li></ul>
+</note>
+    </foreword></preface>
+    </iso-standard>
+    INPUT
+           <html xmlns:epub="http://www.idpf.org/2007/ops">
+         <head>
+           <title>test</title>
+         </head>
+         <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"/>
+             <div>
+               <h1 class="ForewordTitle">Foreword</h1>
+               <div id="" class="Note"><p class="Note"><span class="note_label">NOTE</span><span style="mso-tab-count:1">&#160; </span></p>
+           <table class="dl"><tr><td valign="top" align="left"><p align="left" style="margin-left:0pt;text-align:left;">A</p></td><td valign="top"><p class="Note">B</p></td></tr></table>
+           <ul>
+           <li>C</li></ul>
+       </div>
+             </div>
+             <p>&#160;</p>
+           </div>
+           <br clear="all" class="section"/>
+           <div class="WordSection3">
+             <p class="zzSTDTitle1"/>
+           </div>
+         </body>
+       </html>
+    OUTPUT
+  end
+
   it "processes figures" do
     expect(strip_guid(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <figure id="figureA-1">
   <name>Split-it-right sample divider</name>
-  <image src="rice_images/rice_image1.png" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" imagetype="PNG"/>
+  <image src="rice_images/rice_image1.png" height="20" width="30" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" imagetype="PNG"/>
+  <image src="rice_images/rice_image1.png" height="20" width="auto" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" imagetype="PNG"/>
   <fn reference="a">
   <p id="_ef2c85b8-5a5a-4ecd-a1e6-92acefaaa852">The time <stem type="AsciiMath">t_90</stem> was estimated to be 18,2 min for this example.</p>
 </fn>
@@ -166,7 +251,8 @@ INPUT
                  <h1 class="ForewordTitle">Foreword</h1>
                  <div id="figureA-1" class="figure">
 
-         <img src="rice_images/rice_image1.png"/>
+         <img src="rice_images/rice_image1.png" height="20" width="30"/>
+         <img src="rice_images/rice_image1.png" height="20" width="auto"/>
          <a href="#_" class="TableFootnoteRef">a</a><aside class="footnote"><div id="fn:_"><a id="_" class="TableFootnoteRef">a&#160; </a>
          <p id="_">The time <span class="stem">(#(t_90)#)</span> was estimated to be 18,2 min for this example.</p>
        </div></aside>
@@ -186,7 +272,8 @@ INPUT
     <preface><foreword>
     <figure id="figureA-1">
   <name>Split-it-right sample divider</name>
-  <image src="rice_images/rice_image1.png" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" imagetype="PNG"/>
+  <image src="rice_images/rice_image1.png" height="20" width="30" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" imagetype="PNG"/>
+  <image src="rice_images/rice_image1.png" height="20" width="auto" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" imagetype="PNG"/>
   <fn reference="a">
   <p id="_ef2c85b8-5a5a-4ecd-a1e6-92acefaaa852">The time <stem type="AsciiMath">t_90</stem> was estimated to be 18,2 min for this example.</p>
 </fn>
@@ -213,6 +300,7 @@ INPUT
                <h1 class="ForewordTitle">Foreword</h1>
                <div id="figureA-1" class="figure">
 
+         <img src="rice_images/rice_image1.png" height="20" width="30"/>
          <img src="rice_images/rice_image1.png"/>
          <a href="#_" class="TableFootnoteRef">a</a><aside><div id="ftn_"><a id="_" class="TableFootnoteRef">a<span style="mso-tab-count:1">&#160; </span></a>
          <p id="_">The time <span class="stem">(#(t_90)#)</span> was estimated to be 18,2 min for this example.</p>

data/spec/isodoc/i18n_spec.rb

@@ -95,7 +95,7 @@ RSpec.describe IsoDoc do
                  <h1>2.&#160; Normative references</h1>
                  <p>There are no normative references in this document.</p>
                </div>
-               <div id="H"><h1>3.&#160; Terms and definitions</h1><p>For the purposes of this document,
+               <div id="H"><h1>3.&#160; Terms, definitions, symbols and abbreviated terms</h1><p>For the purposes of this document,
            the following terms and definitions apply.</p>
        <p>ISO and IEC maintain terminological databases for use in
        standardization at the following addresses:</p>
@@ -252,7 +252,7 @@ RSpec.describe IsoDoc do
                  <h1>2.&#160; Normative references</h1>
                  <p>There are no normative references in this document.</p>
                </div>
-               <div id="H"><h1>3.&#160; Terms and definitions</h1><p>For the purposes of this document,
+               <div id="H"><h1>3.&#160; Terms, definitions, symbols and abbreviated terms</h1><p>For the purposes of this document,
            the following terms and definitions apply.</p>
        <p>ISO and IEC maintain terminological databases for use in
        standardization at the following addresses:</p>
@@ -409,7 +409,7 @@ RSpec.describe IsoDoc do
                  <h1>2.&#160; R&#233;f&#233;rences normatives</h1>
                  <p>Le pr&#233;sent document ne contient aucune r&#233;f&#233;rence normative.</p>
                </div>
-               <div id="H"><h1>3.&#160; Terms et d&#233;finitions</h1><p>Pour les besoins du pr&#233;sent document, les termes et d&#233;finitions suivants s'appliquent.</p>
+               <div id="H"><h1>3.&#160; Terms, d&#233;finitions, symboles et termes abr&#233;g&#233;s</h1><p>Pour les besoins du pr&#233;sent document, les termes et d&#233;finitions suivants s'appliquent.</p>
        <p>L'ISO et l'IEC tiennent &#224; jour des bases de donn&#233;es terminologiques
        destin&#233;es &#224; &#234;tre utilis&#233;es en normalisation, consultables aux adresses
        suivantes:</p>
@@ -579,7 +579,7 @@ RSpec.describe IsoDoc do
                  <p>&#19979;&#21015;&#25991;&#20214;&#23545;&#20110;&#26412;&#25991;&#20214;&#30340;&#24212;&#29992;&#26159;&#24517;&#19981;&#21487;&#23569;&#30340;&#12290; &#20961;&#26159;&#27880;&#26085;&#26399;&#30340;&#24341;&#29992;&#25991;&#20214;&#65292;&#20165;&#27880;&#26085;&#26399;&#30340;&#29256;&#26412;&#36866;&#29992;&#20110;&#26412;&#25991;&#20214;&#12290; &#20961;&#26159;&#19981;&#27880;&#26085;&#26399;&#30340;&#24341;&#29992;&#25991;&#20214;&#65292;&#20854;&#26368;&#26032;&#29256;&#26412;&#65288;&#21253;&#25324;&#25152;&#26377;&#30340;&#20462;&#25913;&#21333;&#65289;&#36866;&#29992;&#20110;&#26412;&#25991;&#20214;&#12290;</p>
                  <p id="ISO712" class="NormRef">ISO 712, <i> Cereals and cereal products</i></p>
                </div>
-               <div id="H"><h1>3.&#160; &#26415;&#35821;&#21644;&#23450;&#20041;</h1><p>&#19979;&#21015;&#26415;&#35821;&#21644;&#23450;&#20041;&#36866;&#29992;&#20110;&#26412;&#25991;&#20214;&#12290;</p>
+               <div id="H"><h1>3.&#160; &#26415;&#35821;&#12289;&#23450;&#20041;&#12289;&#31526;&#21495;&#12289;&#20195;&#21495;&#21644;&#32553;&#30053;&#35821;</h1><p>&#19979;&#21015;&#26415;&#35821;&#21644;&#23450;&#20041;&#36866;&#29992;&#20110;&#26412;&#25991;&#20214;&#12290;</p>
        <p>ISO&#21644;IEC&#29992;&#20110;&#26631;&#20934;&#21270;&#30340;&#26415;&#35821;&#25968;&#25454;&#24211;&#22320;&#22336;&#22914;&#19979;&#65306;</p>
        <ul>
        <li> <p>ISO&#22312;&#32447;&#27983;&#35272;&#24179;&#21488;:

data/spec/isodoc/lists_spec.rb

@@ -165,7 +165,7 @@ RSpec.describe IsoDoc do
                    </dd>
                  </dl>
                  <div id="" class="Note">
-  <p class="Note"><span class="note_label">NOTE</span>&#160; This is a note</p>
+  <p><span class="note_label">NOTE</span>&#160; This is a note</p>
 </div>
                </div>
                <p class="zzSTDTitle1"/>

data/spec/isodoc/postproc_spec.rb

@@ -409,6 +409,8 @@ CkZJTEVOQU1FOiB0ZXN0Cgo=
          <figure id="_">
          <name>Split-it-right sample divider</name>
                   <image src="spec/assets/rice_image1.png" id="_" imagetype="PNG"/>
+                  <image src="spec/assets/rice_image1.png" id="_" width="20000" height="300000" imagetype="PNG"/>
+                  <image src="spec/assets/rice_image1.png" id="_" width="99" height="auto" imagetype="PNG"/>
        </figure>
        </foreword></preface>
         </iso-standard>
@@ -423,7 +425,10 @@ CkZJTEVOQU1FOiB0ZXN0Cgo=
                <h1 class="ForewordTitle">Foreword</h1>
                <div id="_" class="figure">
 
-                  <img src="_images/_.png" width="800" height="673" />
+                <img src="_images/_.png" height="auto" width="auto" />
+                <img src="_images/_.png" height="1200" width="80" />
+                <img src="_images/_.png" height="auto" width="99" />
+
        <p class="FigureTitle" align="center">Figure 1&#xA0;&#x2014; Split-it-right sample divider</p></div>
              </div>
              <p class="zzSTDTitle1"></p>

data/spec/isodoc/ref_spec.rb

@@ -94,7 +94,7 @@ RSpec.describe IsoDoc do
                  <p id="ISO712" class="NormRef">ISO 712, <i> Cereals and cereal products</i></p>
                  <p id="ISO16634" class="NormRef">ISO 16634:-- (all parts)<a rel="footnote" href="#fn:1" epub:type="footnote"><sup>1</sup></a>, <i> Cereals, pulses, milled cereal products, oilseeds and animal feeding stuffs</i></p>
                  <p id="ISO20483" class="NormRef">ISO 20483:2013&#8211;2014, <i> Cereals and pulses</i></p>
-                 <p id="ref1" class="Biblio">ICC 167, <span style="font-variant:small-caps;">Standard No I.C.C 167</span>. <i>Determination of the protein content in cereal and cereal products for food and animal feeding stuffs according to the Dumas combustion method</i> (see <a href="http://www.icc.or.at">http://www.icc.or.at</a>)</p>
+                 <p id="ref1" class="NormRef">ICC 167, <span style="font-variant:small-caps;">Standard No I.C.C 167</span>. <i>Determination of the protein content in cereal and cereal products for food and animal feeding stuffs according to the Dumas combustion method</i> (see <a href="http://www.icc.or.at">http://www.icc.or.at</a>)</p>
                </div>
                <br/>
                <div>

data/spec/isodoc/section_spec.rb

@@ -92,7 +92,7 @@ RSpec.describe IsoDoc do
                   <h1>2.&#160; Normative references</h1>
                   <p>There are no normative references in this document.</p>
                 </div>
-                <div id="H"><h1>3.&#160; Terms and definitions</h1><p>For the purposes of this document,
+                <div id="H"><h1>3.&#160; Terms, definitions, symbols and abbreviated terms</h1><p>For the purposes of this document,
             the following terms and definitions apply.</p>
         <p>ISO and IEC maintain terminological databases for use in
         standardization at the following addresses:</p>
@@ -260,7 +260,7 @@ OUTPUT
                  <h1>2.<span style="mso-tab-count:1">&#160; </span>Normative references</h1>
                  <p>There are no normative references in this document.</p>
                </div>
-               <div id="H"><h1>3.<span style="mso-tab-count:1">&#160; </span>Terms and definitions</h1><p>For the purposes of this document,
+               <div id="H"><h1>3.<span style="mso-tab-count:1">&#160; </span>Terms, definitions, symbols and abbreviated terms</h1><p>For the purposes of this document,
            the following terms and definitions apply.</p>
        <p>ISO and IEC maintain terminological databases for use in
        standardization at the following addresses:</p>

data/spec/isodoc/table_spec.rb

@@ -111,7 +111,7 @@ RSpec.describe IsoDoc do
                    <dd>A type of rice</dd>
                  </dl>
                  <div id="" class="Note">
-                   <p class="Note"><span class="note_label">NOTE</span>&#160; This is a table about rice</p>
+                   <p><span class="note_label">NOTE</span>&#160; This is a table about rice</p>
                  </div>
                </table>
              </div>

data/spec/isodoc/terms_spec.rb

@@ -92,8 +92,8 @@ RSpec.describe IsoDoc do
          <li>A</li>
          </ul>
        </td></tr></table>
-       <div class="Note"><p class="Note">Note 1 to entry: The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></div>
-       <div class="Note"><p class="Note">Note 2 to entry: <ul><li>A</li></ul><p id="_19830f33-e46c-42cc-94ca-a5ef101132d5">The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></p></div>
+       <div class="Note"><p>Note 1 to entry: The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></div>
+       <div class="Note"><p>Note 2 to entry: <ul><li>A</li></ul><p id="_19830f33-e46c-42cc-94ca-a5ef101132d5">The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></p></div>
        <p>[TERMREF]
          <a href="#ISO7301">ISO 7301: 2011, 3.1</a>
        [/TERMREF]</p></div>
@@ -101,6 +101,109 @@ RSpec.describe IsoDoc do
            </body>
          </head>
        </html>
+OUTPUT
+  end
+  
+  it "processes IsoXML terms (Word)" do
+    expect(IsoDoc::WordConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <sections>
+    <terms id="_terms_and_definitions" obligation="normative"><title>Terms and Definitions</title>
+
+<term id="paddy1"><preferred>paddy</preferred>
+<domain>rice</domain>
+<definition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></definition>
+<termexample id="_bd57bbf1-f948-4bae-b0ce-73c00431f892">
+  <p id="_65c9a509-9a89-4b54-a890-274126aeb55c">Foreign seeds, husks, bran, sand, dust.</p>
+  <ul>
+  <li>A</li>
+  </ul>
+</termexample>
+<termexample id="_bd57bbf1-f948-4bae-b0ce-73c00431f894">
+  <ul>
+  <li>A</li>
+  </ul>
+</termexample>
+
+<termsource status="modified">
+  <origin bibitemid="ISO7301" type="inline" citeas="ISO 7301: 2011"><locality type="clause"><referenceFrom>3.1</referenceFrom></locality></origin>
+    <modification>
+    <p id="_e73a417d-ad39-417d-a4c8-20e4e2529489">The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here</p>
+  </modification>
+</termsource></term>
+
+<term id="paddy"><preferred>paddy</preferred><admitted>paddy rice</admitted>
+<admitted>rough rice</admitted>
+<deprecates>cargo rice</deprecates>
+<definition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></definition>
+<termexample id="_bd57bbf1-f948-4bae-b0ce-73c00431f893">
+  <ul>
+  <li>A</li>
+  </ul>
+</termexample>
+<termnote id="_671a1994-4783-40d0-bc81-987d06ffb74e">
+  <p id="_19830f33-e46c-42cc-94ca-a5ef101132d5">The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p>
+</termnote>
+<termnote id="_671a1994-4783-40d0-bc81-987d06ffb74f">
+<ul><li>A</li></ul>
+  <p id="_19830f33-e46c-42cc-94ca-a5ef101132d5">The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p>
+</termnote>
+<termsource status="identical">
+  <origin bibitemid="ISO7301" type="inline" citeas="ISO 7301: 2011"><locality type="clause"><referenceFrom>3.1</referenceFrom></locality></origin>
+</termsource></term>
+</terms>
+</sections>
+</iso-standard>
+    INPUT
+    #{WORD_HDR}
+             <p class="zzSTDTitle1"/>
+             <div id="_terms_and_definitions"><h1>1.<span style="mso-tab-count:1">&#160; </span>Terms and definitions</h1><p>For the purposes of this document,
+           the following terms and definitions apply.</p>
+       <p>ISO and IEC maintain terminological databases for use in
+       standardization at the following addresses:</p>
+
+       <ul>
+       <li> <p>ISO Online browsing platform: available at
+         <a href="http://www.iso.org/obp">http://www.iso.org/obp</a></p> </li>
+       <li> <p>IEC Electropedia: available at
+         <a href="http://www.electropedia.org">http://www.electropedia.org</a>
+       </p> </li> </ul>
+       <p class="TermNum" id="paddy1">1.1</p><p class="Terms" style="text-align:left;">paddy</p>
+
+       <p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">&lt;rice&gt; rice retaining its husk after threshing</p>
+       <table id="_bd57bbf1-f948-4bae-b0ce-73c00431f892" class="example"><tr><td width="110pt" valign="top" class="example_label" style="width:82.8pt;padding:.75pt .75pt .75pt .75pt">EXAMPLE 1</td><td valign="top" class="example">
+         <p id="_65c9a509-9a89-4b54-a890-274126aeb55c">Foreign seeds, husks, bran, sand, dust.</p>
+         <ul>
+         <li>A</li>
+         </ul>
+       </td></tr></table>
+       <table id="_bd57bbf1-f948-4bae-b0ce-73c00431f894" class="example"><tr><td width="110pt" valign="top" class="example_label" style="width:82.8pt;padding:.75pt .75pt .75pt .75pt">EXAMPLE 2</td><td valign="top" class="example">
+         <ul>
+         <li>A</li>
+         </ul>
+       </td></tr></table>
+
+       <p>[TERMREF]
+         <a href="#ISO7301">ISO 7301: 2011, 3.1</a>
+           [MODIFICATION]The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here
+       [/TERMREF]</p><p class="TermNum" id="paddy">1.2</p><p class="Terms" style="text-align:left;">paddy</p><p class="AltTerms" style="text-align:left;">paddy rice</p>
+       <p class="AltTerms" style="text-align:left;">rough rice</p>
+       <p class="DeprecatedTerms" style="text-align:left;">DEPRECATED: cargo rice</p>
+       <p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p>
+       <table id="_bd57bbf1-f948-4bae-b0ce-73c00431f893" class="example"><tr><td width="110pt" valign="top" class="example_label" style="width:82.8pt;padding:.75pt .75pt .75pt .75pt">EXAMPLE 1</td><td valign="top" class="example">
+         <ul>
+         <li>A</li>
+         </ul>
+       </td></tr></table>
+       <div class="Note"><p class="Note">Note 1 to entry: The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></div>
+       <div class="Note"><p class="Note">Note 2 to entry: <ul><li>A</li></ul><p id="_19830f33-e46c-42cc-94ca-a5ef101132d5">The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></p></div>
+       <p>[TERMREF]
+         <a href="#ISO7301">ISO 7301: 2011, 3.1</a>
+       [/TERMREF]</p></div>
+           </div>
+         </body>
+       </html>
+
 OUTPUT
   end
 end

data/spec/isodoc/xref_spec.rb

@@ -72,7 +72,7 @@ RSpec.describe IsoDoc do
                <div id="scope">
                  <h1>1.&#160; Scope</h1>
                  <div id="N" class="Note">
-                   <p class="Note"><span class="note_label">NOTE</span>&#160; These results are based on a study carried out on three different types of kernel.</p>
+                   <p><span class="note_label">NOTE</span>&#160; These results are based on a study carried out on three different types of kernel.</p>
                  </div>
                  <p>
                    <a href="#N">Note</a>
@@ -92,8 +92,8 @@ RSpec.describe IsoDoc do
                <div id="widgets">
                  <h1>3.&#160; Widgets</h1>
                  <div id="widgets1">
-           <div id="note1" class="Note"><p class="Note"><span class="note_label">NOTE  1</span>&#160; These results are based on a study carried out on three different types of kernel.</p></div>
-           <div id="note2" class="Note"><p class="Note"><span class="note_label">NOTE  2</span>&#160; These results are based on a study carried out on three different types of kernel.</p></div>
+           <div id="note1" class="Note"><p><span class="note_label">NOTE  1</span>&#160; These results are based on a study carried out on three different types of kernel.</p></div>
+           <div id="note2" class="Note"><p><span class="note_label">NOTE  2</span>&#160; These results are based on a study carried out on three different types of kernel.</p></div>
        <p>    <a href="#note1">Note  1</a> <a href="#note2">Note  2</a> </p>
 
            </div>
@@ -101,11 +101,11 @@ RSpec.describe IsoDoc do
                <br/>
                <div id="annex1" class="Section3">
                  <div id="annex1a">
-           <div id="AN" class="Note"><p class="Note"><span class="note_label">NOTE</span>&#160; These results are based on a study carried out on three different types of kernel.</p></div>
+           <div id="AN" class="Note"><p><span class="note_label">NOTE</span>&#160; These results are based on a study carried out on three different types of kernel.</p></div>
            </div>
                  <div id="annex1b">
-           <div id="Anote1" class="Note"><p class="Note"><span class="note_label">NOTE  1</span>&#160; These results are based on a study carried out on three different types of kernel.</p></div>
-           <div id="Anote2" class="Note"><p class="Note"><span class="note_label">NOTE  2</span>&#160; These results are based on a study carried out on three different types of kernel.</p></div>
+           <div id="Anote1" class="Note"><p><span class="note_label">NOTE  1</span>&#160; These results are based on a study carried out on three different types of kernel.</p></div>
+           <div id="Anote2" class="Note"><p><span class="note_label">NOTE  2</span>&#160; These results are based on a study carried out on three different types of kernel.</p></div>
            </div>
                </div>
              </div>
@@ -190,7 +190,7 @@ RSpec.describe IsoDoc do
                  <h1>1.&#160; Scope</h1>
                  <div id="N" class="figure">
 
-         <img src="rice_images/rice_image1.png"/>
+         <img src="rice_images/rice_image1.png" height="auto" width="auto"/>
          <p class="FigureTitle" align="center">Figure 1&#160;&#8212; Split-it-right sample divider</p></div>
                  <p>
                    <a href="#N">Figure 1</a>
@@ -212,11 +212,11 @@ RSpec.describe IsoDoc do
                  <div id="widgets1">
                <div id="note1" class="figure">
 
-         <img src="rice_images/rice_image1.png"/>
+         <img src="rice_images/rice_image1.png" height="auto" width="auto"/>
          <p class="FigureTitle" align="center">Figure 2&#160;&#8212; Split-it-right sample divider</p></div>
            <div id="note2" class="figure">
 
-         <img src="rice_images/rice_image1.png"/>
+         <img src="rice_images/rice_image1.png" height="auto" width="auto"/>
          <p class="FigureTitle" align="center">Figure 3&#160;&#8212; Split-it-right sample divider</p></div>
          <p>    <a href="#note1">Figure 2</a> <a href="#note2">Figure 3</a> </p>
            </div>
@@ -226,17 +226,17 @@ RSpec.describe IsoDoc do
                  <div id="annex1a">
                <div id="AN" class="figure">
 
-         <img src="rice_images/rice_image1.png"/>
+         <img src="rice_images/rice_image1.png" height="auto" width="auto"/>
          <p class="FigureTitle" align="center">Figure A.1&#160;&#8212; Split-it-right sample divider</p></div>
            </div>
                  <div id="annex1b">
                <div id="Anote1" class="figure">
 
-         <img src="rice_images/rice_image1.png"/>
+         <img src="rice_images/rice_image1.png" height="auto" width="auto"/>
          <p class="FigureTitle" align="center">Figure A.2&#160;&#8212; Split-it-right sample divider</p></div>
            <div id="Anote2" class="figure">
 
-         <img src="rice_images/rice_image1.png"/>
+         <img src="rice_images/rice_image1.png" height="auto" width="auto"/>
          <p class="FigureTitle" align="center">Figure A.3&#160;&#8212; Split-it-right sample divider</p></div>
            </div>
                </div>
@@ -333,11 +333,11 @@ RSpec.describe IsoDoc do
          <div id="N" class="figure">
              <div id="note1" class="figure">
 
-       <img src="rice_images/rice_image1.png"/>
+       <img src="rice_images/rice_image1.png" height="auto" width="auto"/>
        <p class="FigureTitle" align="center">Figure 1-1&#160;&#8212; Split-it-right sample divider</p></div>
          <div id="note2" class="figure">
 
-       <img src="rice_images/rice_image1.png"/>
+       <img src="rice_images/rice_image1.png" height="auto" width="auto"/>
        <p class="FigureTitle" align="center">Figure 1-2&#160;&#8212; Split-it-right sample divider</p></div>
        </div>
        <p>    <a href="#note1">Figure 1-1</a> <a href="#note2">Figure 1-2</a> </p>
@@ -351,11 +351,11 @@ RSpec.describe IsoDoc do
          <div id="AN" class="figure">
              <div id="Anote1" class="figure">
 
-       <img src="rice_images/rice_image1.png"/>
+       <img src="rice_images/rice_image1.png" height="auto" width="auto"/>
        <p class="FigureTitle" align="center">Figure A.1-1&#160;&#8212; Split-it-right sample divider</p></div>
          <div id="Anote2" class="figure">
 
-       <img src="rice_images/rice_image1.png"/>
+       <img src="rice_images/rice_image1.png" height="auto" width="auto"/>
        <p class="FigureTitle" align="center">Figure A.1-2&#160;&#8212; Split-it-right sample divider</p></div>
        </div>
          </div>
@@ -831,9 +831,9 @@ RSpec.describe IsoDoc do
          <a href="http://www.electropedia.org">http://www.electropedia.org</a>
        </p> </li> </ul>
        <p class="TermNum" id="_waxy_rice">2.1</p><p class="Terms" style="text-align:left;">waxy rice</p>
-       <div class="Note"><p class="Note">Note 1 to entry: The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></div><p class="TermNum" id="_nonwaxy_rice">2.2</p><p class="Terms" style="text-align:left;">nonwaxy rice</p>
-       <div class="Note"><p class="Note">Note 1 to entry: The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></div>
-       <div class="Note"><p class="Note">Note 2 to entry: The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></div></div>
+       <div class="Note"><p>Note 1 to entry: The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></div><p class="TermNum" id="_nonwaxy_rice">2.2</p><p class="Terms" style="text-align:left;">nonwaxy rice</p>
+       <div class="Note"><p>Note 1 to entry: The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></div>
+       <div class="Note"><p>Note 2 to entry: The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></div></div>
              </div>
            </body>
        </html>
@@ -963,7 +963,7 @@ RSpec.describe IsoDoc do
     <h1>2.&#160; Normative references</h1>
       <p>There are no normative references in this document.</p>
     </div>
-    <div id="H"><h1>3.&#160; Terms and definitions</h1><p>For the purposes of this document,
+    <div id="H"><h1>3.&#160; Terms, definitions, symbols and abbreviated terms</h1><p>For the purposes of this document,
       the following terms and definitions apply.</p>
     <p>ISO and IEC maintain terminological databases for use in
     standardization at the following addresses:</p>

data/spec/spec_helper.rb

@@ -44,3 +44,20 @@ HTML_HDR = <<~END
             <br/>
             <div class="main-section">
 END
+
+WORD_HDR = <<~END
+       <html xmlns:epub="http://www.idpf.org/2007/ops">
+         <head>
+           <title>test</title>
+         </head>
+         <body lang="EN-US" link="blue" vlink="#954F72">
+           <div class="WordSection1">
+             <p>&#160;</p>
+           </div>
+           <br clear="all" class="section"/>
+           <div class="WordSection2">
+             <p>&#160;</p>
+           </div>
+           <br clear="all" class="section"/>
+           <div class="WordSection3">
+END

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-02 00:00:00.000000000 Z
+date: 2018-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -38,34 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.3.4
-- !ruby/object:Gem::Dependency
-  name: image_size
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mime-types
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -126,16 +98,16 @@ dependencies:
   name: html2doc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: liquid
   requirement: !ruby/object:Gem::Requirement
@@ -334,6 +306,7 @@ files:
 - ".rubocop.ribose.yml"
 - ".rubocop.tb.yml"
 - ".rubocop.yml"
+- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
@@ -418,7 +391,7 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/riboseinc/isodoc
 licenses:
-- MIT
+- BSD-2-Clause
 metadata: {}
 post_install_message: 
 rdoc_options: []