isodoc 1.0.24 → 1.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50ac1215a8065519d1dbab07c61a8c4e84dbc90923300bef4f6e44e4b9a8a843
-  data.tar.gz: b89e80351f424c11fb7cb2b92c838a8b8b05f2791a1f91a1d531b14611632229
+  metadata.gz: b0256be2230e0c8757987eb82dee6f8ced68e1cc8794964fabbc446e78d53195
+  data.tar.gz: a8bc10c2952aacf1542b3a4a1edae6c363bee78604dea3c541f9fd769031ea13
 SHA512:
-  metadata.gz: d5ca6cf434f62383545145ccb02adccc060cc9fc5b79478655a5eaa21ca03332f1032baa87abc670935a586fa2cd957f3b8c9358e40802f33dcbc978e8da4b0a
-  data.tar.gz: 01f839c290c1e557a162e2ae43aba2c8ecb291b86664759d72eeacd80b1f338734ce470827cd35485446b589f77b637a5cece6f3118b0855d2494f7537adc1e1
+  metadata.gz: b54f7daa32cc4e7e80a560dfd660f76bf4acae581cda2c3b7f89012ab368da2d0951dec308982bea80e07b1e9d59eed1d170aecae686f42b82f31843a9fff4e9
+  data.tar.gz: 75bceea7c655e1bf34de59ed6eb185596966c70b09f4da3c786c80fb57394a8e28c7f87cd47b1a795bee0b5e72d08f372981c587f27e3fb31240a96668cebeaf

data/.github/workflows/macos.yml

@@ -29,10 +29,10 @@ jobs:
       - name: Use Node
         uses: actions/setup-node@v1
         with:
-          node-version: '8'
+          node-version: '12'
       - name: Install Puppeteer
         run: |
-          npm install -g puppeteer
+          npm install -g puppeteer@3.0.1
       - name: Run specs
         run: |
           bundle exec rake

data/.github/workflows/ubuntu.yml

@@ -29,10 +29,12 @@ jobs:
       - name: Use Node
         uses: actions/setup-node@v1
         with:
-          node-version: '8'
+          node-version: '12'
       - name: Install Puppeteer
         run: |
-          npm install -g puppeteer
+          sudo apt-get update
+          sudo apt-get install libgbm1
+          npm install -g puppeteer@3.0.1
       - name: Run specs
         run: |
           bundle exec rake

data/.github/workflows/windows.yml

@@ -31,10 +31,10 @@ jobs:
       - name: Use Node
         uses: actions/setup-node@v1
         with:
-          node-version: '8'
+          node-version: '12'
       - name: Install Puppeteer
         run: |
-          npm install -g puppeteer
+          npm install -g puppeteer@3.0.1
       - name: Run specs
         run: |
           bundle exec rake

data/lib/isodoc-yaml/i18n-en.yaml

@@ -6,7 +6,9 @@ introduction: Introduction
 foreword: Foreword
 abstract: Abstract
 termsdef: Terms and definitions
-termsdefsymbols: Terms, definitions, symbols and abbreviated terms
+termsdefsymbolsabbrev: Terms, definitions, symbols and abbreviated terms
+termsdefsymbols: Terms, definitions and symbols
+termsdefabbrev: Terms, definitions and abbreviated terms
 normref: Normative references
 bibliography: Bibliography
 clause: Clause

data/lib/isodoc-yaml/i18n-fr.yaml

@@ -6,7 +6,9 @@ introduction: Introduction
 foreword: Avant-propos
 abstract: Résumé
 termsdef: Terms et définitions
-termsdefsymbols: Terms, définitions, symboles et termes abrégés
+termsdefsymbolsabbrev: Terms, définitions, symboles et termes abrégés
+termsdefsymbols: Terms, définitions et symboles
+termsdefabbrev: Terms, définitions et termes abrégés
 normref: Références normatives
 bibliography: Bibliographie
 clause: Article

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

@@ -6,7 +6,9 @@ introduction: 引言
 foreword: 前言
 abstract: 摘要
 termsdef: 术语和定义
-termsdefsymbols: 术语、定义、符号、代号和缩略语
+termsdefsymbolsabbrev: 术语、定义、符号、代号和缩略语
+termsdefsymbols: 术语、定义、符号和代号
+termsdefabbrev: 术语、定义、符号和缩略语
 normref: 规范性引用文件
 bibliography: 参考文献
 clause: 条

data/lib/isodoc/convert.rb

@@ -48,6 +48,7 @@ module IsoDoc
       @olstyle = options[:olstyle]
       @datauriimage = options[:datauriimage]
       @suppressheadingnumbers = options[:suppressheadingnumbers]
+      @break_up_urls_in_tables = options[:break_up_urls_in_tables] == "true"
       @termdomain = ""
       @termexample = false
       @note = false

data/lib/isodoc/function/cleanup.rb

@@ -20,6 +20,7 @@ module IsoDoc::Function
     end
 
     def table_long_strings_cleanup(docxml)
+      return unless @break_up_urls_in_tables == true
       docxml.xpath("//td | //th").each do |d|
         d.traverse do |n|
           next unless n.text?
@@ -30,6 +31,7 @@ module IsoDoc::Function
     end
 
     def break_up_long_strings(t)
+      return t if t.match(/^\s*$/)
       t.split(/(?=\s)/).map do |w|
         (/^\s*$/.match(t) or w.size < 30) ? w :
           w.scan(/.{,30}/).map do |w1|

data/lib/isodoc/function/inline.rb

@@ -107,6 +107,14 @@ module IsoDoc::Function
       end
     end
 
+    def origin_parse(node, out)
+      if t = node.at(ns("./termref"))
+        termrefelem_parse(t, out)
+      else
+        eref_parse(node, out)
+      end
+    end
+
     def termrefelem_parse(node, out)
       out << "Termbase #{node['base']}, term ID #{node['target']}"
     end

data/lib/isodoc/function/section.rb

@@ -109,20 +109,29 @@ module IsoDoc::Function
       num
     end
 
-    def terms_defs_title(f)
-      symbols = f.at(ns(".//definitions"))
-      return @termsdefsymbols_lbl if symbols
-      @termsdef_lbl
-    end
-
     TERM_CLAUSE = "//sections/terms | "\
       "//sections/clause[descendant::terms]".freeze
 
+    def term_def_title(title)
+      case title&.text
+      when "Terms, definitions, symbols and abbreviated terms"
+        @labels["termsdefsymbolsabbrev"]
+      when "Terms, definitions and symbols"
+        @labels["termsdefsymbols"]
+      when "Terms, definitions and abbreviated terms"
+        @labels["termsdefabbrev"]
+      when "Terms and definitions"
+        @labels["termsdef"]
+      else
+        title
+      end
+    end
+
     def terms_defs(isoxml, out, num)
       f = isoxml.at(ns(TERM_CLAUSE)) or return num
       out.div **attr_code(id: f["id"]) do |div|
         num = num + 1
-        clause_name(num, terms_defs_title(f), div, nil)
+        clause_name(num, term_def_title(f&.at(ns("./title"))), div, nil)
         f.elements.each do |e|
           parse(e, div) unless %w{title source}.include? e.name
         end

data/lib/isodoc/function/to_word_html.rb

@@ -157,7 +157,7 @@ module IsoDoc::Function
         when "clause" then clause_parse(node, out)
         when "xref" then xref_parse(node, out)
         when "eref" then eref_parse(node, out)
-        when "origin" then eref_parse(node, out)
+        when "origin" then origin_parse(node, out)
         when "link" then link_parse(node, out)
         when "ul" then ul_parse(node, out)
         when "ol" then ol_parse(node, out)

data/lib/isodoc/function/utils.rb

@@ -64,7 +64,7 @@ module IsoDoc::Function
 
     CLAUSE_ANCESTOR =
       ".//ancestor::*[local-name() = 'annex' or "\
-      "local-name() = 'acknowledgements' or "\
+      "local-name() = 'acknowledgements' or local-name() = 'term' or "\
       "local-name() = 'appendix' or local-name() = 'foreword' or "\
       "local-name() = 'introduction' or local-name() = 'terms' or "\
       "local-name() = 'clause' or local-name() = 'references']/@id".freeze
@@ -78,7 +78,7 @@ module IsoDoc::Function
       ".//ancestor::*[local-name() = 'annex' or "\
       "local-name() = 'foreword' or local-name() = 'appendix' or "\
       "local-name() = 'introduction' or local-name() = 'terms' or "\
-      "local-name() = 'acknowledgements' or "\
+      "local-name() = 'acknowledgements' or local-name() = 'term' or "\
       "local-name() = 'clause' or local-name() = 'references' or "\
       "local-name() = 'figure' or local-name() = 'formula' or "\
       "local-name() = 'table' or local-name() = 'example']/@id".freeze
@@ -110,7 +110,8 @@ module IsoDoc::Function
     end
 
     def header_strip(h)
-      h = h.to_s.gsub(%r{<br/>}, " ").sub(/<\/?h[123456][^>]*>/, "")
+      h = h.to_s.gsub(%r{<br\s*/>}, " ").gsub(/<\/?h[123456][^>]*>/, "").
+        gsub(/<\/?b[^>]*>/, "")
       h1 = to_xhtml_fragment(h.dup)
       h1.traverse do |x|
         x.replace(" ") if x.name == "span" && /mso-tab-count/.match(x["style"])

data/lib/isodoc/function/xref_sect_gen.rb

@@ -79,7 +79,7 @@ module IsoDoc::Function
         "//references[title = 'Normative References' or title = "\
         "'Normative references'] | "\
         "//sections/terms | //preface/abstract | //foreword | "\
-        "//introduction | //preface/clause | //acknowledgements "\
+        "//introduction | //preface/clause | //acknowledgements | "\
         "//sections/definitions | //clause[parent::sections]"
       sequential_asset_names(d.xpath(ns(middle_sections)))
     end

data/lib/isodoc/html_function/footnotes.rb

@@ -48,7 +48,7 @@ module IsoDoc::HtmlFunction
     end
 
     def table_footnote_parse(node, out)
-      fn = node["reference"]
+      fn = node["reference"] || UUIDTools::UUID.random_create.to_s
       tid = get_table_ancestor_id(node)
       make_table_footnote_link(out, tid + fn, fn)
       # do not output footnote text if we have already seen it for this table
@@ -64,7 +64,7 @@ module IsoDoc::HtmlFunction
     def footnote_parse(node, out)
        return table_footnote_parse(node, out) if (@in_table || @in_figure) &&
         !node.ancestors.map {|m| m.name }.include?("name")
-      fn = node["reference"]
+      fn = node["reference"] || UUIDTools::UUID.random_create.to_s
       attrs = { "epub:type": "footnote", rel: "footnote", href: "#fn:#{fn}" }
       out.a **attrs do |a|
         a.sup { |sup| sup << fn }

data/lib/isodoc/html_function/postprocess.rb

@@ -108,7 +108,7 @@ module IsoDoc::HtmlFunction
       idx = docxml.at("//div[@id = 'toc']") or return docxml
       toc = "<ul>"
       path = toclevel_classes.map do |l|
-        "//main//#{l}[not(@class = 'TermNum')][not(@class = 'noTOC')][not(text())]"
+        "//main//#{l}[not(@class = 'TermNum')][not(@class = 'noTOC')][text()]"
       end
       docxml.xpath(path.join(" | ")).each_with_index do |h, tocidx|
         h["id"] ||= "toc#{tocidx}"

data/lib/isodoc/metadata.rb

@@ -3,7 +3,8 @@ require_relative "./metadata_date"
 module IsoDoc
   class Metadata
     DATETYPES = %w{published accessed created implemented obsoleted confirmed
-    updated issued received transmitted copied unchanged circulated}.freeze
+    updated issued received transmitted copied unchanged circulated vote-started
+    vote-ended}.freeze
 
     def ns(xpath)
       Common::ns(xpath)
@@ -15,7 +16,7 @@ module IsoDoc
 
     def initialize(lang, script, labels)
       @metadata = {}
-      DATETYPES.each { |w| @metadata["#{w}date".to_sym] = "XXX" }
+      DATETYPES.each { |w| @metadata["#{w.gsub(/-/, "_")}date".to_sym] = "XXX" }
       @lang = lang
       @script = script
       @c = HTMLEntities.new
@@ -84,7 +85,7 @@ module IsoDoc
 
     def bibdate(isoxml, _out)
       isoxml.xpath(ns("//bibdata/date")).each do |d|
-        set("#{d['type']}date".to_sym, Common::date_range(d))
+        set("#{d['type'].gsub(/-/, "_")}date".to_sym, Common::date_range(d))
       end
     end
 

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "1.0.24".freeze
+  VERSION = "1.0.25".freeze
 end

data/lib/isodoc/word_function/body.rb

@@ -204,10 +204,6 @@ module IsoDoc::WordFunction
                 alt: node["alt"],
                 title: node["title"],
                 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

data/lib/isodoc/word_function/footnotes.rb

@@ -56,7 +56,7 @@ module IsoDoc::WordFunction
     end
 
     def table_footnote_parse(node, out)
-      fn = node["reference"]
+      fn = node["reference"] || UUIDTools::UUID.random_create.to_s
       tid = get_table_ancestor_id(node)
       make_table_footnote_link(out, tid + fn, fn)
       # do not output footnote text if we have already seen it for this table
@@ -80,7 +80,7 @@ module IsoDoc::WordFunction
     def footnote_parse(node, out)
       return table_footnote_parse(node, out) if (@in_table || @in_figure) &&
         !node.ancestors.map {|m| m.name }.include?("name")
-      fn = node["reference"]
+      fn = node["reference"] || UUIDTools::UUID.random_create.to_s
       return seen_footnote_parse(node, out, fn) if @seen_footnote.include?(fn)
       @fn_bookmarks[fn] = bookmarkid
       out.span **{style: "mso-bookmark:_Ref#{@fn_bookmarks[fn]}"} do |s|

data/lib/isodoc/word_function/postprocess.rb

@@ -39,7 +39,6 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
     end
 
     def toWord(result, filename, dir, header)
-      #result = populate_template(result, :word)
       result = from_xhtml(word_cleanup(to_xhtml(result)))
       unless @landscapestyle.empty?
         @wordstylesheet&.open
@@ -196,6 +195,8 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
       @landscapestyle = ""
       word_section_breaks1(docxml, "WordSection2")
       word_section_breaks1(docxml, "WordSection3")
+      word_remove_pb_before_annex(docxml)
+      docxml.xpath("//br[@orientation]").each { |br| br.delete("orientation") }
     end
 
     def word_section_breaks1(docxml, sect)
@@ -203,7 +204,6 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
         each_with_index do |br, i|
         @landscapestyle += "\ndiv.#{sect}_#{i} {page:#{sect}"\
           "#{br["orientation"] == "landscape" ? "L" : "P"};}\n"
-        br.delete("orientation")
         split_at_section_break(docxml, sect, br, i)
       end
     end
@@ -219,6 +219,17 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
       end
     end
 
+    # applies for <div class="WordSectionN_M"><p><pagebreak/></p>...
+    def word_remove_pb_before_annex(docxml)
+      docxml.xpath("//div[p/br]").each do |d|
+        /^WordSection\d+_\d+$/.match(d["class"]) or next
+        d.elements[0].name == "p" && !d.elements[0].elements.empty? or next
+        d.elements[0].elements[0].name == "br" && d.elements[0].elements[0]["style"] ==
+          "mso-special-character:line-break;page-break-before:always" or next
+        d.elements[0].remove
+      end
+    end
+
     def word_footnote_format(docxml)
       # the content is in a[@epub:type = 'footnote']//sup, but in Word, 
       # we need to inject content around the autonumbered footnote reference

data/spec/isodoc/blocks_spec.rb

@@ -417,8 +417,8 @@ B</pre>
                <div id="figureA-1" class="figure">
 
          <img src="rice_images/rice_image1.png" height="20" width="30" alt="alttext" title="titletext"/>
