isodoc 0.9.13 → 0.9.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 945e78a0cc8b1efc187b862f368b0ce1290e613bb6fda7a66c66aac003c7431d
-  data.tar.gz: 59f446c8cd4d8e2a82292c22d154de3dcd9f398086f9f33f8455a2dc62f027b9
+  metadata.gz: fdc97bb8b0273bcadd49568513afb7e6c51b3fd39ff3582970c53864796853ac
+  data.tar.gz: 0053af9a809510c386f457cd24fc3f335f0c0a5ce4133a5e1690a65f445b5408
 SHA512:
-  metadata.gz: 8bddacabfb2f52f3200d338b7c7fae3f5497df524a87e49fe7623785dd9acd468ac78d77b62e968c090ef40b12f7faae92a67367326e06c7c66ef2aa4217b09f
-  data.tar.gz: 6d70b11d7058cfa38d9d467853003e3ccf994591969c81f38092490aa2e1399e1a2e091e2b1738e1cf89e62163916fa9b8d3be94c0c2595d8c099987764dd16b
+  metadata.gz: 24be2aec8eee91daf0842e23174dab29cfa472f7ce590abd706da6dd21324379cab0aa0a4ac40cb399aae9cbc7f9e5c31ff226c9fd286d911b35ee89d21d202e
+  data.tar.gz: 5fd9757242a5b781f297f84434c5c6f4b6e8d789916e9f7d7c1338a80ea75750ff6fe643985b8f4f64bdbf4e2694846a38ec8d4edb367deb99df0cc151d18a6c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    isodoc (0.9.13)
+    isodoc (0.9.14)
       asciimath
       html2doc (~> 0.8.6)
       htmlentities (~> 4.3.4)
@@ -19,7 +19,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     asciidoctor (1.5.8)
-    asciimath (1.0.6)
+    asciimath (1.0.7)
     ast (2.4.0)
     byebug (9.1.0)
     coderay (1.1.2)
@@ -43,8 +43,8 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    html2doc (0.8.6)
-      asciimath
+    html2doc (0.8.8)
+      asciimath (~> 1.0.7)
       htmlentities (~> 4.3.4)
       image_size
       mime-types
@@ -69,7 +69,7 @@ GEM
     mime-types-data (3.2018.0812)
     mini_portile2 (2.4.0)
     nenv (0.3.0)
-    nokogiri (1.9.1)
+    nokogiri (1.10.0)
       mini_portile2 (~> 2.4.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
@@ -110,7 +110,7 @@ GEM
     ruby-progressbar (1.10.0)
     ruby-xslt (0.9.10)
     ruby_dep (1.5.0)
-    sass (3.7.2)
+    sass (3.7.3)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -127,14 +127,14 @@ GEM
     thor (0.20.3)
     thread_safe (0.3.6)
     timecop (0.9.1)
-    unicode-display_width (1.4.0)
+    unicode-display_width (1.4.1)
     uuidtools (2.1.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.15)
+  bundler (~> 2.0.1)
   byebug (~> 9.1)
   equivalent-xml (~> 0.6)
   guard (~> 2.14)
@@ -146,4 +146,4 @@ DEPENDENCIES
   timecop (~> 0.9)
 
 BUNDLED WITH
-   1.17.2
+   2.0.1

data/isodoc.gemspec

@@ -41,7 +41,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "metanorma", "~> 0.3.0"
   spec.add_dependency "rake", "~> 12.0"
 
-  spec.add_development_dependency "bundler", "~> 1.15"
+  spec.add_development_dependency "bundler", "~> 2.0.1"
   spec.add_development_dependency "byebug", "~> 9.1"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"

data/lib/isodoc/function/blocks.rb

@@ -83,7 +83,7 @@ module IsoDoc::Function
     # used if we are boxing examples
     def example_div_parse(node, out)
       out.div **attr_code(id: node["id"], class: "example") do |div|
-        out.p { |p| p << example_label(node) }
+        div.p { |p| p << example_label(node) }
         node.children.each do |n|
           parse(n, div)
         end

data/lib/isodoc/function/references.rb

@@ -76,9 +76,14 @@ module IsoDoc::Function
     end
 
     def reference_format(b, r)
-      title = b.at(ns("./formattedref")) ||
-        b.at(ns("./title[@language = '#{@language}']")) || b.at(ns("./title"))
-      title&.children&.each { |n| parse(n, r) }
+      if ftitle = b.at(ns("./formattedref"))
+        ftitle&.children&.each { |n| parse(n, r) }
+      else
+        title = b.at(ns("./title[@language = '#{@language}']")) || b.at(ns("./title"))
+        r.i do |i|
+          title&.children&.each { |n| parse(n, i) }
+        end
+      end
     end
 
     # TODO generate formatted ref if not present
@@ -178,13 +183,13 @@ module IsoDoc::Function
     def format_ref(ref, prefix, isopub, date, allparts)
       if isopub
         #if date
-          #on = date.at(ns("./on"))
-          #ref += on&.text == "--" ? ":--" : "" # ":#{date_range(date)}"
-          #ref += " (all parts)" if allparts
-         # ref = docid_prefix(prefix, ref)
+        #on = date.at(ns("./on"))
+        #ref += on&.text == "--" ? ":--" : "" # ":#{date_range(date)}"
+        #ref += " (all parts)" if allparts
+        # ref = docid_prefix(prefix, ref)
         #end
       end
-          ref = docid_prefix(prefix, ref)
+      ref = docid_prefix(prefix, ref)
       return "[#{ref}]" if /^\d+$/.match(ref) && !prefix && !/^\[.*\]$/.match(ref)
       ref
     end

data/lib/isodoc/function/to_word_html.rb

@@ -182,12 +182,6 @@ module IsoDoc::Function
         text_parse(node, out)
       else
         case node.name
-        #when "em" then out.i { |e| e << node.inner_html }
-        #when "strong" then out.b { |e| e << node.inner_html }
-        #when "sup" then out.sup { |e| e << node.inner_html }
-        #when "sub" then out.sub { |e| e << node.inner_html }
-        #when "tt" then out.tt { |e| e << node.inner_html }
-        #when "strike" then out.s { |e| e << node.inner_html }
         when "em" then em_parse(node, out)
         when "strong" then strong_parse(node, out)
         when "sup" then sup_parse(node, out)

data/lib/isodoc/function/utils.rb

@@ -13,6 +13,7 @@ module IsoDoc::Function
       [1..n].each { out << "&nbsp; " }
     end
 
+    # add namespaces for Word fragments
     NOKOHEAD = <<~HERE.freeze
     <!DOCTYPE html SYSTEM
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@@ -103,7 +104,7 @@ module IsoDoc::Function
     end
 
     def header_strip(h)
-      h = h.to_s.gsub(%r{<br/>}, " ").sub(/<\/?h[12][^>]*>/, "")
+      h = h.to_s.gsub(%r{<br/>}, " ").sub(/<\/?h[123456][^>]*>/, "")
       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_gen.rb

@@ -180,6 +180,14 @@ module IsoDoc::Function
       end
     end
 
+    def hiersep
+      "."
+    end
+
+    def hierfigsep
+      "-"
+    end
+
     def hierarchical_figure_names(clause, num)
       i = j = 0
       clause.xpath(ns(".//figure")).each do |t|
@@ -188,21 +196,31 @@ module IsoDoc::Function
           j = 0
           i += 1
         end
-        label = "#{num}.#{i}" + (j.zero? ? "" : "-#{j}")
+        label = "#{num}#{hiersep}#{i}" + (j.zero? ? "" : "#{hierfigsep}#{j}")
         next if t["id"].nil? || t["id"].empty?
         @anchors[t["id"]] = anchor_struct(label, nil, @figure_lbl, "figure")
       end
     end
 
-    def hierarchical_asset_names(clause, num)
+    def hierarchical_table_names(clause, num)
       clause.xpath(ns(".//table")).each_with_index do |t, i|
         next if t["id"].nil? || t["id"].empty?
-        @anchors[t["id"]] = anchor_struct("#{num}.#{i + 1}", nil, @table_lbl, "table")
+        @anchors[t["id"]] = anchor_struct("#{num}#{hiersep}#{i + 1}",
+                                          nil, @table_lbl, "table")
       end
+    end
+
+    def hierarchical_asset_names(clause, num)
+      hierarchical_table_names(clause, num)
       hierarchical_figure_names(clause, num)
+      hierarchical_formula_names(clause, num)
+    end
+
+    def hierarchical_formula_names(clause, num)
       clause.xpath(ns(".//formula")).each_with_index do |t, i|
         next if t["id"].nil? || t["id"].empty?
-        @anchors[t["id"]] = anchor_struct("#{num}.#{i + 1}", t, @formula_lbl, "formula")
+        @anchors[t["id"]] = anchor_struct("#{num}#{hiersep}#{i + 1}",
+                                          t, @formula_lbl, "formula")
       end
     end
   end

data/lib/isodoc/function/xref_sect_gen.rb

@@ -4,6 +4,10 @@ module IsoDoc::Function
       docxml.xpath(ns("//annex")).each_with_index do |c, i|
         annex_names(c, (65 + i).chr.to_s)
       end
+      docxml.xpath(ns("//bibliography/clause[not(xmlns:title = 'Normative References' or xmlns:title = 'Normative references')] |"\
+                   "//bibliography/references[not(xmlns:title = 'Normative References' or xmlns:title = 'Normative references')]")).each do |b|
+        preface_names(b)
+      end
       docxml.xpath(ns("//bibitem[not(ancestor::bibitem)]")).each do |ref|
         reference_names(ref)
       end
@@ -16,12 +20,13 @@ module IsoDoc::Function
       sequential_asset_names(d.xpath(ns("//preface/abstract | //foreword | //introduction")))
       n = section_names(d.at(ns("//clause[title = 'Scope']")), 0, 1)
       n = section_names(d.at(ns(
-        "//references[title = 'Normative References' or title = 'Normative references']")), n, 1)
+        "//bibliography/clause[title = 'Normative References' or title = 'Normative references'] |"\
+        "//bibliography/references[title = 'Normative References' or title = 'Normative references']")), n, 1)
       n = section_names(d.at(ns("//sections/terms | "\
                                 "//sections/clause[descendant::terms]")), n, 1)
       n = section_names(d.at(ns("//sections/definitions")), n, 1)
-      middle_section_asset_names(d)
       clause_names(d, n)
+      middle_section_asset_names(d)
       termnote_anchor_names(d)
       termexample_anchor_names(d)
     end
@@ -36,7 +41,7 @@ module IsoDoc::Function
       return if clause.nil?
       @anchors[clause["id"]] =
         { label: nil, level: 1, xref: preface_clause_name(clause), type: "clause" }
-      clause.xpath(ns("./clause | ./terms | ./term | ./definitions")).each_with_index do |c, i|
+      clause.xpath(ns("./clause | ./terms | ./term | ./definitions | ./references")).each_with_index do |c, i|
         preface_names1(c, c.at(ns("./title"))&.text, "#{preface_clause_name(clause)}, #{i+1}", 2)
       end
     end
@@ -45,7 +50,7 @@ module IsoDoc::Function
       label = title || parent_title
       @anchors[clause["id"]] =
         { label: nil, level: level, xref: label, type: "clause" }
-      clause.xpath(ns("./clause | ./terms | ./term | ./definitions")).
+      clause.xpath(ns("./clause | ./terms | ./term | ./definitions | ./references")).
         each_with_index do |c, i|
         preface_names1(c, c.at(ns("./title"))&.text, "#{label} #{i+1}", level + 1)
       end
@@ -73,7 +78,7 @@ module IsoDoc::Function
       num = num + 1
       @anchors[clause["id"]] =
         { label: num.to_s, xref: l10n("#{@clause_lbl} #{num}"), level: lvl, type: "clause" }
-      clause.xpath(ns("./clause | ./term  | ./terms | ./definitions")).
+      clause.xpath(ns("./clause | ./term  | ./terms | ./definitions | ./references")).
         each_with_index do |c, i|
         section_names1(c, "#{num}.#{i + 1}", lvl + 1)
       end
@@ -83,7 +88,7 @@ module IsoDoc::Function
     def section_names1(clause, num, level)
       @anchors[clause["id"]] =
         { label: num, level: level, xref: l10n("#{@clause_lbl} #{num}"), type: "clause" }
-      clause.xpath(ns("./clause | ./terms | ./term | ./definitions")).
+      clause.xpath(ns("./clause | ./terms | ./term | ./definitions | ./references")).
         each_with_index do |c, i|
         section_names1(c, "#{num}.#{i + 1}", level + 1)
       end

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "0.9.13".freeze
+  VERSION = "0.9.14".freeze
 end

data/lib/isodoc/word_function/body.rb

@@ -80,12 +80,16 @@ module IsoDoc::WordFunction
     end
 
     def section_break(body)
-      body.br **{ clear: "all", class: "section" }
+      body.p do |p|
+        p.br **{ clear: "all", class: "section" }
+      end
     end
 
     def page_break(out)
-      out.br **{ clear: "all",
+      out.p do |p|
+        p.br **{ clear: "all",
                  style: "mso-special-character:line-break;page-break-before:always" }
+      end
     end
 
     WORD_DT_ATTRS = {class: @note ? "Note" : nil, align: "left",
@@ -222,5 +226,39 @@ module IsoDoc::WordFunction
         "##{node["target"]}"
         out.a(**{ "href": target }) { |l| l << get_linkend(node) }
     end
+
+    def example_table_attr(node)
+      super.merge({
+        style: "mso-table-lspace:15.0cm;margin-left:423.0pt;"\
+        "mso-table-rspace:15.0cm;margin-right:423.0pt;mso-table-bspace:14.2pt;"\
+        "mso-table-anchor-vertical:paragraph;mso-table-anchor-horizontal:column;"\
+        "mso-table-overlap:never;border-collapse:collapse;"
+      })
+    end
+
+
+    def make_table_attr(node)
+      {
+        style: "mso-table-lspace:15.0cm;margin-left:423.0pt;"\
+        "mso-table-rspace:15.0cm;margin-right:423.0pt;mso-table-bspace:14.2pt;"\
+        "mso-table-anchor-vertical:paragraph;mso-table-anchor-horizontal:column;"\
+        "mso-table-overlap:never;"
+      }.merge(super)
+    end
+
+    def table_parse(node, out)
+      @in_table = true
+      table_title_parse(node, out)
+      out.div **{ align: "center" } do |div|
+        div.table **make_table_attr(node) do |t|
+          thead_parse(node, t)
+          tbody_parse(node, t)
+          tfoot_parse(node, t)
+          (dl = node.at(ns("./dl"))) && parse(dl, out)
+          node.xpath(ns("./note")).each { |n| parse(n, out) }
+        end
+      end
+      @in_table = false
+    end
   end
 end

data/lib/isodoc/word_function/postprocess.rb

@@ -2,6 +2,26 @@ require "fileutils"
 
 module IsoDoc::WordFunction
   module Postprocess
+    # add namespaces for Word fragments
+    WORD_NOKOHEAD = <<~HERE.freeze
+    <!DOCTYPE html SYSTEM
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+    <html xmlns="http://www.w3.org/1999/xhtml"
+xmlns:v="urn:schemas-microsoft-com:vml"
+xmlns:o="urn:schemas-microsoft-com:office:office"
+xmlns:w="urn:schemas-microsoft-com:office:word"
+xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
+    <head> <title></title> <meta charset="UTF-8" /> </head>
+    <body> </body> </html>
+    HERE
+
+    def to_word_xhtml_fragment(xml)
+      doc = ::Nokogiri::XML.parse(WORD_NOKOHEAD)
+      #fragment = doc.fragment(xml)
+      fragment = ::Nokogiri::XML::DocumentFragment.new(doc, xml, doc.root)
+      fragment
+    end
+
     def table_note_cleanup(docxml)
       super
       # preempt html2doc putting MsoNormal there
@@ -70,7 +90,7 @@ module IsoDoc::WordFunction
     def word_cover(docxml)
       cover = File.read(@wordcoverpage, encoding: "UTF-8")
       cover = populate_template(cover, :word)
-      coverxml = to_xhtml_fragment(cover)
+      coverxml = to_word_xhtml_fragment(cover)
       docxml.at('//div[@class="WordSection1"]').children.first.previous =
         coverxml.to_xml(encoding: "US-ASCII")
     end
@@ -79,7 +99,7 @@ module IsoDoc::WordFunction
       intro = File.read(@wordintropage, encoding: "UTF-8").
         sub(/WORDTOC/, make_WordToC(docxml))
       intro = populate_template(intro, :word)
-      introxml = to_xhtml_fragment(intro)
+      introxml = to_word_xhtml_fragment(intro)
       docxml.at('//div[@class="WordSection2"]').children.first.previous =
         introxml.to_xml(encoding: "US-ASCII")
     end

data/spec/isodoc/blocks_spec.rb

@@ -42,9 +42,9 @@ RSpec.describe IsoDoc do
            <div class="WordSection1">
              <p>&#160;</p>
            </div>
-           <br clear="all" class="section"/>
+           <p><br clear="all" class="section"/></p>
            <div class="WordSection2">
-             <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+             <p><br clear="all" style="mso-special-character:line-break;page-break-before:always"/></p>
              <div>
                <h1 class="ForewordTitle">Foreword</h1>
                <div id="" class="Note">
@@ -53,7 +53,7 @@ RSpec.describe IsoDoc do
              </div>
              <p>&#160;</p>
            </div>
-           <br clear="all" class="section"/>
+           <p><br clear="all" class="section"/></p>
            <div class="WordSection3">
              <p class="zzSTDTitle1"/>
            </div>
@@ -200,9 +200,9 @@ INPUT
            <div class="WordSection1">
              <p>&#160;</p>
            </div>
-           <br clear="all" class="section"/>
+           <p><br clear="all" class="section"/></p>
            <div class="WordSection2">
-             <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+             <p><br clear="all" style="mso-special-character:line-break;page-break-before:always"/></p>
              <div>
                <h1 class="ForewordTitle">Foreword</h1>
                <div id="" class="Note"><p class="Note"><span class="note_label">NOTE</span><span style="mso-tab-count:1">&#160; </span></p>
@@ -213,7 +213,7 @@ INPUT
              </div>
              <p>&#160;</p>
            </div>
-           <br clear="all" class="section"/>
+           <p><br clear="all" class="section"/></p>
            <div class="WordSection3">
              <p class="zzSTDTitle1"/>
            </div>
@@ -302,9 +302,9 @@ B</pre>
            <div class="WordSection1">
              <p>&#160;</p>
            </div>
-           <br clear="all" class="section"/>
+           <p><br clear="all" class="section"/></p>
            <div class="WordSection2">
-             <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+             <p><br clear="all" style="mso-special-character:line-break;page-break-before:always"/></p>
              <div>
                <h1 class="ForewordTitle">Foreword</h1>
                <div id="figureA-1" class="figure">
@@ -324,7 +324,7 @@ B</pre>
              </div>
              <p>&#160;</p>
            </div>
-           <br clear="all" class="section"/>
+           <p><br clear="all" class="section"/></p>
            <div class="WordSection3">
              <p class="zzSTDTitle1"/>
            </div>
@@ -597,9 +597,9 @@ World</p>
              <div class="WordSection1">
                <p>&#160;</p>
              </div>
-             <br clear="all" class="section"/>
+             <p><br clear="all" class="section"/></p>
              <div class="WordSection2">
-               <br  clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+               <p><br  clear="all" style="mso-special-character:line-break;page-break-before:always"/></p>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
                  <p id="_08bfe952-d57f-4150-9c95-5d52098cc2a8" align="left" style="text-align:left">Vache Equipment<br/>
@@ -610,7 +610,7 @@ World</p>
                </div>
                <p>&#160;</p>
              </div>
-             <br clear="all" class="section"/>
+             <p><br clear="all" class="section"/></p>
              <div class="WordSection3">
                <p class="zzSTDTitle1"/>
              </div>

data/spec/isodoc/footnotes_spec.rb

@@ -65,9 +65,9 @@ RSpec.describe IsoDoc do
              <div class="WordSection1">
                <p>&#160;</p>
              </div>
-             <br clear="all" class="section"/>
+             <p><br clear="all" class="section"/></p>
              <div class="WordSection2">
-               <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+               <p><br clear="all" style="mso-special-character:line-break;page-break-before:always"/></p>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
                  <p>A.<a href="#ftn2" epub:type="footnote"><sup>2</sup></a></p>
@@ -76,7 +76,7 @@ RSpec.describe IsoDoc do
                </div>
                <p>&#160;</p>
              </div>
-             <br clear="all" class="section"/>
+             <p><br clear="all" class="section"/></p>
              <div class="WordSection3">
                <p class="zzSTDTitle1"/>
                <aside id="ftn2">
@@ -182,9 +182,9 @@ RSpec.describe IsoDoc do
              <div class="WordSection1">
                <p class="MsoNormal">&#xA0;</p>
              </div>
-             <br clear="all" class="section"/>
+             <p class="MsoNormal"><br clear="all" class="section"/></p>
              <div class="WordSection2">
-               <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+               <p class="MsoNormal"><br clear="all" style="mso-special-character:line-break;page-break-before:always"/></p>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
                  <span style="MsoCommentReference" target="1" class="commentLink" from="A" to="B">
@@ -208,14 +208,14 @@ RSpec.describe IsoDoc do
                  </span>
 
                </div>
-               <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+               <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>
 
                </div>
                <p class="MsoNormal">&#xA0;</p>
              </div>
-             <br clear="all" class="section"/>
+             <p class="MsoNormal"><br clear="all" class="section"/></p>
              <div class="WordSection3">
                <p class="zzSTDTitle1"></p>
                <div style="mso-element:comment-list"><div style="mso-element:comment"><a name="3" id="3"></a>

data/spec/isodoc/lists_spec.rb

@@ -199,9 +199,9 @@ RSpec.describe IsoDoc do
               <div class="WordSection1">
                 <p>&#160;</p>
               </div>
-              <br clear="all" class="section"/>
+              <p><br clear="all" class="section"/></p>
               <div class="WordSection2">
-                <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+                <p><br clear="all" style="mso-special-character:line-break;page-break-before:always"/></p>
                 <div>
                   <h1 class="ForewordTitle">Foreword</h1>
                   <table class="dl">
@@ -236,7 +236,7 @@ RSpec.describe IsoDoc do
                 </div>
                 <p>&#160;</p>
               </div>
-              <br clear="all" class="section"/>
+              <p><br clear="all" class="section"/></p>
               <div class="WordSection3">
                 <p class="zzSTDTitle1"/>
               </div>

data/spec/isodoc/postproc_spec.rb

@@ -207,10 +207,10 @@ RSpec.describe IsoDoc do
     </iso-standard>
     INPUT
     word = File.read("test.doc").sub(/^.*<div class="WordSection2">/m, '<div class="WordSection2">').
-      sub(%r{<br clear="all" class="section"/>\s*<div class="WordSection3">.*$}m, "")
+          sub(%r{<p class="MsoNormal">\s*<br clear="all" class="section"/>\s*</p>\s*<div class="WordSection3">.*$}m, "")
     expect(word).to be_equivalent_to <<~"OUTPUT"
         <div class="WordSection2">
-                <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+                <p class="MsoNormal"><br clear="all" style="mso-special-character:line-break;page-break-before:always"/></p>
                 <div>
                   <h1 class="ForewordTitle">Foreword</h1>
                   <table class="dl">
@@ -251,7 +251,7 @@ RSpec.describe IsoDoc do
     expect(word).to be_equivalent_to <<~"OUTPUT"
            <div class="WordSection3">
                <p class="zzSTDTitle1"></p>
-               <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+               <p class="MsoNormal"><br clear="all" style="mso-special-character:line-break;page-break-before:always"/></p>
                <div class="Section3"><a name="P" id="P"></a>
                  <h1 class="Annex"><b>Annex A</b><br/>(normative)<br/><br/><b>Annex</b></h1>
                  <div><a name="Q" id="Q"></a>
@@ -282,9 +282,9 @@ RSpec.describe IsoDoc do
     expect(word).to be_equivalent_to <<~"OUTPUT"
     <div class="WordSection3">
              <p class="zzSTDTitle1"></p>
-             <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+             <p class="MsoNormal"><br clear="all" style="mso-special-character:line-break;page-break-before:always"/></p>
              <div class="Section3"><a name="P" id="P"></a>
-               <table class="example" cellspacing="0" cellpadding="0" style="border-collapse:collapse"><a name="_63112cbc-cde0-435f-9553-e0b8c4f5851c" id="_63112cbc-cde0-435f-9553-e0b8c4f5851c"></a>
+               <table class="example" cellspacing="0" cellpadding="0" style="mso-table-lspace:15.0cm;margin-left:423.0pt;mso-table-rspace:15.0cm;margin-right:423.0pt;mso-table-bspace:14.2pt;mso-table-anchor-vertical:paragraph;mso-table-anchor-horizontal:column;mso-table-overlap:never;border-collapse:collapse;"><a name="_63112cbc-cde0-435f-9553-e0b8c4f5851c" id="_63112cbc-cde0-435f-9553-e0b8c4f5851c"></a>
                  <tr>
                    <td valign="top" class="example_label" style="width:82.8pt;padding:0 0 0 1em;margin-left:0pt">EXAMPLE  1</td>
                    <td valign="top" class="example">
@@ -292,7 +292,7 @@ RSpec.describe IsoDoc do
        </td>
                  </tr>
                </table><p style="margin-top:0cm;margin-right:0cm;margin-bottom:0cm;margin-left:0.0pt;margin-bottom:.0001pt;line-height:1.0pt;mso-line-height-rule:exactly" class="MsoNormal"><span lang="EN-GB" style="display:none;mso-hide:all" xml:lang="EN-GB">&#xA0;</span></p>
-               <table class="example" cellspacing="0" cellpadding="0" style="border-collapse:collapse"><a name="_63112cbc-cde0-435f-9553-e0b8c4f5851d" id="_63112cbc-cde0-435f-9553-e0b8c4f5851d"></a>
+               <table class="example" cellspacing="0" cellpadding="0" style="mso-table-lspace:15.0cm;margin-left:423.0pt;mso-table-rspace:15.0cm;margin-right:423.0pt;mso-table-bspace:14.2pt;mso-table-anchor-vertical:paragraph;mso-table-anchor-horizontal:column;mso-table-overlap:never;border-collapse:collapse;"><a name="_63112cbc-cde0-435f-9553-e0b8c4f5851d" id="_63112cbc-cde0-435f-9553-e0b8c4f5851d"></a>
                  <tr>
                    <td valign="top" class="example_label" style="width:82.8pt;padding:0 0 0 1em;margin-left:0pt">EXAMPLE  2</td>
                    <td valign="top" class="example">
@@ -398,7 +398,7 @@ ICAgICAgIDogRU5EIERPQyBJRAoKRklMRU5BTUU6IHRlc3QKCg==
 
     INPUT
     word = File.read("test.doc").sub(/^.*<div class="WordSection2">/m, '<div class="WordSection2">').
-      sub(%r{<br clear="all" class="section"/>\s*<div class="WordSection3">.*$}m, "")
+      sub(%r{<p class="MsoNormal">\s*<br clear="all" class="section"/>\s*</p>\s*<div class="WordSection3">.*$}m, "")
     expect(word.gsub(/_Toc\d\d+/, "_Toc")).to be_equivalent_to <<~'OUTPUT'
            <div class="WordSection2">
        /* an empty word intro page */

data/spec/isodoc/ref_spec.rb

@@ -69,7 +69,7 @@ RSpec.describe IsoDoc do
   <docidentifier>[10]</docidentifier>
 </bibitem>
 <bibitem id="ref11">
-  <formattedref format="application/x-isodoc+xml"><smallcap>Standard No I.C.C 167</smallcap>. <em>Determination of the protein content in cereal and cereal products for food and animal feeding stuffs according to the Dumas combustion method</em> (see <link target="http://www.icc.or.at"/>)</formattedref>
+  <title>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</title>
   <docidentifier type="IETF">RFC 10</docidentifier>
 </bibitem>
 
@@ -103,7 +103,7 @@ RSpec.describe IsoDoc do
                  <h1 class="Section3">Bibliography</h1>
                  <p id="ISO3696" class="Biblio">[1]&#160; ISO 3696, <i> Water for analytical laboratory use</i></p>
                  <p id="ref10" class="Biblio">[10]&#160; <span style="font-variant:small-caps;">Standard No I.C.C 167</span>. <i>Determination of the protein content in cereal and cereal products for food and animal feeding stuffs according to the Dumas combustion method</i> (see <a href="http://www.icc.or.at">http://www.icc.or.at</a>)</p>
-                 <p id="ref11" class="Biblio">[3]&#160; IETF RFC 10, <span style="font-variant:small-caps;">Standard No I.C.C 167</span>. <i>Determination of the protein content in cereal and cereal products for food and animal feeding stuffs according to the Dumas combustion method</i> (see <a href="http://www.icc.or.at">http://www.icc.or.at</a>)</p>
+                  <p id="ref11" class="Biblio">[3]&#160; IETF RFC 10, <i>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</i></p>
                </div>
                <aside id="fn:1" class="footnote">
          <p>Under preparation. (Stage at the time of publication ISO/DIS 16634)</p>

data/spec/isodoc/section_spec.rb

@@ -260,18 +260,18 @@ OUTPUT
              <div class="WordSection1">
                <p>&#160;</p>
              </div>
-             <br clear="all" class="section"/>
+             <p><br clear="all" class="section"/></p>
              <div class="WordSection2">
-             <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+             <p><br clear="all" style="mso-special-character:line-break;page-break-before:always"/></p>
                 <div>
                    <h1 class="AbstractTitle">Abstract</h1>
                 </div>
-               <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+               <p><br clear="all" style="mso-special-character:line-break;page-break-before:always"/></p>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
                  <p id="A">This is a preamble</p>
                </div>
-               <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+               <p><br clear="all" style="mso-special-character:line-break;page-break-before:always"/></p>
                <div class="Section3" id="B">
                  <h1 class="IntroTitle">Introduction</h1>
                  <div id="C">
@@ -280,7 +280,7 @@ OUTPUT
                </div>
                <p>&#160;</p>
              </div>
-             <br clear="all" class="section"/>
+             <p><br clear="all" class="section"/></p>
              <div class="WordSection3">
                <p class="zzSTDTitle1"/>
                <div id="D">
@@ -333,7 +333,7 @@ OUTPUT
           <h2>5.3. </h2>
         </div>
                </div>
-               <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+               <p><br clear="all" style="mso-special-character:line-break;page-break-before:always"/></p>
                <div id="P" class="Section3">
                  <h1 class="Annex"><b>Annex A</b><br/>(normative)<br/><br/><b>Annex</b></h1>
                  <div id="Q">
@@ -343,7 +343,7 @@ OUTPUT
           </div>
         </div>
                </div>
-               <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+               <p><br clear="all" style="mso-special-character:line-break;page-break-before:always"/></p>
                <div>
                  <h1 class="Section3">Bibliography</h1>
                  <div>

data/spec/isodoc/table_spec.rb

@@ -186,13 +186,14 @@ RSpec.describe IsoDoc do
              <div class="WordSection1">
                <p>&#160;</p>
              </div>
-             <br clear="all" class="section"/>
+             <p><br clear="all" class="section"/></p>
              <div class="WordSection2">
-               <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+               <p><br clear="all" style="mso-special-character:line-break;page-break-before:always"/></p>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
                  <p class="TableTitle" align="center">Table 1&#160;&#8212; Repeatability and reproducibility of husked rice yield</p>
-                 <table id="tableD-1" class="MsoISOTable" border="1" cellspacing="0" cellpadding="0">
+                 <div align="center">
+                 <table style="mso-table-lspace:15.0cm;margin-left:423.0pt;mso-table-rspace:15.0cm;margin-right:423.0pt;mso-table-bspace:14.2pt;mso-table-anchor-vertical:paragraph;mso-table-anchor-horizontal:column;mso-table-overlap:never;" id="tableD-1" class="MsoISOTable" border="1" cellspacing="0" cellpadding="0">
                    <thead>
                      <tr>
                        <td rowspan="2" align="left" style="border-top:solid windowtext 1.5pt;mso-border-top-alt:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;">Description</td>
@@ -244,10 +245,11 @@ RSpec.describe IsoDoc do
                      <p class="Note"><span class="note_label">NOTE</span><span style="mso-tab-count:1">&#160; </span>This is a table about rice</p>
                    </div>
                  </table>
+                 </div>
                </div>
                <p>&#160;</p>
              </div>
-             <br clear="all" class="section"/>
+             <p><br clear="all" class="section"/></p>
              <div class="WordSection3">
                <p class="zzSTDTitle1"/>
              </div>

data/spec/isodoc/terms_spec.rb

@@ -171,13 +171,13 @@ OUTPUT
        <p class="TermNum" id="paddy1">1.1</p><p class="Terms" style="text-align:left;">paddy</p>
 
        <p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">&lt;rice&gt; rice retaining its husk after threshing</p>
-       <table id="_bd57bbf1-f948-4bae-b0ce-73c00431f892" class="example" cellspacing="0" cellpadding="0" style="border-collapse:collapse"><tr><td valign="top" class="example_label" style="width:82.8pt;padding:0 0 0 1em;margin-left:0pt">EXAMPLE 1</td><td valign="top" class="example">
+       <table id="_bd57bbf1-f948-4bae-b0ce-73c00431f892" class="example" cellspacing="0" cellpadding="0" style="mso-table-lspace:15.0cm;margin-left:423.0pt;mso-table-rspace:15.0cm;margin-right:423.0pt;mso-table-bspace:14.2pt;mso-table-anchor-vertical:paragraph;mso-table-anchor-horizontal:column;mso-table-overlap:never;border-collapse:collapse;"><tr><td valign="top" class="example_label" style="width:82.8pt;padding:0 0 0 1em;margin-left:0pt">EXAMPLE 1</td><td valign="top" class="example">
          <p id="_65c9a509-9a89-4b54-a890-274126aeb55c">Foreign seeds, husks, bran, sand, dust.</p>
          <ul>
          <li>A</li>
          </ul>
        </td></tr></table>
-       <table id="_bd57bbf1-f948-4bae-b0ce-73c00431f894" class="example" cellspacing="0" cellpadding="0" style="border-collapse:collapse"><tr><td valign="top" class="example_label" style="width:82.8pt;padding:0 0 0 1em;margin-left:0pt">EXAMPLE 2</td><td valign="top" class="example">
+       <table id="_bd57bbf1-f948-4bae-b0ce-73c00431f894" class="example" cellspacing="0" cellpadding="0" style="mso-table-lspace:15.0cm;margin-left:423.0pt;mso-table-rspace:15.0cm;margin-right:423.0pt;mso-table-bspace:14.2pt;mso-table-anchor-vertical:paragraph;mso-table-anchor-horizontal:column;mso-table-overlap:never;border-collapse:collapse;"><tr><td valign="top" class="example_label" style="width:82.8pt;padding:0 0 0 1em;margin-left:0pt">EXAMPLE 2</td><td valign="top" class="example">
          <ul>
          <li>A</li>
          </ul>
@@ -190,7 +190,7 @@ OUTPUT
        <p class="AltTerms" style="text-align:left;">rough rice</p>
        <p class="DeprecatedTerms" style="text-align:left;">DEPRECATED: cargo rice</p>
        <p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p>
-       <table id="_bd57bbf1-f948-4bae-b0ce-73c00431f893" class="example" cellspacing="0" cellpadding="0" style="border-collapse:collapse"><tr><td valign="top" class="example_label" style="width:82.8pt;padding:0 0 0 1em;margin-left:0pt">EXAMPLE</td><td valign="top" class="example">
+       <table id="_bd57bbf1-f948-4bae-b0ce-73c00431f893" class="example" cellspacing="0" cellpadding="0" style="mso-table-lspace:15.0cm;margin-left:423.0pt;mso-table-rspace:15.0cm;margin-right:423.0pt;mso-table-bspace:14.2pt;mso-table-anchor-vertical:paragraph;mso-table-anchor-horizontal:column;mso-table-overlap:never;border-collapse:collapse;"><tr><td valign="top" class="example_label" style="width:82.8pt;padding:0 0 0 1em;margin-left:0pt">EXAMPLE</td><td valign="top" class="example">
          <ul>
          <li>A</li>
          </ul>

data/spec/isodoc/xref_spec.rb

@@ -41,7 +41,7 @@ RSpec.describe IsoDoc do
     </iso-standard
     INPUT
            <div class="WordSection2">
-             <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+             <p><br clear="all" style="mso-special-character:line-break;page-break-before:always"/></p>
              <div>
                <h1 class="ForewordTitle">Foreword</h1>
                <p>
@@ -1065,6 +1065,7 @@ RSpec.describe IsoDoc do
          <xref target="Q"/>
          <xref target="Q1"/>
          <xref target="R"/>
+         <xref target="S"/>
          </p>
        </foreword>
         <introduction id="B" obligation="informative"><title>Introduction</title><clause id="C" inline-header="false" obligation="informative">
@@ -1142,6 +1143,7 @@ RSpec.describe IsoDoc do
     <a href="#Q">Annex A.1</a>
     <a href="#Q1">Annex A.1.1</a>
     <a href="#R">Clause 2</a>
+    <a href="#S">Bibliography</a>
     </p>
     </div>
     <br/>

data/spec/spec_helper.rb

@@ -51,10 +51,10 @@ WORD_HDR = <<~END
            <div class="WordSection1">
              <p>&#160;</p>
            </div>
-           <br clear="all" class="section"/>
+           <p><br clear="all" class="section"/></p>
            <div class="WordSection2">
              <p>&#160;</p>
            </div>
-           <br clear="all" class="section"/>
+           <p><br clear="all" class="section"/></p>
            <div class="WordSection3">
 END

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 0.9.13
+  version: 0.9.14
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-19 00:00:00.000000000 Z
+date: 2019-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: 2.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement