isodoc 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d11b5b991f38839676489ade5b30d9369d21bbeb27950a4e5fcf573f4b521179
-  data.tar.gz: 05de6af9b9f493f3d71dd81684e267a81c8db31c07d55189503af75296d73f10
+  metadata.gz: 6f012ee1dfcb45c453231b1dbafd3eb84f4e3f1703998d7b804a42101fefbc03
+  data.tar.gz: 48fb80967bdbd2265408c90c3fcabcef3e0539dff92d2d68a5422b3787ca5617
 SHA512:
-  metadata.gz: cdf155b3bb0b87a6ee716414c50613b76113e619a107a7eff90dc3af287c94150f322cbfd30a2a96923d580853549a0b6065ea72316b794e568237219e8da879
-  data.tar.gz: e863371fe9dde7d63d72d83c6835de6b64e93d0c2a1a6c739adba2b7c74539f10ccea6aa6c93a62ed79d111444f0ad3647dfaaf15ad7f7afac2973cba5786def
+  metadata.gz: ff221e3f46b2e62a9c6bcb9df4676dfb4757dd73cc7d740d6dc366ec68a26cfa657af226a99592554046d78907ba9260fdd55a29d39e832332248887ad37d45c
+  data.tar.gz: 61e23537cffb488ecd57346c1c47e6db6af63cdb7e9e96d3d7066e959cfea08a8709235ca4d0fce92431e823c5b4e3b94a8f7e7566388b687155d3518a936959

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    isodoc (1.0.0)
+    isodoc (1.0.1)
       asciimath
       html2doc (~> 0.8.11)
       htmlentities (~> 4.3.4)
       liquid
       metanorma (~> 0.3.0)
-      nokogiri (>= 1)
+      nokogiri (>= 1.10.4)
       rake (~> 12.0)
       roman-numerals
       sassc (~> 2)
@@ -74,7 +74,7 @@ GEM
       nenv (~> 0.1)
       shellany (~> 0.0)
     parallel (1.17.0)
-    parser (2.6.3.0)
+    parser (2.6.4.0)
       ast (~> 2.4.0)
     powerpack (0.1.2)
     pry (0.12.2)
@@ -108,7 +108,7 @@ GEM
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.10.1)
     ruby_dep (1.5.0)
-    sassc (2.1.0)
+    sassc (2.2.0)
       ffi (~> 1.9)
     shellany (0.0.1)
     simplecov (0.17.0)

data/isodoc.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "asciimath"
   spec.add_dependency "htmlentities", "~> 4.3.4"
-  spec.add_dependency "nokogiri", ">= 1"
+  spec.add_dependency "nokogiri", ">= 1.10.4"
   spec.add_dependency "thread_safe"
   spec.add_dependency "uuidtools"
   spec.add_dependency "html2doc", "~> 0.8.11"

data/lib/isodoc/convert.rb

@@ -135,7 +135,7 @@ module IsoDoc
     def convert1(docxml, filename, dir)
       anchor_names docxml
       noko do |xml|
-        xml.html do |html|
+        xml.html **{ lang: "#{@lang}" } do |html|
           html.parent.add_namespace("epub", "http://www.idpf.org/2007/ops")
           info docxml, nil
           populate_css()

data/lib/isodoc/function/i18n.rb

@@ -100,10 +100,14 @@ module IsoDoc::Function
     # Not clear if period needs to be localised for zh
     def l10n(x, lang = @lang, script = @script)
       if lang == "zh" && script == "Hans"
-        x.gsub(/ /, "").gsub(/:/, "：").gsub(/,/, "、").
-          gsub(/\(/, "（").gsub(/\)/, "）").
-          gsub(/\[/, "【").gsub(/\]/, "】").
-          gsub(/<b>/, "").gsub("</b>", "")
+        xml = Nokogiri::HTML::DocumentFragment.parse(x)
+        xml.traverse do |n|
+          next unless n.text?
+          n.replace(n.text.gsub(/ /, "").gsub(/:/, "：").gsub(/,/, "、").
+            gsub(/\(/, "（").gsub(/\)/, "）").
+            gsub(/\[/, "【").gsub(/\]/, "】"))
+        end
+        xml.to_xml.gsub(/<b>/, "").gsub("</b>", "").gsub(/<\?[^>]+>/, "")
       else
         x
       end

data/lib/isodoc/function/references.rb

@@ -127,14 +127,6 @@ module IsoDoc::Function
       end
     end
 
-    def norm_ref_preface(f, div)
-      refs = f.elements.select do |e|
-        ["reference", "bibitem"].include? e.name
-      end
-      pref = refs.empty? ? @norm_empty_pref : @norm_with_refs_pref
-      div.p pref
-    end
-
     def norm_ref(isoxml, out, num)
       q = "//bibliography/references[title = 'Normative References' or "\
         "title = 'Normative references']"
@@ -142,7 +134,9 @@ module IsoDoc::Function
       out.div do |div|
         num = num + 1
         clause_name(num, @normref_lbl, div, nil)
-        norm_ref_preface(f, div)
+        f.elements.reject do |e|
+          ["reference", "title", "bibitem"].include? e.name
+        end.each { |e| parse(e, div) }
         biblio_list(f, div, false)
       end
       num

data/lib/isodoc/function/section.rb

@@ -106,36 +106,6 @@ module IsoDoc::Function
       num
     end
 
-    def external_terms_boilerplate(sources)
-      @external_terms_boilerplate.gsub(/%/, sources || "???")
-    end
-
-    def internal_external_terms_boilerplate(sources)
-      @internal_external_terms_boilerplate.gsub(/%/, sources || "??")
-    end
-
-    def term_defs_boilerplate(div, source, term, preface)
-      source.each { |s| @anchors[s["bibitemid"]] or
-                    warn "term source #{s['bibitemid']} not referenced" }
-      if source.empty? && term.nil?
-        div << @no_terms_boilerplate
-      else
-        div << term_defs_boilerplate_cont(source, term)
-      end
-      div << @term_def_boilerplate
-    end
-
-    def term_defs_boilerplate_cont(src, term)
-      sources = sentence_join(src.map do |s|
-        "<a href=##{s["bibitemid"]}>#{anchor(s["bibitemid"], :xref)}</a>" 
-      end)
-      if src.empty? then @internal_terms_boilerplate
-      elsif term.nil? then external_terms_boilerplate(sources)
-      else
-        internal_external_terms_boilerplate(sources)
-      end
-    end
-
     def terms_defs_title(f)
       symbols = f.at(ns(".//definitions"))
       return @termsdefsymbols_lbl if symbols
@@ -150,8 +120,6 @@ module IsoDoc::Function
       out.div **attr_code(id: f["id"]) do |div|
         num = num + 1
         clause_name(num, terms_defs_title(f), div, nil)
-        term_defs_boilerplate(div, isoxml.xpath(ns(".//termdocsource")),
-                              f.at(ns(".//term")), f.at(ns("./p")))
         f.elements.each do |e|
           parse(e, div) unless %w{title source}.include? e.name
         end

data/lib/isodoc/function/table.rb

@@ -71,7 +71,7 @@ module IsoDoc::Function
     # border-left:#{col.zero? ? "#{SW} 1.5pt;" : "none;"}
     # border-right:#{SW} #{col == totalcols && !header ? "1.5" : "1.0"}pt;
 
-    def make_tr_attr(td, row, totalrows)
+    def make_tr_attr(td, row, totalrows, header)
       style = td.name == "th" ? "font-weight:bold;" : ""
       td["align"] and style += "text-align:#{td['align']};"
       rowmax = td["rowspan"] ? row + td["rowspan"].to_i - 1 : row
@@ -80,14 +80,17 @@ module IsoDoc::Function
         border-bottom:#{SW} #{rowmax == totalrows ? '1.5' : '1.0'}pt;
         padding:0;
       STYLE
+      header and scope = (td["colspan"] ? "colgroup" : "col")
+      !header and td.name == "th" and scope =
+        (td["rowspan"] ? "rowgroup" : "row")
       { rowspan: td["rowspan"], colspan: td["colspan"],
-        style: style.gsub(/\n/, "") }
+        style: style.gsub(/\n/, ""), scope: scope }
     end
 
-    def tr_parse(node, out, ord, totalrows, _header)
+    def tr_parse(node, out, ord, totalrows, header)
       out.tr do |r|
         node.elements.each do |td|
-          attrs = make_tr_attr(td, ord, totalrows - 1)
+          attrs = make_tr_attr(td, ord, totalrows - 1, header)
           r.send td.name, **attr_code(attrs) do |entry|
             td.children.each { |n| parse(n, entry) }
           end

data/lib/isodoc/function/utils.rb

@@ -88,7 +88,8 @@ module IsoDoc::Function
       if array.length == 1
         array[0]
       else
-        l10n("#{array[0..-2].join(', ')} #{@and_lbl} #{array.last}")
+        IsoDoc::Function::I18n::l10n("#{array[0..-2].join(', ')} #{@and_lbl} #{array.last}",
+                                    @lang, @script)
       end
     end
 

data/lib/isodoc/html_function/html.rb

@@ -230,11 +230,12 @@ module IsoDoc::HtmlFunction
     def footnote_backlinks(docxml)
       seen = {}
       docxml.xpath('//a[@epub:type = "footnote"]').each_with_index do |x, i|
-        next if seen[x["href"]]
-        seen[x["href"]] = true
+        seen[x["href"]] and next or seen[x["href"]] = true
         fn = docxml.at(%<//*[@id = '#{x['href'].sub(/^#/, '')}']>) || next
-        x["id"] || x["id"] = "fnref:#{i + 1}"
-        fn.elements.first.children.first.previous = x.dup
+        xdup = x.dup
+        xdup.remove["id"]
+        fn.elements.first.children.first.previous = xdup
+        x["id"] ||= "fnref:#{i + 1}"
         fn.add_child "<a href='##{x['id']}'>&#x21A9;</a>"
       end
       docxml

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "1.0.0".freeze
+  VERSION = "1.0.1".freeze
 end

data/lib/isodoc/word_function/body.rb

@@ -77,7 +77,7 @@ module IsoDoc::WordFunction
       tfoot.xpath(".//td").last
     end
 
-    def make_tr_attr(td, row, totalrows)
+    def make_tr_attr(td, row, totalrows, _header)
       style = td.name == "th" ? "font-weight:bold;" : ""
       rowmax = td["rowspan"] ? row + td["rowspan"].to_i - 1 : row
       style += <<~STYLE

data/spec/isodoc/blocks_spec.rb

@@ -36,7 +36,7 @@ RSpec.describe IsoDoc do
     </foreword></preface>
     </iso-standard>
     INPUT
-           <html xmlns:epub="http://www.idpf.org/2007/ops">
+           <html xmlns:epub="http://www.idpf.org/2007/ops" lang="en">
          <head/>
          <body lang="EN-US" link="blue" vlink="#954F72">
            <div class="WordSection1">
@@ -194,7 +194,7 @@ INPUT
     </foreword></preface>
     </iso-standard>
     INPUT
-           <html xmlns:epub="http://www.idpf.org/2007/ops">
+           <html xmlns:epub="http://www.idpf.org/2007/ops" lang="en">
          <head/>
          <body lang="EN-US" link="blue" vlink="#954F72">
            <div class="WordSection1">
@@ -306,7 +306,7 @@ B</pre>
     </foreword></preface>
     </iso-standard>
     INPUT
-           <html xmlns:epub="http://www.idpf.org/2007/ops">
+           <html xmlns:epub="http://www.idpf.org/2007/ops" lang="en">
          <head/>
          <body lang="EN-US" link="blue" vlink="#954F72">
            <div class="WordSection1">
@@ -446,7 +446,7 @@ B</pre>
     </foreword></preface>
     </iso-standard>
     INPUT
-    <html xmlns:epub="http://www.idpf.org/2007/ops">
+    <html xmlns:epub="http://www.idpf.org/2007/ops" lang="en">
          <head/>
          <body lang="EN-US" link="blue" vlink="#954F72">
            <div class="WordSection1">
@@ -665,7 +665,7 @@ World</p>
     </foreword></preface>
     </iso-standard>
     INPUT
-           <html xmlns:epub="http://www.idpf.org/2007/ops">
+           <html xmlns:epub="http://www.idpf.org/2007/ops" lang="en">
          <head/>
            <body lang="EN-US" link="blue" vlink="#954F72">
              <div class="WordSection1">
@@ -740,8 +740,7 @@ World</p>
     INPUT
     #{HTML_HDR}
                <p class="zzSTDTitle1"/>
-               <div><h1>1.&#160; Terms and definitions</h1><p>For the purposes of this document,
-           the following terms and definitions apply.</p>
+               <div><h1>1.&#160; Terms and definitions</h1>
        <p class="TermNum" id="_extraneous_matter">1.1.</p><p class="Terms" style="text-align:left;">extraneous matter</p><p class="AltTerms" style="text-align:left;">EM</p>
 
        <p id="_318b3939-be09-46c4-a284-93f9826b981e">&lt;rice&gt; organic and inorganic components other than whole or broken kernels</p>

data/spec/isodoc/footnotes_spec.rb

@@ -59,7 +59,7 @@ RSpec.describe IsoDoc do
     </preface>
     </iso-standard>
     INPUT
-           <html xmlns:epub="http://www.idpf.org/2007/ops">
+           <html xmlns:epub="http://www.idpf.org/2007/ops" lang="en">
          <head/>
            <body lang="EN-US" link="blue" vlink="#954F72">
              <div class="WordSection1">

data/spec/isodoc/i18n_spec.rb

@@ -86,10 +86,8 @@ RSpec.describe IsoDoc do
                </div>
                <div>
                  <h1>2.&#160; Normative references</h1>
-                 <p>There are no normative references in this document.</p>
                </div>
-               <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>
+               <div id="H"><h1>3.&#160; Terms, definitions, symbols and abbreviated terms</h1>
        <div id="I">
           <h2>3.1. Normal Terms</h2>
           <p class="TermNum" id="J">3.1.1.</p>
@@ -204,7 +202,7 @@ RSpec.describe IsoDoc do
        </bibliography>
        </iso-standard>
         INPUT
-        #{HTML_HDR.sub(/<body lang="en">/, '<body lang="tlh">')}
+        #{HTML_HDR.gsub(/ lang="en">/, ' lang="tlh">')}
                <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
@@ -224,10 +222,8 @@ RSpec.describe IsoDoc do
                </div>
                <div>
                  <h1>2.&#160; Normative references</h1>
-                 <p>There are no normative references in this document.</p>
                </div>
-               <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>
+               <div id="H"><h1>3.&#160; Terms, definitions, symbols and abbreviated terms</h1>
        <div id="I">
           <h2>3.1. Normal Terms</h2>
           <p class="TermNum" id="J">3.1.1.</p>
@@ -342,7 +338,7 @@ RSpec.describe IsoDoc do
        </bibliography>
        </iso-standard>
         INPUT
-            #{HTML_HDR.sub(/<body lang="en">/, '<body lang="fr">')}
+            #{HTML_HDR.gsub(/ lang="en">/, ' lang="fr">')}
                <br/>
                <div>
                  <h1 class="ForewordTitle">Avant-propos</h1>
@@ -362,9 +358,8 @@ RSpec.describe IsoDoc do
                </div>
                <div>
                  <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, 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>
+               <div id="H"><h1>3.&#160; Terms, d&#233;finitions, symboles et termes abr&#233;g&#233;s</h1>
        <div id="I">
           <h2>3.1. Normal Terms</h2>
           <p class="TermNum" id="J">3.1.1.</p>
@@ -490,7 +485,7 @@ RSpec.describe IsoDoc do
        </bibliography>
        </iso-standard>
         INPUT
-    #{HTML_HDR.sub(/<body lang="en">/, '<body lang="zh">')}
+    #{HTML_HDR.gsub(/ lang="en">/, ' lang="zh">')}
                <br/>
                <div>
                  <h1 class="ForewordTitle">&#21069;&#35328;</h1>
@@ -512,10 +507,9 @@ RSpec.describe IsoDoc do
                </div>
                <div>
                  <h1>2.&#160; &#35268;&#33539;&#24615;&#24341;&#29992;&#25991;&#20214;</h1>
-                 <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;&#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>
+               <div id="H"><h1>3.&#160; &#26415;&#35821;&#12289;&#23450;&#20041;&#12289;&#31526;&#21495;&#12289;&#20195;&#21495;&#21644;&#32553;&#30053;&#35821;</h1>
        <div id="I">
                 <h2>3.1. Normal Terms</h2>
                 <p class="TermNum" id="J">3.1.1.</p>

data/spec/isodoc/inline_spec.rb

@@ -213,7 +213,6 @@ RSpec.describe IsoDoc do
                <p class="zzSTDTitle1"/>
                <div>
                  <h1>1.&#160; Normative references</h1>
-                 <p>The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
                  <p id="ISO712" class="NormRef">ISO 712, <i> Cereals and cereal products</i></p>
                </div>
              </div>
@@ -276,7 +275,6 @@ RSpec.describe IsoDoc do
                <p class="zzSTDTitle1"/>
                <div>
                  <h1>1.&#160; Normative references</h1>
-                 <p>The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
                  <p id="ISO712" class="NormRef">ISO 712, <i> Cereals and cereal products</i></p>
                </div>
              </div>

data/spec/isodoc/lists_spec.rb

@@ -193,7 +193,7 @@ RSpec.describe IsoDoc do
 </foreword></preface>
 </iso-standard>
     INPUT
-           <html xmlns:epub="http://www.idpf.org/2007/ops">
+           <html xmlns:epub="http://www.idpf.org/2007/ops" lang="en">
           <head/>
             <body lang="EN-US" link="blue" vlink="#954F72">
               <div class="WordSection1">

data/spec/isodoc/postproc_spec.rb

@@ -260,8 +260,7 @@ RSpec.describe IsoDoc do
     expect(word).to be_equivalent_to <<~"OUTPUT"
            <div class="WordSection3">
                <p class="zzSTDTitle1"></p>
-               <div><a name="_terms_and_definitions" id="_terms_and_definitions"></a><h1>1.<span style="mso-tab-count:1">&#xA0; </span>Terms and definitions</h1><p class="MsoNormal">For the purposes of this document,
-           the following terms and definitions apply.</p>
+               <div><a name="_terms_and_definitions" id="_terms_and_definitions"></a><h1>1.<span style="mso-tab-count:1">&#xA0; </span>Terms and definitions</h1>
        <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>
@@ -533,12 +532,12 @@ TOCLEVEL
               </div>
              </div>
              <aside id="fn:3" class="footnote">
-         <p id="_ff27c067-2785-4551-96cf-0a73530ff1e6"><a rel="footnote" href="#fn:3" epub:type="footnote" id="fnref:1">
+         <p id="_ff27c067-2785-4551-96cf-0a73530ff1e6"><a rel="footnote" href="#fn:3" epub:type="footnote">
                  <sup>1</sup>
                </a>This is a footnote.</p>
        <a href="#fnref:1">&#x21A9;</a></aside>
              <aside id="fn:2" class="footnote">
-         <p id="_ff27c067-2785-4551-96cf-0a73530ff1e6"><a rel="footnote" href="#fn:2" epub:type="footnote" id="fnref:2"><sup>2</sup></a>Formerly denoted as 15 % (m/m).</p>
+         <p id="_ff27c067-2785-4551-96cf-0a73530ff1e6"><a rel="footnote" href="#fn:2" epub:type="footnote"><sup>2</sup></a>Formerly denoted as 15 % (m/m).</p>
        <a href="#fnref:2">&#x21A9;</a></aside>
 
            </main>

data/spec/isodoc/ref_spec.rb

@@ -16,6 +16,7 @@ RSpec.describe IsoDoc do
   </p>
     </foreword></preface>
     <bibliography><references id="_normative_references" obligation="informative"><title>Normative References</title>
+    <p>The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
 <bibitem id="ISO712" type="standard">
   <title format="text/plain">Cereals or cereal products</title>
   <title type="main" format="text/plain">Cereals and cereal products</title>
@@ -122,24 +123,4 @@ RSpec.describe IsoDoc do
     OUTPUT
   end
 
-   it "processes empty IsoXML Normative references" do
-    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
-    <iso-standard xmlns="http://riboseinc.com/isoxml">
-    <bibliography><references id="_normative_references" obligation="informative"><title>Normative References</title>
-    </references>
-    </bibliography>
-    </iso-standard>
-    INPUT
-      #{HTML_HDR}
-               <p class="zzSTDTitle1"/>
-               <div>
-                 <h1>1.&#160; Normative references</h1>
-                 <p>There are no normative references in this document.</p>
-               </div>
-             </div>
-           </body>
-       </html>
-    OUTPUT
-   end
-
 end

data/spec/isodoc/section_spec.rb

@@ -8,7 +8,7 @@ RSpec.describe IsoDoc do
           <sections/>
         </iso-standard>
     INPUT
-    <html xmlns:epub="http://www.idpf.org/2007/ops">
+    <html xmlns:epub="http://www.idpf.org/2007/ops" lang="en">
   <head/>
   <body lang="en">
     <div class="title-section">
@@ -121,10 +121,8 @@ RSpec.describe IsoDoc do
                 </div>
                 <div>
                   <h1>2.&#160; Normative references</h1>
-                  <p>There are no normative references in this document.</p>
                 </div>
-                <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>
+                <div id="H"><h1>3.&#160; Terms, definitions, symbols and abbreviated terms</h1>
         <div id="I">
            <h2>3.1. Normal Terms</h2>
            <p class="TermNum" id="J">3.1.1.</p>
@@ -246,7 +244,7 @@ OUTPUT
        </bibliography>
        </iso-standard>
     INPUT
-          <html xmlns:epub="http://www.idpf.org/2007/ops">
+          <html xmlns:epub="http://www.idpf.org/2007/ops" lang="en">
          <head/>
            <body lang="EN-US" link="blue" vlink="#954F72">
              <div class="WordSection1">
@@ -281,10 +279,8 @@ OUTPUT
                </div>
                <div>
                  <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, definitions, symbols and abbreviated terms</h1><p>For the purposes of this document,
-           the following terms and definitions apply.</p>
+               <div id="H"><h1>3.<span style="mso-tab-count:1">&#160; </span>Terms, definitions, symbols and abbreviated terms</h1>
        <div id="I">
           <h2>3.1. Normal Terms</h2>
           <p class="TermNum" id="J">3.1.1.</p>
@@ -424,10 +420,8 @@ OUTPUT
              </div>
              <div>
                <h1>Normative references</h1>
-               <p>There are no normative references in this document.</p>
              </div>
-             <div id="H"><h1>Terms, definitions, symbols and abbreviated terms</h1><p>For the purposes of this document,
-           the following terms and definitions apply.</p>
+             <div id="H"><h1>Terms, definitions, symbols and abbreviated terms</h1>
        <div id="I"><h2>Normal Terms</h2>
 
           <p class="TermNum" id="J">3.1.1.</p>
@@ -493,8 +487,7 @@ OUTPUT
     INPUT
     #{HTML_HDR}
                <p class="zzSTDTitle1"/>
-               <div id="H"><h1>1.&#160; Terms and definitions</h1><p>For the purposes of this document,
-           the following terms and definitions apply.</p>
+               <div id="H"><h1>1.&#160; Terms and definitions</h1>
        <p class="TermNum" id="J">1.1.</p>
          <p class="Terms" style="text-align:left;">Term2</p>
        </div>
@@ -504,125 +497,6 @@ OUTPUT
     OUTPUT
   end
 
-    it "warn about external source for terms & definitions that does not point anywhere" do
-        expect{ IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true) }.to output(/not referenced/).to_stderr
-               <iso-standard xmlns="http://riboseinc.com/isoxml">
-         <termdocsource type="inline" bibitemid="ISO712"/>
-       <sections>
-       <terms id="H" obligation="normative"><title>Terms, Definitions, Symbols and Abbreviated Terms</title>
-         <term id="J">
-         <preferred>Term2</preferred>
-       </term>
-       </terms>
-        </sections>
-</iso-standard>
-INPUT
-end
-
-  it "processes terms & definitions with external source" do
-        expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
-               <iso-standard xmlns="http://riboseinc.com/isoxml">
-         <termdocsource type="inline" bibitemid="ISO712"/>
-       <sections>
-       <terms id="H" obligation="normative"><title>Terms, Definitions, Symbols and Abbreviated Terms</title>
-         <term id="J">
-         <preferred>Term2</preferred>
-       </term>
-       </terms>
-        </sections>
-        <bibliography>
-        <references id="_normative_references" obligation="informative"><title>Normative References</title>
-<bibitem id="ISO712" type="standard">
-  <title format="text/plain">Cereals and cereal products?~@~I?~@~T?~@~IDetermination of moisture content?~@~I?~@~T?~@~IReference method</title>
-  <docidentifier>ISO 712</docidentifier>
-  <contributor>
-    <role type="publisher"/>
-    <organization>
-      <name>International Organization for Standardization</name>
-    </organization>
-  </contributor>
-</bibitem></references>
-</bibliography>
-        </iso-standard>
-    INPUT
-    #{HTML_HDR}
-               <p class="zzSTDTitle1"/>
-               <div>
-                 <h1>1.&#160; Normative references</h1>
-                 <p>The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
-                 <p id="ISO712" class="NormRef">ISO 712, <i> Cereals and cereal products?~@~I?~@~T?~@~IDetermination of moisture content?~@~I?~@~T?~@~IReference method</i></p>
-               </div>
-               <div id="H"><h1>2.&#160; Terms and definitions</h1><p>For the purposes of this document, the terms and definitions
-         given in <a href="#ISO712">ISO 712</a> and the following apply.</p>
-       <p class="TermNum" id="J">2.1.</p>
-                <p class="Terms" style="text-align:left;">Term2</p>
-              </div>
-             </div>
-           </body>
-       </html>
-    OUTPUT
-  end
-
-  it "processes empty terms & definitions with external source" do
-        expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
-               <iso-standard xmlns="http://riboseinc.com/isoxml">
-         <termdocsource type="inline" bibitemid="ISO712"/>
-         <termdocsource type="inline" bibitemid="ISO712"/>
-         <termdocsource type="inline" bibitemid="ISO712"/>
-       <sections>
-       <terms id="H" obligation="normative"><title>Terms, Definitions, Symbols and Abbreviated Terms</title>
-       </terms>
-        </sections>
-        <bibliography>
-        <references id="_normative_references" obligation="informative"><title>Normative References</title>
-<bibitem id="ISO712" type="standard">
-  <title format="text/plain">Cereals and cereal products?~@~I?~@~T?~@~IDetermination of moisture content?~@~I?~@~T?~@~IReference method</title>
-  <docidentifier>ISO 712</docidentifier>
-  <contributor>
-    <role type="publisher"/>
-    <organization>
-      <abbreviation>ISO</abbreviation>
-    </organization>
-  </contributor>
-</bibitem></references>
-</bibliography>
-        </iso-standard>
-    INPUT
-    #{HTML_HDR}
-               <p class="zzSTDTitle1"/>
-               <div>
-                 <h1>1.&#160; Normative references</h1>
-                 <p>The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
-                 <p id="ISO712" class="NormRef">ISO 712, <i> Cereals and cereal products?~@~I?~@~T?~@~IDetermination of moisture content?~@~I?~@~T?~@~IReference method</i></p>
-               </div>
-               <div id="H"><h1>2.&#160; Terms and definitions</h1><p>For the purposes of this document,
-         the terms and definitions given in <a href="#ISO712">ISO 712</a>, <a href="#ISO712">ISO 712</a> and <a href="#ISO712">ISO 712</a> apply.</p>
-       </div>
-             </div>
-           </body>
-       </html>
-    OUTPUT
-  end
-
-
-  it "processes empty terms & definitions" do
-        expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
-               <iso-standard xmlns="http://riboseinc.com/isoxml">
-       <sections>
-       <terms id="H" obligation="normative"><title>Terms, Definitions, Symbols and Abbreviated Terms</title>
-       </terms>
-        </sections>
-        </iso-standard>
-    INPUT
-    #{HTML_HDR}
-               <p class="zzSTDTitle1"/>
-               <div id="H"><h1>1.&#160; Terms and definitions</h1><p>No terms and definitions are listed in this document.</p>
-       </div>
-             </div>
-           </body>
-       </html>
-    OUTPUT
-  end
 
     it "processes inline section headers" do
     expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"

data/spec/isodoc/table_spec.rb

@@ -26,7 +26,7 @@ RSpec.describe IsoDoc do
     </thead>
     <tbody>
     <tr>
-      <td align="left">Number of laboratories retained after eliminating outliers</td>
+      <th align="left">Number of laboratories retained after eliminating outliers</td>
       <td align="center">13</td>
       <td align="center">11</td>
       <td align="center">13</td>
@@ -71,21 +71,21 @@ RSpec.describe IsoDoc do
                <table id="tableD-1" class="MsoISOTable" style="border-width:1px;border-spacing:0;" title="tool tip">
                  <thead>
                    <tr>
-                     <td rowspan="2" style="text-align:left;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;padding:0;">Description</td>
-                     <td colspan="4" style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;padding:0;">Rice sample</td>
+                     <td rowspan="2" style="text-align:left;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;padding:0;" scope="col">Description</td>
+                     <td colspan="4" style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;padding:0;" scope="colgroup">Rice sample</td>
                    </tr>
                    <tr>
-                     <td style="text-align:left;border-top:none;border-bottom:solid windowtext 1.5pt;padding:0;">Arborio</td>
-                     <td style="text-align:center;border-top:none;border-bottom:solid windowtext 1.5pt;padding:0;">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: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>
          <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;">Balilla<a href="#tableD-1a" class="TableFootnoteRef">a</a></td>
-                     <td style="text-align:center;border-top:none;border-bottom:solid windowtext 1.5pt;padding:0;">Thaibonnet</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>
+                     <td style="text-align:center;border-top:none;border-bottom:solid windowtext 1.5pt;padding:0;" scope="col">Thaibonnet</td>
                    </tr>
                  </thead>
                  <tbody>
                    <tr>
-                     <td style="text-align:left;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;padding:0;">Number of laboratories retained after eliminating outliers</td>
+                     <th style="font-weight:bold;text-align:left;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;padding:0;" scope="row">Number of laboratories retained after eliminating outliers</td>
                      <td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;padding:0;">13</td>
                      <td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;padding:0;">11</td>
                      <td style="text-align:center;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;padding:0;">13</td>
@@ -192,7 +192,7 @@ RSpec.describe IsoDoc do
 </preface>
 </iso-standard>
     INPUT
-          <html xmlns:epub="http://www.idpf.org/2007/ops">
+          <html xmlns:epub="http://www.idpf.org/2007/ops" lang="en">
          <head/>
            <body lang="EN-US" link="blue" vlink="#954F72">
              <div class="WordSection1">

data/spec/isodoc/terms_spec.rb

@@ -6,6 +6,7 @@ RSpec.describe IsoDoc do
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <sections>
     <terms id="_terms_and_definitions" obligation="normative"><title>Terms and Definitions</title>
+    <p>For the purposes of this document, the following terms and definitions apply.</p>
 
 <term id="paddy1"><preferred>paddy</preferred>
 <domain>rice</domain>
@@ -100,6 +101,7 @@ OUTPUT
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <sections>
     <terms id="_terms_and_definitions" obligation="normative"><title>Terms and Definitions</title>
+    <p>For the purposes of this document, the following terms and definitions apply.</p>
 
 <term id="paddy1"><preferred>paddy</preferred>
 <domain>rice</domain>

data/spec/isodoc/xref_spec.rb

@@ -165,7 +165,7 @@ RSpec.describe IsoDoc do
                  <a href="#N">Note</a>
                </p>
              </div>
-             <div id="terms"><h1>2.&#160; Terms and definitions</h1><p>No terms and definitions are listed in this document.</p>
+             <div id="terms"><h1>2.&#160; Terms and definitions</h1>
        </div>
              <div id="widgets">
                <h1>3.&#160; Widgets</h1>
@@ -304,7 +304,7 @@ RSpec.describe IsoDoc do
                    <a href="#N">Figure 2</a>
                  </p>
                </div>
-               <div id="terms"><h1>2.&#160; Terms and definitions</h1><p>No terms and definitions are listed in this document.</p>
+               <div id="terms"><h1>2.&#160; Terms and definitions</h1>
        </div>
                <div id="widgets">
                  <h1>3.&#160; Widgets</h1>
@@ -415,7 +415,7 @@ RSpec.describe IsoDoc do
                <div id="scope">
                  <h1>1.&#160; Scope</h1>
                </div>
-               <div id="terms"><h1>2.&#160; Terms and definitions</h1><p>No terms and definitions are listed in this document.</p>
+               <div id="terms"><h1>2.&#160; Terms and definitions</h1>
        </div>
                <div id="widgets">
                  <h1>3.&#160; Widgets</h1>
@@ -557,7 +557,7 @@ RSpec.describe IsoDoc do
                    <a href="#N">Example</a>
                  </p>
                </div>
-               <div id="terms"><h1>2.&#160; Terms and definitions</h1><p>No terms and definitions are listed in this document.</p>
+               <div id="terms"><h1>2.&#160; Terms and definitions</h1>
        </div>
                <div id="widgets">
                  <h1>3.&#160; Widgets</h1>
@@ -688,7 +688,7 @@ RSpec.describe IsoDoc do
                    <a href="#N">Formula (2)</a>
                  </p>
                </div>
-               <div id="terms"><h1>2.&#160; Terms and definitions</h1><p>No terms and definitions are listed in this document.</p>
+               <div id="terms"><h1>2.&#160; Terms and definitions</h1>
        </div>
                <div id="widgets">
                  <h1>3.&#160; Widgets</h1>
@@ -815,7 +815,7 @@ RSpec.describe IsoDoc do
           <a href="#N">Requirement 2</a>
         </p>
       </div>
-      <div id="terms"><h1>2.&#160; Terms and definitions</h1><p>No terms and definitions are listed in this document.</p>
+      <div id="terms"><h1>2.&#160; Terms and definitions</h1>
 </div>
       <div id="widgets">
         <h1>3.&#160; Widgets</h1>
@@ -952,7 +952,7 @@ OUTPUT
           <a href="#N">Recommendation 2</a>
         </p>
       </div>
-      <div id="terms"><h1>2.&#160; Terms and definitions</h1><p>No terms and definitions are listed in this document.</p>
+      <div id="terms"><h1>2.&#160; Terms and definitions</h1>
 </div>
       <div id="widgets">
         <h1>3.&#160; Widgets</h1>
@@ -1089,7 +1089,7 @@ OUTPUT
           <a href="#N">Permission 2</a>
         </p>
       </div>
-      <div id="terms"><h1>2.&#160; Terms and definitions</h1><p>No terms and definitions are listed in this document.</p>
+      <div id="terms"><h1>2.&#160; Terms and definitions</h1>
 </div>
       <div id="widgets">
         <h1>3.&#160; Widgets</h1>
@@ -1395,7 +1395,7 @@ OUTPUT
                    <a href="#N">Table 2</a>
                  </p>
                </div>
-               <div id="terms"><h1>2.&#160; Terms and definitions</h1><p>No terms and definitions are listed in this document.</p>
+               <div id="terms"><h1>2.&#160; Terms and definitions</h1>
        </div>
                <div id="widgets">
                  <h1>3.&#160; Widgets</h1>
@@ -1466,8 +1466,7 @@ OUTPUT
                <div id="scope">
                  <h1>1.&#160; Scope</h1>
                </div>
-               <div id="terms"><h1>2.&#160; Terms and definitions</h1><p>For the purposes of this document,
-           the following terms and definitions apply.</p>
+               <div id="terms"><h1>2.&#160; Terms and definitions</h1>
        <p class="TermNum" id="_waxy_rice">2.1.</p><p class="Terms" style="text-align:left;">waxy 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><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>
@@ -1596,10 +1595,8 @@ OUTPUT
     </div>
     <div>
     <h1>2.&#160; Normative references</h1>
-      <p>There are no normative references in this document.</p>
     </div>
-    <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>
+    <div id="H"><h1>3.&#160; Terms, definitions, symbols and abbreviated terms</h1>
        <div id="I">
           <h2>3.1. Normal Terms</h2>
           <p class="TermNum" id="J">3.1.1.</p>
@@ -1745,7 +1742,7 @@ OUTPUT
          <li><p>A</p></li>
        </ol>
              </div>
-             <div id="terms"><h1>2.&#160; Terms and definitions</h1><p>No terms and definitions are listed in this document.</p>
+             <div id="terms"><h1>2.&#160; Terms and definitions</h1>
        </div>
              <div id="widgets">
                <h1>3.&#160; Widgets</h1>
@@ -1876,7 +1873,7 @@ OUTPUT
          <li id="N"><p>A</p></li>
        </ol>
              </div>
-             <div id="terms"><h1>2.&#160; Terms and definitions</h1><p>No terms and definitions are listed in this document.</p>
+             <div id="terms"><h1>2.&#160; Terms and definitions</h1>
        </div>
              <div id="widgets">
                <h1>3.&#160; Widgets</h1>

data/spec/spec_helper.rb

@@ -30,7 +30,7 @@ def strip_guid(x)
 end
 
 HTML_HDR = <<~END
-        <html xmlns:epub="http://www.idpf.org/2007/ops">
+        <html xmlns:epub="http://www.idpf.org/2007/ops" lang="en">
           <head/>
           <body lang="en">
             <div class="title-section">
@@ -45,7 +45,7 @@ HTML_HDR = <<~END
 END
 
 WORD_HDR = <<~END
-       <html xmlns:epub="http://www.idpf.org/2007/ops">
+       <html xmlns:epub="http://www.idpf.org/2007/ops" lang="en">
          <head/>
          <body lang="EN-US" link="blue" vlink="#954F72">
            <div class="WordSection1">

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-20 00:00:00.000000000 Z
+date: 2019-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: 1.10.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: 1.10.4
 - !ruby/object:Gem::Dependency
   name: thread_safe
   requirement: !ruby/object:Gem::Requirement