-         <img src="rice_images/rice_image1.png"/>
-         <img src="_.gif"/>
+         <img src="rice_images/rice_image1.png" height='20' width='auto'/>
+         <img src='_.gif' height='20' width='auto'/>
          <a href="#_" class="TableFootnoteRef">a</a><aside><div id="ftn_"><span><span id="_" class="TableFootnoteRef">a</span><span style="mso-tab-count:1">&#160; </span></span>
          <p id="_">The time <span class="stem">(#(t_90)#)</span> was estimated to be 18,2 min for this example.</p>
        </div></aside>
@@ -969,7 +969,7 @@ World</p>
     INPUT
     #{HTML_HDR}
                <p class="zzSTDTitle1"/>
-               <div><h1>1.&#160; Terms and definitions</h1>
+               <div><h1>1.&#160; </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/cleanup_spec.rb

@@ -715,7 +715,7 @@ INPUT
     OUTPUT
   end
 
-    it "breaks up very long strings in tables" do
+    it "does not break up very long strings in tables by default" do
     expect(xmlpp(IsoDoc::HtmlConvert.new({}).cleanup(Nokogiri::XML(<<~"INPUT")).to_s)).to be_equivalent_to xmlpp(<<~"OUTPUT")
            <html xmlns:epub="http://www.idpf.org/2007/ops">
          <head>
@@ -739,6 +739,7 @@ INPUT
                        <td align="left" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">Description</td>
                        <td align="center" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;">Rice sample</td>
                      </tr>
+                     </thead>
                      <tbody>
                      <tr>
                        <td align="left" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">http://www.example.com/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/BBBBBBBBBBBBBBBBBBBBBBBBBBBB</td>
@@ -775,6 +776,90 @@ INPUT
                        <td align='left' style='border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;'>Description</td>
                        <td align='center' style='border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;'>Rice sample</td>
                      </tr>
+                     </thead>
+                     <tbody>
+                       <tr>
+                         <td align='left' style='border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;'>
+                         http://www.example.com/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/BBBBBBBBBBBBBBBBBBBBBBBBBBBB
+                         </td>
+                         <td align='left' style='border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;'>
+                         http://www.example.com/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBBBBBBBBBBBBBBBB </td>
+                         <td align='center' style='border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;'>
+                         www.example.com/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBBBBBBBBBBBBBBBB
+                         </td>
+                       </tr>
+                     </tbody>
+                 </table>
+               </div>
+             </div>
+           </body>
+         </head>
+       </html>
+                     OUTPUT
+    end
+
+        it "breaks up very long strings in tables on request" do
+    expect(xmlpp(IsoDoc::HtmlConvert.new({break_up_urls_in_tables: "true"}).cleanup(Nokogiri::XML(<<~"INPUT")).to_s)).to be_equivalent_to xmlpp(<<~"OUTPUT")
+           <html xmlns:epub="http://www.idpf.org/2007/ops">
+         <head>
+           <title>test</title>
+           <body lang="EN-US" link="blue" vlink="#954F72">
+             <div class="WordSection1">
+               <p>&#160;</p>
+             </div>
+             <br clear="all" class="section"/>
+             <div class="WordSection2">
+               <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+               <div>
+                 <h1 class="ForewordTitle">Foreword</h1>
+                 <p class="TableTitle" align="center">
+                   <b>Table 1&#160;&#8212; Repeatability and reproducibility of husked rice yield</b>
+                 </p>
+                 <table id="tableD-1" class="MsoISOTable" border="1" cellspacing="0" cellpadding="0">
+                   <thead>
+                     <tr>
+                       <td align="left" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">Description</td>
+                       <td align="left" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">Description</td>
+                       <td align="center" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;">Rice sample</td>
+                     </tr>
+                     </thead>
+                     <tbody>
+                     <tr>
+                       <td align="left" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">http://www.example.com/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/BBBBBBBBBBBBBBBBBBBBBBBBBBBB</td>
+                       <td align="left" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">http://www.example.com/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBBBBBBBBBBBBBBBB</td>
+                       <td align="center" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;">www.example.com/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBBBBBBBBBBBBBBBB</td>
+                     </tr>
+                     </tbody>
+                     </table>
+                     </div>
+                     </div>
+                     </body>
+                     </html>
+                     INPUT
+                            <?xml version='1.0'?>
+       <html xmlns:epub='http://www.idpf.org/2007/ops'>
+         <head>
+           <title>test</title>
+           <body lang='EN-US' link='blue' vlink='#954F72'>
+             <div class='WordSection1'>
+               <p>&#xA0;</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>
+                 <p class='TableTitle' align='center'>
+                   <b>Table 1&#xA0;&#x2014; Repeatability and reproducibility of husked rice yield</b>
+                 </p>
+                 <table id='tableD-1' class='MsoISOTable' border='1' cellspacing='0' cellpadding='0'>
+                   <thead>
+                     <tr>
+                       <td align='left' style='border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;'>Description</td>
+                       <td align='left' style='border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;'>Description</td>
+                       <td align='center' style='border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;'>Rice sample</td>
+                     </tr>
+                     </thead>
                      <tbody>
                        <tr>
                          <td align='left' style='border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;'>
@@ -794,7 +879,6 @@ ABBBBBBBBBBBBBBBBBBBBBBBBBBBB
                          </td>
                        </tr>
                      </tbody>
-                   </thead>
                  </table>
                </div>
              </div>
@@ -804,7 +888,8 @@ ABBBBBBBBBBBBBBBBBBBBBBBBBBBB
                      OUTPUT
     end
 
-        it "breaks up very long strings in tables (Word)" do
+
+        it "does not break up very long strings in tables by default (Word)" do
     expect(xmlpp(IsoDoc::WordConvert.new({}).cleanup(Nokogiri::XML(<<~"INPUT")).to_s)).to be_equivalent_to xmlpp(<<~"OUTPUT")
            <html xmlns:epub="http://www.idpf.org/2007/ops">
          <head>
@@ -828,16 +913,17 @@ ABBBBBBBBBBBBBBBBBBBBBBBBBBBB
                        <td align="left" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">Description</td>
                        <td align="center" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;">Rice sample</td>
                      </tr>
+                     </thead>
                      <tbody>
                      <tr>
                          <td align='left' style='border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;'>
-                           http://www.example.com/ &amp;AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAA/ BBBBBBBBBBBBBBBBBBBBBBBBBBBB
+                           http://www.example.com/&amp;AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/BBBBBBBBBBBBBBBBBBBBBBBBBBBB
                          </td>
                          <td align='left' style='border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;'>
-                           http://www.example.com/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAABBBBBBBBBBBBBBBBBBBBBB BBBBBB
+                           http://www.example.com/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBBBBBBBBBBBBBBBB
                          </td>
                          <td align='center' style='border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;'>
-                           www.example.com/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA ABBBBBBBBBBBBBBBBBBBBBBBBBBBB
+                           www.example.com/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBBBBBBBBBBBBBBBB
                          </td>
                      </tr>
                      </tbody>
@@ -870,20 +956,104 @@ ABBBBBBBBBBBBBBBBBBBBBBBBBBBB
                        <td align='left' style='border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;'>Description</td>
                        <td align='center' style='border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;'>Rice sample</td>
                      </tr>
+                     </thead>
                      <tbody>
                        <tr>
                          <td align='left' style='border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;'>
-                           http://www.example.com/ &amp;AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAA/ BBBBBBBBBBBBBBBBBBBBBBBBBBBB
+                           http://www.example.com/&amp;AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/BBBBBBBBBBBBBBBBBBBBBBBBBBBB
                          </td>
                          <td align='left' style='border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;'>
-                           http://www.example.com/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAABBBBBBBBBBBBBBBBBBBBBB BBBBBB
+                           http://www.example.com/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBBBBBBBBBBBBBBBB
                          </td>
                          <td align='center' style='border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;'>
-                           www.example.com/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA ABBBBBBBBBBBBBBBBBBBBBBBBBBBB
+                           www.example.com/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBBBBBBBBBBBBBBBB
+                         </td>
+                       </tr>
+                     </tbody>
+                 </table>
+               </div>
+             </div>
+           </body>
+         </head>
+       </html>
+                     OUTPUT
+    end
+
+              it "breaks up very long strings in tables on request (Word)" do
+    expect(xmlpp(IsoDoc::WordConvert.new({break_up_urls_in_tables: "true"}).cleanup(Nokogiri::XML(<<~"INPUT")).to_s)).to be_equivalent_to xmlpp(<<~"OUTPUT")
+           <html xmlns:epub="http://www.idpf.org/2007/ops">
+         <head>
+           <title>test</title>
+           <body lang="EN-US" link="blue" vlink="#954F72">
+             <div class="WordSection1">
+               <p>&#160;</p>
+             </div>
+             <br clear="all" class="section"/>
+             <div class="WordSection2">
+               <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+               <div>
+                 <h1 class="ForewordTitle">Foreword</h1>
+                 <p class="TableTitle" align="center">
+                   <b>Table 1&#160;&#8212; Repeatability and reproducibility of husked rice yield</b>
+                 </p>
+                 <table id="tableD-1" class="MsoISOTable" border="1" cellspacing="0" cellpadding="0">
+                   <thead>
+                     <tr>
+                       <td align="left" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">Description</td>
+                       <td align="left" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">Description</td>
+                       <td align="center" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;">Rice sample</td>
+                     </tr>
+                     </thead>
+                     <tbody>
+                     <tr>
+                       <td align="left" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">http://www.example.com/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/BBBBBBBBBBBBBBBBBBBBBBBBBBBB</td>
+                       <td align="left" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;">http://www.example.com/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBBBBBBBBBBBBBBBB</td>
+                       <td align="center" style="border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;">www.example.com/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBBBBBBBBBBBBBBBB</td>
+                     </tr>
+                     </tbody>
+                     </table>
+                     </div>
+                     </div>
+                     </body>
+                     </html>
+                     INPUT
+                            <?xml version='1.0'?>
+       <html xmlns:epub='http://www.idpf.org/2007/ops'>
+         <head>
+           <title>test</title>
+           <body lang='EN-US' link='blue' vlink='#954F72'>
+             <div class='WordSection1'>
+               <p>&#xA0;</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>
+                 <p class='TableTitle' align='center'>
+                   <b>Table 1&#xA0;&#x2014; Repeatability and reproducibility of husked rice yield</b>
+                 </p>
+                 <table id='tableD-1' class='MsoISOTable' border='1' cellspacing='0' cellpadding='0'>
+                   <thead>
+                     <tr>
+                       <td align='left' style='border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;'>Description</td>
+                       <td align='left' style='border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;'>Description</td>
+                       <td align='center' style='border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;'>Rice sample</td>
+                     </tr>
+                     </thead>
+                     <tbody>
+                       <tr>
+                         <td align='left' style='border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;'>
+                           http://www.example.com/ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAA/ BBBBBBBBBBBBBBBBBBBBBBBBBBBB
+                         </td>
+                         <td align='left' style='border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;'>
+                           http://www.example.com/ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAABBBBBBBBBBBBBBBBBBBBBB BBBBBB
+                         </td>
+                         <td align='center' style='border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;'>
+                           www.example.com/ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA ABBBBBBBBBBBBBBBBBBBBBBBBBBBB
                          </td>
                        </tr>
                      </tbody>
-                   </thead>
                  </table>
                </div>
              </div>

data/spec/isodoc/i18n_spec.rb

@@ -21,7 +21,7 @@ RSpec.describe IsoDoc do
          <p id="E">Text</p>
        </clause>
 
-       <clause id="H" obligation="normative"><title>Terms, Definitions, Symbols and Abbreviated Terms</title><terms id="I" obligation="normative">
+       <clause id="H" obligation="normative"><title>Terms, definitions, symbols and abbreviated terms</title><terms id="I" obligation="normative">
          <title>Normal Terms</title>
          <term id="J">
          <preferred>Term2</preferred>
@@ -157,7 +157,7 @@ RSpec.describe IsoDoc do
          <p id="E">Text</p>
        </clause>
 
-       <clause id="H" obligation="normative"><title>Terms, Definitions, Symbols and Abbreviated Terms</title><terms id="I" obligation="normative">
+       <clause id="H" obligation="normative"><title>Terms, definitions, symbols and abbreviated terms</title><terms id="I" obligation="normative">
          <title>Normal Terms</title>
          <term id="J">
          <preferred>Term2</preferred>
@@ -293,7 +293,7 @@ RSpec.describe IsoDoc do
          <p id="E">Text</p>
        </clause>
 
-       <clause id="H" obligation="normative"><title>Terms, Definitions, Symbols and Abbreviated Terms</title><terms id="I" obligation="normative">
+       <clause id="H" obligation="normative"><title>Terms, definitions, symbols and abbreviated terms</title><terms id="I" obligation="normative">
          <title>Normal Terms</title>
          <term id="J">
          <preferred>Term2</preferred>
@@ -430,7 +430,7 @@ RSpec.describe IsoDoc do
          <p id="E"><eref type="inline" bibitemid="ISO712"><locality type="table"><referenceFrom>1</referenceFrom><referenceTo>1</referenceTo></locality></eref></p>
        </clause>
 
-       <clause id="H" obligation="normative"><title>Terms, Definitions, Symbols and Abbreviated Terms</title><terms id="I" obligation="normative">
+       <clause id="H" obligation="normative"><title>Terms, definitions, symbols and abbreviated terms</title><terms id="I" obligation="normative">
          <title>Normal Terms</title>
          <term id="J">
          <preferred>Term2</preferred>

data/spec/isodoc/metadata_spec.rb

@@ -30,6 +30,8 @@ RSpec.describe IsoDoc do
   <date type="updated"><on>2018</on></date>
   <date type="unchanged"><on>2019</on></date>
   <date type="transmitted"><on>2020</on></date>
+  <date type="vote-started"><on>2021</on></date>
+  <date type="vote-ended"><on>2022</on></date>
   <edition>2</edition>
 <version>
   <revision-date>2016-05-01</revision-date>
@@ -92,7 +94,7 @@ RSpec.describe IsoDoc do
 </bibdata>
 </iso-standard>
 INPUT
-{:accesseddate=>"2012", :activateddate=>"2013", :agency=>"ISO", :authors=>["Barney Rubble", "Fred Flintstone"], :authors_affiliations=>{"Slate Inc., Bedrock"=>["Barney Rubble"], ""=>["Fred Flintstone"]}, :circulateddate=>"2015", :confirmeddate=>"2017", :copieddate=>"2016", :createddate=>"2010&ndash;2011", :doc=>"URL E", :docnumber=>"17301-1", :docnumeric=>"17301", :doctitle=>"Cereals and pulses", :doctype=>"International Standard", :docyear=>"2016", :draft=>"0.4", :draftinfo=>" (draft 0.4, 2016-05-01)", :edition=>"2", :html=>"URL B", :implementeddate=>"XXX", :issueddate=>"XXX", :iteration=>"2", :obsoleteddate=>"2014", :pdf=>"URL D", :publisheddate=>"2011", :publisher=>"", :receiveddate=>"XXX", :revdate=>"2016-05-01", :revdate_monthyear=>"May 2016", :stage=>"Committee draft", :stageabbr=>"CD", :substage=>"Withdrawn", :transmitteddate=>"2020", :unchangeddate=>"2019", :unpublished=>true, :updateddate=>"2018", :url=>"URL A", :xml=>"URL C"}
+{:accesseddate=>"2012", :activateddate=>"2013", :agency=>"ISO", :authors=>["Barney Rubble", "Fred Flintstone"], :authors_affiliations=>{"Slate Inc., Bedrock"=>["Barney Rubble"], ""=>["Fred Flintstone"]}, :circulateddate=>"2015", :confirmeddate=>"2017", :copieddate=>"2016", :createddate=>"2010&ndash;2011", :doc=>"URL E", :docnumber=>"17301-1", :docnumeric=>"17301", :doctitle=>"Cereals and pulses", :doctype=>"International Standard", :docyear=>"2016", :draft=>"0.4", :draftinfo=>" (draft 0.4, 2016-05-01)", :edition=>"2", :html=>"URL B", :implementeddate=>"XXX", :issueddate=>"XXX", :iteration=>"2", :obsoleteddate=>"2014", :pdf=>"URL D", :publisheddate=>"2011", :publisher=>"", :receiveddate=>"XXX", :revdate=>"2016-05-01", :revdate_monthyear=>"May 2016", :stage=>"Committee draft", :stageabbr=>"CD", :substage=>"Withdrawn", :transmitteddate=>"2020", :unchangeddate=>"2019", :unpublished=>true, :updateddate=>"2018", :url=>"URL A", :vote_endeddate=>"2022", :vote_starteddate=>"2021", :xml=>"URL C"}
 OUTPUT
   end
 
@@ -166,7 +168,7 @@ OUTPUT
 </version>
 </iso-standard>
 INPUT
-{:accesseddate=>"XXX", :agency=>"ISO/IEC/IEEE", :authors=>[], :authors_affiliations=>{}, :circulateddate=>"XXX", :confirmeddate=>"XXX", :copieddate=>"XXX", :createddate=>"XXX", :docnumber=>"17301-1-3", :docnumeric=>"17301", :doctitle=>"Cereals and pulses", :doctype=>"International Standard", :docyear=>"2016", :draft=>"12", :draftinfo=>" (draft 12, 2016-05)", :edition=>nil, :implementeddate=>"XXX", :issueddate=>"XXX", :obsoleteddate=>"XXX", :obsoletes=>"IEC 8121", :obsoletes_part=>"3.1", :partof=>"IEC 8122", :publisheddate=>"2011-01", :publisher=>"International Organization for Standardization, International Electrotechnical Commission and Institute of Electrical and Electronics Engineers", :receiveddate=>"XXX", :revdate=>"2016-05", :revdate_monthyear=>"May 2016", :stage=>"Published", :transmitteddate=>"XXX", :unchangeddate=>"XXX", :unpublished=>false, :updateddate=>"XXX"}
+{:accesseddate=>"XXX", :agency=>"ISO/IEC/IEEE", :authors=>[], :authors_affiliations=>{}, :circulateddate=>"XXX", :confirmeddate=>"XXX", :copieddate=>"XXX", :createddate=>"XXX", :docnumber=>"17301-1-3", :docnumeric=>"17301", :doctitle=>"Cereals and pulses", :doctype=>"International Standard", :docyear=>"2016", :draft=>"12", :draftinfo=>" (draft 12, 2016-05)", :edition=>nil, :implementeddate=>"XXX", :issueddate=>"XXX", :obsoleteddate=>"XXX", :obsoletes=>"IEC 8121", :obsoletes_part=>"3.1", :partof=>"IEC 8122", :publisheddate=>"2011-01", :publisher=>"International Organization for Standardization, International Electrotechnical Commission and Institute of Electrical and Electronics Engineers", :receiveddate=>"XXX", :revdate=>"2016-05", :revdate_monthyear=>"May 2016", :stage=>"Published", :transmitteddate=>"XXX", :unchangeddate=>"XXX", :unpublished=>false, :updateddate=>"XXX", :vote_endeddate=>"XXX", :vote_starteddate=>"XXX"}
 OUTPUT
   end
 
@@ -225,7 +227,7 @@ OUTPUT
 </bibdata>
 </iso-standard>
 INPUT
-{:accesseddate=>"XXX", :agency=>"ISO/IEC", :authors=>[], :authors_affiliations=>{}, :circulateddate=>"XXX", :confirmeddate=>"XXX", :copieddate=>"XXX", :createddate=>"XXX", :docnumber=>"17301-1-3", :docnumeric=>"17301", :doctitle=>"Cereals and pulses", :docyear=>"2016", :draft=>nil, :draftinfo=>"", :edition=>nil, :implementeddate=>"XXX", :issueddate=>"XXX", :obsoleteddate=>"XXX", :publisheddate=>"2011-01", :publisher=>"International Organization for Standardization et International Electrotechnical Commission", :receiveddate=>"XXX", :revdate=>"2016-05", :revdate_monthyear=>"Mai 2016", :stage=>"Published", :transmitteddate=>"XXX", :unchangeddate=>"XXX", :unpublished=>false, :updateddate=>"XXX"}
+{:accesseddate=>"XXX", :agency=>"ISO/IEC", :authors=>[], :authors_affiliations=>{}, :circulateddate=>"XXX", :confirmeddate=>"XXX", :copieddate=>"XXX", :createddate=>"XXX", :docnumber=>"17301-1-3", :docnumeric=>"17301", :doctitle=>"Cereals and pulses", :docyear=>"2016", :draft=>nil, :draftinfo=>"", :edition=>nil, :implementeddate=>"XXX", :issueddate=>"XXX", :obsoleteddate=>"XXX", :publisheddate=>"2011-01", :publisher=>"International Organization for Standardization et International Electrotechnical Commission", :receiveddate=>"XXX", :revdate=>"2016-05", :revdate_monthyear=>"Mai 2016", :stage=>"Published", :transmitteddate=>"XXX", :unchangeddate=>"XXX", :unpublished=>false, :updateddate=>"XXX", :vote_endeddate=>"XXX", :vote_starteddate=>"XXX"}
 OUTPUT
 end
 

data/spec/isodoc/postproc_spec.rb

@@ -299,7 +299,7 @@ expect(File.exist?("test.doc")).to be true
     expect(xmlpp(word)).to be_equivalent_to xmlpp(<<~"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>
+               <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 &#x2014; The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here]</p></div>
@@ -1316,7 +1316,11 @@ OUTPUT
        <pagebreak orientation="portrait"/>
        <p>And up</p>
        </note>
+       <pagebreak orientation="portrait"/>
         </clause></sections>
+        <annex id="_level_1" inline-header="false" obligation="normative">
+        <title>Annex 1</title>
+        </annex>
        </standard-document>
    INPUT
    expect(File.exist?("test.doc")).to be true
@@ -1324,7 +1328,9 @@ OUTPUT
     expect(html).to include "div.WordSection2_0 {page:WordSection2P;}"
 expect(html).to include "div.WordSection2_1 {page:WordSection2L;}"
     expect(html).to include "div.WordSection3_0 {page:WordSection3P;}"
-expect(html).to include "div.WordSection3_1 {page:WordSection3L;}"
+expect(html).to include "div.WordSection3_1 {page:WordSection3P;}"
+expect(html).to include "div.WordSection3_2 {page:WordSection3L;}"
+
 
 expect(xmlpp(html.sub(/^.*<body /m, "<body ").sub(%r{</body>.*$}m, "</body>"))).to be_equivalent_to xmlpp(<<~"OUTPUT")
        <body lang='EN-US' xml:lang='EN-US' link='blue' vlink='#954F72'>
@@ -1335,9 +1341,9 @@ expect(xmlpp(html.sub(/^.*<body /m, "<body ").sub(%r{</body>.*$}m, "</body>"))).
            <br clear='all' class='section'/>
          </p>
          <div class='WordSection2'>
-           <p class='MsoNormal'>
-             <br clear='all' style='mso-special-character:line-break;page-break-before:always'/>
-           </p>
+         <p class='MsoNormal'>
+  <br clear='all' style='mso-special-character:line-break;page-break-before:always'/>
+</p>
            <div class='Section3' id=''>
              <h1 class='IntroTitle'>Introduction</h1>
              <p align='center' style='text-align:center' class='MsoNormal'>
@@ -1396,7 +1402,7 @@ expect(xmlpp(html.sub(/^.*<body /m, "<body ").sub(%r{</body>.*$}m, "</body>"))).
              </div>
            </div>
          </div>
-         <div class='WordSection3_1'>
+         <div class='WordSection3_2'>
            <p class='TableTitle' style='text-align:center;'>Table 1</p>
            <div align='center' class='table_container'>
              <table class='MsoISOTable' style='mso-table-anchor-horizontal:column;mso-table-overlap:never;border-spacing:0;border-width:1px;'>
@@ -1433,8 +1439,24 @@ expect(xmlpp(html.sub(/^.*<body /m, "<body ").sub(%r{</body>.*$}m, "</body>"))).
              <br clear='all' class='section'/>
            </p>
          </div>
-         <div class='WordSection3_0'>
+         <div class='WordSection3_1'>
            <p class='Note'>And up</p>
+              <p class='MsoNormal'>
+     <br clear='all' class='section'/>
+   </p>
+ </div>
+ <div class='WordSection3_0'>
+   <div class='Section3'>
+     <a name='_level_1' id='_level_1'/>
+     <h1 class='Annex'>
+       <b>Annex A</b>
+       <br/>
+       (normative)
+       <br/>
+       <br/>
+       <b>Annex 1</b>
+     </h1>
+   </div>
          </div>
          <div style='mso-element:footnote-list'/>
        </body>

data/spec/isodoc/section_spec.rb

@@ -188,7 +188,7 @@ RSpec.describe IsoDoc do
                 <div>
                   <h1>2.&#160; Normative references</h1>
                 </div>
-                <div id="H"><h1>3.&#160; Terms, definitions, symbols and abbreviated terms</h1>
+                <div id="H"><h1>3.&#160; Terms, Definitions, Symbols and Abbreviated Terms</h1>
         <div id="I">
            <h2>3.1.&#160; Normal Terms</h2>
            <p class="TermNum" id="J">3.1.1.</p>
@@ -429,7 +429,7 @@ OUTPUT
                <div>
                  <h1>2.<span style="mso-tab-count:1">&#160; </span>Normative references</h1>
                </div>
-               <div id="H"><h1>3.<span style="mso-tab-count:1">&#160; </span>Terms, definitions, symbols and abbreviated terms</h1>
+               <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.<span style="mso-tab-count:1">&#160; </span>Normal Terms</h2>
           <p class="TermNum" id="J">3.1.1.</p>
@@ -669,7 +669,12 @@ OUTPUT
       </div>
       <p class='zzSTDTitle1'/>
       <div id='H'>
-        <h1>1.&#160; Terms, definitions, symbols and abbreviated terms</h1>
+      <h1>
+  1.&#160; Terms, Definitions, Symbols and Abbreviated Terms
+  <a rel='footnote' href='#fn:10' epub:type='footnote'>
+    <sup>10</sup>
+  </a>
+</h1>
         <div id='I'>
           <h2>
             1.1.&#160; Normal Terms
@@ -872,7 +877,7 @@ OUTPUT
              <div>
                <h1>Normative references</h1>
              </div>
-             <div id="H"><h1>Terms, definitions, symbols and abbreviated terms</h1>
+             <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>
@@ -964,7 +969,7 @@ OUTPUT
     INPUT
     #{HTML_HDR}
                <p class="zzSTDTitle1"/>
-               <div id="H"><h1>1.&#160; Terms and definitions</h1>
+               <div id="H"><h1>1.&#160; Terms, Definitions, Symbols and Abbreviated Terms</h1>
        <p class="TermNum" id="J">1.1.</p>
          <p class="Terms" style="text-align:left;">Term2</p>
        </div>

data/spec/isodoc/terms_spec.rb

@@ -28,7 +28,26 @@ RSpec.describe IsoDoc do
     <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>
+</termsource>
+
+<termsource status='identical'>
+    <origin citeas=''>
+      <termref base='IEV' target='xyz'>t1</termref>
+    </origin>
+  </termsource>
+
+  <termsource status='modified'>
+    <origin citeas=''>
+      <termref base='IEV' target='xyz'/>
+    </origin>
+    <modification>
+      <p id='_'>with adjustments</p>
+    </modification>
+  </termsource>
+
+
+
+</term>
 
 <term id="paddy"><preferred>paddy</preferred><admitted>paddy rice</admitted>
 <admitted>rough rice</admitted>
@@ -55,7 +74,7 @@ RSpec.describe IsoDoc do
     INPUT
     #{HTML_HDR}
                <p class="zzSTDTitle1"/>
-               <div id="_terms_and_definitions"><h1>1.&#160; Terms and definitions</h1><p>For the purposes of this document,
+               <div id="_terms_and_definitions"><h1>1.&#160; Terms and Definitions</h1><p>For the purposes of this document,
            the following terms and definitions apply.</p>
        <p class="TermNum" id="paddy1">1.1.</p><p class="Terms" style="text-align:left;">paddy</p>
 
@@ -75,7 +94,10 @@ RSpec.describe IsoDoc do
        <p>[TERMREF]
          <a href="#ISO7301">ISO 7301:2011, Clause 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>
+       [/TERMREF]</p>
+       <p>[TERMREF] Termbase IEV, term ID xyz [/TERMREF]</p>
+<p>[TERMREF] Termbase IEV, term ID xyz [MODIFICATION]with adjustments [/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>
@@ -122,7 +144,26 @@ OUTPUT
     <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>
+</termsource>
+
+<termsource status='identical'>
+    <origin citeas=''>
+      <termref base='IEV' target='xyz'>t1</termref>
+    </origin>
+  </termsource>
+
+  <termsource status='modified'>
+    <origin citeas=''>
+      <termref base='IEV' target='xyz'/>
+    </origin>
+    <modification>
+      <p id='_'>with adjustments</p>
+    </modification>
+  </termsource>
+
+
+
+</term>
 
 <term id="paddy"><preferred>paddy</preferred><admitted>paddy rice</admitted>
 <admitted>rough rice</admitted>
@@ -149,7 +190,7 @@ OUTPUT
     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,
+             <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 class="TermNum" id="paddy1">1.1.</p><p class="Terms" style="text-align:left;">paddy</p>
 
@@ -169,7 +210,10 @@ OUTPUT
        <p>[TERMREF]
          <a href="#ISO7301">ISO 7301:2011, Clause 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>
+       [/TERMREF]</p>
+       <p>[TERMREF] Termbase IEV, term ID xyz [/TERMREF]</p>
+<p>[TERMREF] Termbase IEV, term ID xyz [MODIFICATION]with adjustments [/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>

data/spec/isodoc/xref_spec.rb

@@ -176,7 +176,7 @@ RSpec.describe IsoDoc do
                  <a href="#N">Note</a>
                </p>
              </div>
-             <div id="terms"><h1>2.&#160; Terms and definitions</h1>
+             <div id="terms"><h1>2.&#160; </h1>
        </div>
              <div id="widgets">
                <h1>3.&#160; Widgets</h1>
@@ -345,7 +345,7 @@ RSpec.describe IsoDoc do
                    <a href="#N">Figure 2</a>
                  </p>
                </div>
-               <div id="terms"><h1>2.&#160; Terms and definitions</h1>
+               <div id="terms"><h1>2.&#160; </h1>
        </div>
                <div id="widgets">
                  <h1>3.&#160; Widgets</h1>
@@ -492,7 +492,7 @@ RSpec.describe IsoDoc do
                <div id="scope">
                  <h1>1.&#160; Scope</h1>
                </div>
-               <div id="terms"><h1>2.&#160; Terms and definitions</h1>
+               <div id="terms"><h1>2.&#160; </h1>
        </div>
                <div id="widgets">
                  <h1>3.&#160; Widgets</h1>
@@ -642,7 +642,7 @@ RSpec.describe IsoDoc do
                    <a href="#N">Example</a>
                  </p>
                </div>
-               <div id="terms"><h1>2.&#160; Terms and definitions</h1>
+               <div id="terms"><h1>2.&#160; </h1>
        </div>
                <div id="widgets">
                  <h1>3.&#160; Widgets</h1>
@@ -781,7 +781,7 @@ RSpec.describe IsoDoc do
                    <a href="#N">Formula (2)</a>
                  </p>
                </div>
-               <div id="terms"><h1>2.&#160; Terms and definitions</h1>
+               <div id="terms"><h1>2.&#160; </h1>
        </div>
                <div id="widgets">
                  <h1>3.&#160; Widgets</h1>
@@ -916,7 +916,7 @@ RSpec.describe IsoDoc do
           <a href="#N">Requirement 2</a>
         </p>
       </div>
-      <div id="terms"><h1>2.&#160; Terms and definitions</h1>
+      <div id="terms"><h1>2.&#160; </h1>
 </div>
       <div id="widgets">
         <h1>3.&#160; Widgets</h1>
@@ -1061,7 +1061,7 @@ OUTPUT
           <a href="#N">Recommendation 2</a>
         </p>
       </div>
-      <div id="terms"><h1>2.&#160; Terms and definitions</h1>
+      <div id="terms"><h1>2.&#160; </h1>
 </div>
       <div id="widgets">
         <h1>3.&#160; Widgets</h1>
@@ -1206,7 +1206,7 @@ OUTPUT
           <a href="#N">Permission 2</a>
         </p>
       </div>
-      <div id="terms"><h1>2.&#160; Terms and definitions</h1>
+      <div id="terms"><h1>2.&#160; </h1>
 </div>
       <div id="widgets">
         <h1>3.&#160; Widgets</h1>
@@ -1520,7 +1520,7 @@ OUTPUT
                    <a href="#N">Table 2</a>
                  </p>
                </div>
-               <div id="terms"><h1>2.&#160; Terms and definitions</h1>
+               <div id="terms"><h1>2.&#160; </h1>
        </div>
                <div id="widgets">
                  <h1>3.&#160; Widgets</h1>
@@ -1599,7 +1599,7 @@ OUTPUT
                <div id="scope">
                  <h1>1.&#160; Scope</h1>
                </div>
-               <div id="terms"><h1>2.&#160; Terms and definitions</h1>
+               <div id="terms"><h1>2.&#160; </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>
@@ -1875,7 +1875,7 @@ OUTPUT
          <li><p>A</p></li>
        </ol>
              </div>
-             <div id="terms"><h1>2.&#160; Terms and definitions</h1>
+             <div id="terms"><h1>2.&#160; </h1>
        </div>
              <div id="widgets">
                <h1>3.&#160; Widgets</h1>
@@ -2014,7 +2014,7 @@ OUTPUT
          <li id="N"><p>A</p></li>
        </ol>
              </div>
-             <div id="terms"><h1>2.&#160; Terms and definitions</h1>
+             <div id="terms"><h1>2.&#160; </h1>
        </div>
              <div id="widgets">
                <h1>3.&#160; Widgets</h1>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 1.0.24
+  version: 1.0.25
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-17 00:00:00.000000000 Z
+date: 2020-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath