isodoc 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1edc88536663d06a4d23249a6ec1909148185456f84a427fe2299da8e138ab4
-  data.tar.gz: fd6099657296706882b03eb557f59b242c733415b9d49fe8bf4e3aa73bd67eb8
+  metadata.gz: 29fb94d37c013e802491e2c1266e8b39d607ea3050f272f1a7bcd398e57c0283
+  data.tar.gz: 85ea530071d54477f462d34a5b18dbf9ba500b71a4d5ea858b62530757a6b795
 SHA512:
-  metadata.gz: 4112c5b84d25a09e9d701b9735d80e01e9f4bf294288c097524c83e31689dc90c1dd9168e9f70061868d41c032d2b864a96b76b19f0926584a2549a1f5309a63
-  data.tar.gz: b002124056e50a37732ad78fa9e959658b0f07c9f5af9d248f69c0d282cc74804471124fc4b7f150ba19935e3aa904df0d54222fb201e279d6325ebfffe9def8
+  metadata.gz: 9539cdc3d0fac50a04aa3cdf93581016306b660f1d0681a8a1e06255ed839ac9362c887b9a6f0ef7480711122c5275e0936fab640efff76c84aaa5ad84831f84
+  data.tar.gz: b05012f1f7189becfa14871de424ae5713a8791a9c0b520cdcca591d3f733d996c776d2f37d2c1ff23fdff6b2c146b6e09d2f9c5b97dcbeec43edafd9785dfcb

data/lib/isodoc/function/inline_simple.rb

@@ -23,7 +23,10 @@ module IsoDoc::Function
     def index_parse(node, out)
     end
 
-        def bookmark_parse(node, out)
+    def index_xref_parse(node, out)
+    end
+
+    def bookmark_parse(node, out)
       out.a **attr_code(id: node["id"])
     end
 

data/lib/isodoc/function/table.rb

@@ -58,11 +58,21 @@ module IsoDoc::Function
       end
     end
 
+    def colgroup(node, t)
+      colgroup = node.at(ns("./colgroup")) or return
+      t.colgroup do |cg|
+        colgroup.xpath(ns("./col")).each do |c|
+          cg.col **{ style: "width: #{c['width']};" }
+        end
+      end
+    end
+
     def table_parse(node, out)
       @in_table = true
       table_title_parse(node, out)
       out.table **table_attrs(node) do |t|
         tcaption(node, t)
+        colgroup(node, t)
         thead_parse(node, t)
         tbody_parse(node, t)
         tfoot_parse(node, t)

data/lib/isodoc/function/to_word_html.rb

@@ -215,6 +215,7 @@ module IsoDoc::Function
         when "verification" then requirement_component_parse(node, out)
         when "import" then requirement_component_parse(node, out)
         when "index" then index_parse(node, out)
+        when "index-xref" then index_xref_parse(node, out)
         when "termref" then termrefelem_parse(node, out)
         when "copyright-statement" then copyright_parse(node, out)
         when "license-statement" then license_parse(node, out)

data/lib/isodoc/gem_tasks.rb

@@ -97,6 +97,10 @@ module IsoDoc
         $bodyfont: '{{bodyfont}}';
         $headerfont: '{{headerfont}}';
         $monospacefont: '{{monospacefont}}';
+        $normalfontsize: '{{normalfontsize}}';
+        $smallerfontsize: '{{smallerfontsize}}';
+        $footnotefontsize: '{{footnotefontsize}}';
+        $monospacefontsize: '{{monospacefontsize}}';
       TEXT
     end
 

data/lib/isodoc/html_function/html.rb

@@ -60,6 +60,7 @@ module IsoDoc::HtmlFunction
     <script type="text/javascript">#{toclevel}</script>
 
     <!--Google fonts-->
+      <link rel="preconnect" href="https://fonts.gstatic.com"> 
       #{googlefonts}
     <!--Font awesome import for the link icon-->
     <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.8/css/solid.css" integrity="sha384-v2Tw72dyUXeU3y4aM2Y0tBJQkGfplr39mxZqlTBDUZAb9BGoC40+rdFCG0m10lXk" crossorigin="anonymous">

data/lib/isodoc/presentation_function/section.rb

@@ -42,5 +42,11 @@ module IsoDoc
       lbl = @xrefs.get[f["id"]][:label] or return
       prefix_name(f, "", "#{lbl}#{clausedelim}", "name")
     end
+
+    def index(docxml)
+      docxml.xpath(ns("//index | //index-xref")).each do |f|
+        f.remove
+      end
+    end
   end
 end

data/lib/isodoc/presentation_xml_convert.rb

@@ -30,6 +30,7 @@ module IsoDoc
       clause docxml
       annex docxml
       term docxml
+      index docxml
     end
 
     def block(docxml)

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "1.3.0".freeze
+  VERSION = "1.3.1".freeze
 end

data/lib/isodoc/word_function/postprocess.rb

@@ -5,11 +5,9 @@ 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">
+    <!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: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>
@@ -18,15 +16,13 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
 
     def to_word_xhtml_fragment(xml)
       doc = ::Nokogiri::XML.parse(WORD_NOKOHEAD)
-      fragment = ::Nokogiri::XML::DocumentFragment.new(doc, xml, doc.root)
-      fragment
+      ::Nokogiri::XML::DocumentFragment.new(doc, xml, doc.root)
     end
 
     def table_note_cleanup(docxml)
       super
       # preempt html2doc putting MsoNormal there
-      docxml.xpath("//p[not(self::*[@class])]"\
-                   "[ancestor::*[@class = 'Note']]").each do |p|
+      docxml.xpath("//p[not(self::*[@class])][ancestor::*[@class = 'Note']]").each do |p|
         p["class"] = "Note"
       end
     end
@@ -56,8 +52,7 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
 
     def word_admonition_images(docxml)
       docxml.xpath("//div[@class = 'Admonition']//img").each do |i|
-        i["width"], i["height"] =
-          Html2Doc.image_resize(i, image_localfile(i), @maxheight, 300)
+        i["width"], i["height"] = Html2Doc.image_resize(i, image_localfile(i), @maxheight, 300)
       end
     end
 
@@ -65,6 +60,7 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
       word_annex_cleanup(docxml)
       word_preface(docxml)
       word_nested_tables(docxml)
+      word_colgroup(docxml)
       word_table_align(docxml)
       word_table_separator(docxml)
       word_admonition_images(docxml)
@@ -78,28 +74,44 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
       docxml
     end
 
-    def word_nested_tables(docxml)
-      docxml.xpath("//table").each do |t|
-        t.xpath(".//table").reverse.each do |tt|
-          t.next = tt.remove
+    def word_colgroup(docxml)
+      cells2d = {}
+      docxml.xpath("//table[colgroup]").each do |t|
+        w = colgroup_widths(t)
+        t.xpath(".//tr").each_with_index { |tr, r| cells2d[r] = {} }
+        t.xpath(".//tr").each_with_index do |tr, r|
+          tr.xpath("./td | ./th").each_with_index do |td, i|
+            x = 0
+            rs = td&.attr("rowspan")&.to_i || 1
+            cs = td&.attr("colspan")&.to_i || 1
+            while cells2d[r][x] do
+              x += 1 
+            end
+            for y2 in r..(r + rs - 1)
+              for x2 in x..(x + cs - 1)
+                cells2d[y2][x2] = 1
+              end
+            end
+            width = (x..(x+cs-1)).each_with_object({width: 0}) { |z, m| m[:width] += w[z] }
+            td["width"] = "#{width[:width]}%"
+            x += cs
+          end
         end
       end
     end
 
-    def authority_cleanup1(docxml, klass)
-      dest = docxml.at("//div[@id = 'boilerplate-#{klass}-destination']")
-      auth = docxml.at("//div[@id = 'boilerplate-#{klass}' or @class = 'boilerplate-#{klass}']")
-      auth&.xpath(".//h1[not(text())] | .//h2[not(text())]")&.each { |h| h.remove }
-      auth&.xpath(".//h1 | .//h2")&.each do |h|
-        h.name = "p"
-        h["class"] = "TitlePageSubhead"
+    # assume percentages
+    def colgroup_widths(t)
+      t.xpath("./colgroup/col").each_with_object([]) do |c, m|
+        m << c["width"].sub(/%$/, "").to_f
       end
-      dest and auth and dest.replace(auth.remove)
     end
 
-    def authority_cleanup(docxml)
-      %w(copyright license legal feedback).each do |t|
-        authority_cleanup1(docxml, t)
+    def word_nested_tables(docxml)
+      docxml.xpath("//table").each do |t|
+        t.xpath(".//table").reverse.each do |tt|
+          t.next = tt.remove
+        end
       end
     end
 
@@ -144,19 +156,6 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
       end
     end
 
-=begin
-    EMPTY_PARA = "<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'>"\
-      "<span lang=EN-GB style='display:none;mso-hide:all'>&nbsp;</span></p>"
-
-    def table_after_table(docxml)
-     docxml.xpath("//table[following-sibling::*[1]/self::table]").each do |t|
-        t.add_next_sibling(EMPTY_PARA)
-      end
-    end
-=end
-
     def word_table_separator(docxml)
       docxml.xpath("//p[@class = 'TableTitle']").each do |t|
         next unless t.children.empty?
@@ -180,46 +179,6 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
       end
     end
 
-    def generate_header(filename, _dir)
-      return nil unless @header
-      template = IsoDoc::Common.liquid(File.read(@header, encoding: "UTF-8"))
-      meta = @meta.get.merge(@labels || {}).merge(@meta.labels || {})
-      meta[:filename] = filename
-      params = meta.map { |k, v| [k.to_s, v] }.to_h
-      Tempfile.open(%w(header html), :encoding => "utf-8") do |f|
-        f.write(template.render(params))
-        f
-      end
-    end
-
-    def word_section_breaks(docxml)
-      @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)
-      docxml.xpath("//div[@class = '#{sect}']//br[@orientation]").reverse.
-        each_with_index do |br, i|
-        @landscapestyle += "\ndiv.#{sect}_#{i} {page:#{sect}"\
-          "#{br["orientation"] == "landscape" ? "L" : "P"};}\n"
-        split_at_section_break(docxml, sect, br, i)
-      end
-    end
-
-    def split_at_section_break(docxml, sect, br, i)
-      move = br.parent.xpath("following::node()") &
-        br.document.xpath("//div[@class = '#{sect}']//*")
-      ins = docxml.at("//div[@class = '#{sect}']").
-        after("<div class='#{sect}_#{i}'/>").next_element
-      move.each do |m|
-        next if m.at("./ancestor::div[@class = '#{sect}_#{i}']")
-        ins << m.remove
-      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|
@@ -237,8 +196,7 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
       docxml.xpath("//a[@epub:type = 'footnote']").each do |x|
         footnote_reference_format(x)
       end
-      docxml.xpath("//a[@class = 'TableFootnoteRef'] | "\
-                   "//span[@class = 'TableFootnoteRef']").each do |x|
+      docxml.xpath("//a[@class = 'TableFootnoteRef'] | //span[@class = 'TableFootnoteRef']").each do |x|
         table_footnote_reference_format(x)
       end
       docxml

data/lib/isodoc/word_function/postprocess_cover.rb

@@ -75,5 +75,60 @@ module IsoDoc::WordFunction
       toc.sub(/(<p class="MsoToc1">)/,
               %{\\1#{word_toc_preface(level)}}) +  WORD_TOC_SUFFIX1
     end
+
+    def authority_cleanup1(docxml, klass)
+      dest = docxml.at("//div[@id = 'boilerplate-#{klass}-destination']")
+      auth = docxml.at("//div[@id = 'boilerplate-#{klass}' or @class = 'boilerplate-#{klass}']")
+      auth&.xpath(".//h1[not(text())] | .//h2[not(text())]")&.each { |h| h.remove }
+      auth&.xpath(".//h1 | .//h2")&.each do |h|
+        h.name = "p"
+        h["class"] = "TitlePageSubhead"
+      end
+      dest and auth and dest.replace(auth.remove)
+    end
+
+    def authority_cleanup(docxml)
+      %w(copyright license legal feedback).each do |t|
+        authority_cleanup1(docxml, t)
+      end
+    end
+
+    def generate_header(filename, _dir)
+      return nil unless @header
+      template = IsoDoc::Common.liquid(File.read(@header, encoding: "UTF-8"))
+      meta = @meta.get.merge(@labels || {}).merge(@meta.labels || {})
+      meta[:filename] = filename
+      params = meta.map { |k, v| [k.to_s, v] }.to_h
+      Tempfile.open(%w(header html), :encoding => "utf-8") do |f|
+        f.write(template.render(params))
+        f
+      end
+    end
+
+    def word_section_breaks(docxml)
+      @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)
+      docxml.xpath("//div[@class = '#{sect}']//br[@orientation]").reverse.
+        each_with_index do |br, i|
+        @landscapestyle += "\ndiv.#{sect}_#{i} {page:#{sect}#{br["orientation"] == "landscape" ? "L" : "P"};}\n"
+        split_at_section_break(docxml, sect, br, i)
+      end
+    end
+
+    def split_at_section_break(docxml, sect, br, i)
+      move = br.parent.xpath("following::node()") &
+        br.document.xpath("//div[@class = '#{sect}']//*")
+      ins = docxml.at("//div[@class = '#{sect}']").after("<div class='#{sect}_#{i}'/>").next_element
+      move.each do |m|
+        next if m.at("./ancestor::div[@class = '#{sect}_#{i}']")
+        ins << m.remove
+      end
+    end
   end
 end

data/lib/isodoc/word_function/table.rb

@@ -43,11 +43,21 @@ module IsoDoc::WordFunction
       }))
     end
 
+    def colgroup(node, t)
+      colgroup = node.at(ns("./colgroup")) or return
+      t.colgroup do |cg|
+        colgroup.xpath(ns("./col")).each do |c|
+          cg.col **{ width: c["width"] }
+        end
+      end
+    end
+
     def table_parse(node, out)
       @in_table = true
       table_title_parse(node, out)
       out.div **{ align: "center", class: "table_container" } do |div|
         div.table **table_attrs(node) do |t|
+          colgroup(node, t)
           thead_parse(node, t)
           tbody_parse(node, t)
           tfoot_parse(node, t)

data/lib/isodoc/xref.rb

@@ -49,6 +49,7 @@ module IsoDoc
       note_anchor_names(docxml.xpath(ns(SECTIONS_XPATH)))
       example_anchor_names(docxml.xpath(ns(SECTIONS_XPATH)))
       list_anchor_names(docxml.xpath(ns(SECTIONS_XPATH)))
+      bookmark_anchor_names(docxml.xpath(ns(SECTIONS_XPATH)))
     end
 
     def ns(xpath)

data/lib/isodoc/xref/xref_gen.rb

@@ -66,6 +66,10 @@ module IsoDoc::XrefGen
       "//sections/clause | //sections/definitions | "\
       "//bibliography/references | //bibliography/clause".freeze
 
+    def sections_xpath
+      SECTIONS_XPATH
+    end
+
     CHILD_NOTES_XPATH =
       "./*[not(self::xmlns:clause) and not(self::xmlns:appendix) and "\
       "not(self::xmlns:terms) and not(self::xmlns:definitions)]//xmlns:note | "\
@@ -136,5 +140,19 @@ module IsoDoc::XrefGen
         end
       end
     end
+
+    def bookmark_anchor_names(sections)
+      sections.each do |s|
+        notes = s.xpath(ns(".//bookmark")) - s.xpath(ns(".//clause//bookmark")) -
+          s.xpath(ns(".//appendix//bookmark"))
+        notes.each do |n|
+          next if n["id"].nil? || n["id"].empty?
+          @anchors[n["id"]] = {
+            type: "bookmark", label: nil, value: nil,
+            xref: @anchors[s["id"]][:xref] }
+        end
+        bookmark_anchor_names(s.xpath(ns(CHILD_SECTIONS)))
+      end
+    end
   end
 end

data/spec/isodoc/cleanup_spec.rb

@@ -1186,5 +1186,4 @@ modified — with adjustments]
 </html>
 OUTPUT
    end
-
 end

data/spec/isodoc/inline_spec.rb

@@ -117,7 +117,7 @@ OUTPUT
   end
 
     it "ignores index entries" do
-    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <p><index primary="A" secondary="B" tertiary="C"/></p>
@@ -125,16 +125,14 @@ OUTPUT
     <sections>
     </iso-standard>
     INPUT
-        #{HTML_HDR}
-             <br/>
-             <div>
-               <h1 class='ForewordTitle'>Foreword</h1>
-               <p/>
-             </div>
-             <p class='zzSTDTitle1'/>
-           </div>
-         </body>
-       </html>
+    <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+  <preface>
+    <foreword>
+      <p/>
+    </foreword>
+  </preface>
+  <sections> </sections>
+</iso-standard>
     OUTPUT
     end
 

data/spec/isodoc/postproc_spec.rb

@@ -1594,4 +1594,277 @@ OUTPUT
     OUTPUT
        end
 
+
+   it "allocate widths to tables (Word)" do
+      expect(xmlpp(IsoDoc::WordConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.scss", filename: "test"}).word_cleanup(Nokogiri::XML(<<~INPUT)).to_xml).sub(/^.*<main/m, "<main").sub(%r{</main>.*$}m, "</main>")).to be_equivalent_to xmlpp(<<~"OUTPUT")
+       <html xmlns:epub="http://www.idpf.org/2007/ops" lang="en">
+         <head><style/></head>
+         <body lang='EN-US' link='blue' vlink='#954F72'>
+           <div class='WordSection1'>
+             <p>&#160;</p>
+           </div>
+           <p>
+             <br clear='all' class='section'/>
+           </p>
+           <div class='WordSection2'>
+             <p>
+               <br clear='all' style='mso-special-character:line-break;page-break-before:always'/>
+             </p>
+             <div>
+               <h1 class='ForewordTitle'>Foreword</h1>
+               <p class='TableTitle' style='text-align:center;'>
+                  Table 1&#160;&#8212; Repeatability and reproducibility of
+                 <i>husked</i>
+                  rice yield
+                 <span style='mso-bookmark:_Ref'>
+                   <a class='FootnoteRef' href='#ftn1' epub:type='footnote'>
+                     <sup>1</sup>
+                   </a>
+                 </span>
+               </p>
+               <div align='center' class='table_container'>
+                 <table id='tableD-1' class='MsoISOTable' style='mso-table-anchor-horizontal:column;mso-table-overlap:never;border-spacing:0;border-width:1px;page-break-after: avoid;page-break-inside: avoid;' title='tool tip' summary='long desc' width='70%'>
+                 <colgroup>
+  <col width='30%'/>
+  <col width='20%'/>
+  <col width='20%'/>
+  <col width='20%'/>
+  <col width='10%'/>
+</colgroup>
+                   <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>
+                       <td colspan='4' align='center' style='border-top:solid windowtext 1.5pt;mso-border-top-alt:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;mso-border-bottom-alt:solid windowtext 1.0pt;'>Rice sample</td>
+                     </tr>
+                     <tr>
+                       <td align='left' valign="top" style='border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;'>Arborio</td>
+                       <td align='center' valign="middle" style='border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;'>
+                          Drago
+                         <a href='#tableD-1a' class='TableFootnoteRef'>a</a>
+                         <aside>
+                           <div id='ftntableD-1a'>
+                             <span>
+                               <span id='tableD-1a' class='TableFootnoteRef'>a</span>
+                               <span style='mso-tab-count:1'>&#160; </span>
+                             </span>
+                             <p id='_0fe65e9a-5531-408e-8295-eeff35f41a55'>Parboiled rice.</p>
+                           </div>
+                         </aside>
+                       </td>
+                       <td align='center' valign="bottom" style='border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;'>
+                          Balilla
+                         <a href='#tableD-1a' class='TableFootnoteRef'>a</a>
+                       </td>
+                       <td align='center' style='border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;'>Thaibonnet</td>
+                     </tr>
+                   </thead>
+                   <tbody>
+                     <tr>
+                       <th align='left' style='font-weight:bold;border-top:solid windowtext 1.5pt;mso-border-top-alt:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;mso-border-bottom-alt:solid windowtext 1.0pt;'>Number of laboratories retained after eliminating outliers</th>
+                       <td align='center' style='border-top:solid windowtext 1.5pt;mso-border-top-alt:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;mso-border-bottom-alt:solid windowtext 1.0pt;'>13</td>
+                       <td align='center' style='border-top:solid windowtext 1.5pt;mso-border-top-alt:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;mso-border-bottom-alt:solid windowtext 1.0pt;'>11</td>
+                       <td align='center' style='border-top:solid windowtext 1.5pt;mso-border-top-alt:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;mso-border-bottom-alt:solid windowtext 1.0pt;'>13</td>
+                       <td align='center' style='border-top:solid windowtext 1.5pt;mso-border-top-alt:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;mso-border-bottom-alt:solid windowtext 1.0pt;'>13</td>
+                     </tr>
+                     <tr>
+                       <td align='left' style='border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;'>Mean value, g/100 g</td>
+                       <td align='center' style='border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;'>81,2</td>
+                       <td align='center' style='border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;'>82,0</td>
+                       <td align='center' style='border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;'>81,8</td>
+                       <td align='center' style='border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;'>77,7</td>
+                     </tr>
+                   </tbody>
+                   <tfoot>
+                     <tr>
+                       <td 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;'>
+                          Reproducibility limit,
+                         <span class='stem'>(#(R)#)</span>
+                          (= 2,83
+                         <span class='stem'>(#(s_R)#)</span>
+                          )
+                       </td>
+                       <td align='center' 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;'>2,89</td>
+                       <td align='center' 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;'>0,57</td>
+                       <td align='center' 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;'>2,26</td>
+                       <td align='center' 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;'>6,06</td>
+                     </tr>
+                   </tfoot>
+                   <table class='dl'>
+                     <tr>
+                       <td valign='top' align='left'>
+                         <p align='left' style='margin-left:0pt;text-align:left;'>Drago</p>
+                       </td>
+                       <td valign='top'>A type of rice</td>
+                     </tr>
+                   </table>
+                   <div class='Note'>
+                     <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 align='center' class='table_container'>
+                 <table id='tableD-2' class='MsoISOTable' style='mso-table-anchor-horizontal:column;mso-table-overlap:never;border-spacing:0;border-width:1px;'>
+                   <tbody>
+                     <tr>
+                       <td 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;'>A</td>
+                     </tr>
+                   </tbody>
+                 </table>
+               </div>
+             </div>
+             <p>&#160;</p>
+           </div>
+           <p>
+             <br clear='all' class='section'/>
+           </p>
+           <div class='WordSection3'>
+             <p class='zzSTDTitle1'/>
+             <aside id='ftn1'>
+               <p>X</p>
+             </aside>
+           </div>
+         </body>
+       </html>
+INPUT
+<html xmlns:epub='http://www.idpf.org/2007/ops' lang='en'>
+         <head>
+           <style/>
+         </head>
+         <body lang='EN-US' link='blue' vlink='#954F72'>
+           <div class='WordSection1'>
+             <p>&#xA0;</p>
+           </div>
+           <p>
+             <br clear='all' class='section'/>
+           </p>
+           <div class='WordSection2'>
+             <p>
+               <br clear='all' style='mso-special-character:line-break;page-break-before:always'/>
+             </p>
+             <div>
+               <h1 class='ForewordTitle'>Foreword</h1>
+               <p class='TableTitle' style='text-align:center;'>
+                  Table 1&#xA0;&#x2014; Repeatability and reproducibility of
+                 <i>husked</i>
+                  rice yield
+                 <span style='mso-bookmark:_Ref'>
+                   <a class='FootnoteRef' href='#ftn1' epub:type='footnote'>
+                     <sup>1</sup>
+                   </a>
+                 </span>
+               </p>
+               <div align='center' class='table_container'>
+                 <table id='tableD-1' class='MsoISOTable' style='mso-table-anchor-horizontal:column;mso-table-overlap:never;border-spacing:0;border-width:1px;page-break-after: avoid;page-break-inside: avoid;' title='tool tip' summary='long desc' width='70%'>
+                   <colgroup>
+                     <col width='30%'/>
+                     <col width='20%'/>
+                     <col width='20%'/>
+                     <col width='20%'/>
+                     <col width='10%'/>
+                   </colgroup>
+                   <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;' width='30.0%'>Description</td>
+                       <td colspan='4' align='center' style='border-top:solid windowtext 1.5pt;mso-border-top-alt:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;mso-border-bottom-alt:solid windowtext 1.0pt;' width='70.0%'>Rice sample</td>
+                     </tr>
+                     <tr>
+                       <td align='left' valign='top' style='border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;' width='20.0%'>Arborio</td>
+                       <td align='center' valign='middle' style='border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;' width='20.0%'>
+                          Drago
+                         <a href='#tableD-1a' class='TableFootnoteRef'>a</a>
+                         <aside>
+                           <div id='ftntableD-1a'>
+                             <span>
+                               <span id='tableD-1a' class='TableFootnoteRef'>a</span>
+                               <span style='mso-tab-count:1'>&#xA0; </span>
+                             </span>
+                             <p id='_0fe65e9a-5531-408e-8295-eeff35f41a55'>Parboiled rice.</p>
+                           </div>
+                         </aside>
+                       </td>
+                       <td align='center' valign='bottom' style='border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;' width='20.0%'>
+                          Balilla
+                         <a href='#tableD-1a' class='TableFootnoteRef'>a</a>
+                       </td>
+                       <td align='center' style='border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;' width='10.0%'>Thaibonnet</td>
+                     </tr>
+                   </thead>
+                   <tbody>
+                     <tr>
+                       <th align='left' style='font-weight:bold;border-top:solid windowtext 1.5pt;mso-border-top-alt:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;mso-border-bottom-alt:solid windowtext 1.0pt;' width='30.0%'>Number of laboratories retained after eliminating outliers</th>
+                       <td align='center' style='border-top:solid windowtext 1.5pt;mso-border-top-alt:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;mso-border-bottom-alt:solid windowtext 1.0pt;' width='20.0%'>13</td>
+                       <td align='center' style='border-top:solid windowtext 1.5pt;mso-border-top-alt:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;mso-border-bottom-alt:solid windowtext 1.0pt;' width='20.0%'>11</td>
+                       <td align='center' style='border-top:solid windowtext 1.5pt;mso-border-top-alt:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;mso-border-bottom-alt:solid windowtext 1.0pt;' width='20.0%'>13</td>
+                       <td align='center' style='border-top:solid windowtext 1.5pt;mso-border-top-alt:solid windowtext 1.5pt;border-bottom:solid windowtext 1.0pt;mso-border-bottom-alt:solid windowtext 1.0pt;' width='10.0%'>13</td>
+                     </tr>
+                     <tr>
+                       <td align='left' style='border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;' width='30.0%'>Mean value, g/100 g</td>
+                       <td align='center' style='border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;' width='20.0%'>81,2</td>
+                       <td align='center' style='border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;' width='20.0%'>82,0</td>
+                       <td align='center' style='border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;' width='20.0%'>81,8</td>
+                       <td align='center' style='border-top:none;mso-border-top-alt:none;border-bottom:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;' width='10.0%'>77,7</td>
+                     </tr>
+                   </tbody>
+                   <tfoot>
+                     <tr>
+                       <td 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;' width='30.0%'>
+                          Reproducibility limit,
+                         <span class='stem'>(#(R)#)</span>
+                          (= 2,83
+                         <span class='stem'>(#(s_R)#)</span>
+                          )
+                       </td>
+                       <td align='center' 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;' width='20.0%'>2,89</td>
+                       <td align='center' 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;' width='20.0%'>0,57</td>
+                       <td align='center' 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;' width='20.0%'>2,26</td>
+                       <td align='center' 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;' width='10.0%'>6,06</td>
+                     </tr>
+                   </tfoot>
+                   <div class='Note'>
+                     <p class='Note'>
+                       <span class='note_label'>NOTE</span>
+                       <span style='mso-tab-count:1'>&#xA0; </span>
+                        This is a table about rice
+                     </p>
+                   </div>
+                 </table>
+                 <table class='dl'>
+                   <tr>
+                     <td valign='top' align='left'>
+                       <p align='left' style='margin-left:0pt;text-align:left;'>Drago</p>
+                     </td>
+                     <td valign='top'>A type of rice</td>
+                   </tr>
+                 </table>
+               </div>
+               <div align='center' class='table_container'>
+                 <table id='tableD-2' class='MsoISOTable' style='mso-table-anchor-horizontal:column;mso-table-overlap:never;border-spacing:0;border-width:1px;'>
+                   <tbody>
+                     <tr>
+                       <td 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;'>A</td>
+                     </tr>
+                   </tbody>
+                 </table>
+               </div>
+             </div>
+             <p>&#xA0;</p>
+           </div>
+           <p>
+             <br clear='all' class='section'/>
+           </p>
+           <div class='WordSection3'>
+             <p class='zzSTDTitle1'/>
+             <aside id='ftn1'>
+               <p>X</p>
+             </aside>
+           </div>
+         </body>
+       </html>
+OUTPUT
+   end
+
 end

data/spec/isodoc/table_spec.rb

@@ -8,6 +8,13 @@ RSpec.describe IsoDoc do
     <foreword>
       <table id="tableD-1" alt="tool tip" summary="long desc" width="70%" keep-with-next="true" keep-lines-together="true">
   <name>Repeatability and reproducibility of <em>husked</em> rice yield<fn reference="1"><p>X</p></fn></name>
+  <colgroup>
+  <col width="30%"/>
+  <col width="20%"/>
+  <col width="20%"/>
+  <col width="20%"/>
+  <col width="10%"/>
+  </colgroup>
   <thead>
     <tr>
       <td rowspan="2" align="left">Description</td>
@@ -77,6 +84,13 @@ RSpec.describe IsoDoc do
                    <p>X</p>
                  </fn>
                </name>
+                <colgroup>
+   <col width='30%'/>
+   <col width='20%'/>
+   <col width='20%'/>
+   <col width='20%'/>
+   <col width='10%'/>
+ </colgroup>
                <thead>
                  <tr>
                    <td rowspan='2' align='left'>Description</td>
@@ -165,6 +179,13 @@ html = <<~OUTPUT
                <caption>
                <span style="display:none">long desc</span>
                </caption>
+                <colgroup>
+   <col style='width: 30%;'/>
+   <col style='width: 20%;'/>
+   <col style='width: 20%;'/>
+   <col style='width: 20%;'/>
+   <col style='width: 10%;'/>
+ </colgroup>
                  <thead>
                    <tr>
                      <td rowspan="2" style="text-align:left;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;" scope="col">Description</td>
@@ -259,6 +280,13 @@ html = <<~OUTPUT
                </p>
                <div align='center' class='table_container'>
                  <table id='tableD-1' class='MsoISOTable' style='mso-table-anchor-horizontal:column;mso-table-overlap:never;border-spacing:0;border-width:1px;page-break-after: avoid;page-break-inside: avoid;' title='tool tip' summary='long desc' width='70%'>
+                 <colgroup>
+  <col width='30%'/>
+  <col width='20%'/>
+  <col width='20%'/>
+  <col width='20%'/>
+  <col width='10%'/>
+</colgroup>
                    <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>

data/spec/isodoc/xref_spec.rb

@@ -2547,6 +2547,151 @@ OUTPUT
     OUTPUT
   end
 
+  it "cross-references bookmarks" do
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <preface>
+    <foreword>
+    <p>
+    <xref target="N1"/>
+    <xref target="N2"/>
+    <xref target="N"/>
+    <xref target="note1"/>
+    <xref target="note2"/>
+    <xref target="AN"/>
+    <xref target="Anote1"/>
+    <xref target="Anote2"/>
+    </p>
+    </foreword>
+    <introduction id="intro">
+    <p id="N01">
+  <bookmark id="N1"/>
+</p>
+  <clause id="xyz"><title>Preparatory</title>
+     <p id="N02" type="arabic">
+  <bookmark id="N2"/>
+</p>
+</clause>
+    </introduction>
+    </preface>
+    <sections>
+    <clause id="scope" type="scope"><title>Scope</title>
+    <p id="N0" type="roman">
+  <bookmark id="N"/>
+</p>
+    </clause>
+    <terms id="terms"/>
+    <clause id="widgets"><title>Widgets</title>
+    <clause id="widgets1">
+    <p id="note1l" type="alphabet">
+  <bookmark id="note1"/>
+</p>
+    <p id="note2l" type="roman_upper">
+  <bookmark id="note2"/>
+</p>
+    </clause>
+    </clause>
+    </sections>
+    <annex id="annex1">
+    <clause id="annex1a">
+    <p id="ANl" type="alphabet_upper">
+  <bookmark id="AN"/>
+</p>
+    </clause>
+    <clause id="annex1b">
+    <p id="Anote1l" type="roman" start="4">
+  <bookmark id="Anote1"/>
+</p>
+    <p id="Anote2l">
+  <bookmark id="Anote2"/>
+</p>
+    </clause>
+    </annex>
+    </iso-standard>
+    INPUT
+    <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+         <preface>
+           <foreword>
+             <p>
+               <xref target='N1'>Introduction</xref>
+               <xref target='N2'>Preparatory</xref>
+               <xref target='N'>Clause 1</xref>
+               <xref target='note1'>Clause 3.1</xref>
+               <xref target='note2'>Clause 3.1</xref>
+               <xref target='AN'>Annex A.1</xref>
+               <xref target='Anote1'>Annex A.2</xref>
+               <xref target='Anote2'>Annex A.2</xref>
+             </p>
+           </foreword>
+           <introduction id='intro'>
+             <p id='N01'>
+               <bookmark id='N1'/>
+             </p>
+             <clause id='xyz'>
+               <title depth='2'>Preparatory</title>
+               <p id='N02' type='arabic'>
+                 <bookmark id='N2'/>
+               </p>
+             </clause>
+           </introduction>
+         </preface>
+         <sections>
+           <clause id='scope' type='scope'>
+             <title depth='1'>
+               1.
+               <tab/>
+               Scope
+             </title>
+             <p id='N0' type='roman'>
+               <bookmark id='N'/>
+             </p>
+           </clause>
+           <terms id='terms'>
+             <title>2.</title>
+           </terms>
+           <clause id='widgets'>
+             <title depth='1'>
+               3.
+               <tab/>
+               Widgets
+             </title>
+             <clause id='widgets1'>
+               <title>3.1.</title>
+               <p id='note1l' type='alphabet'>
+                 <bookmark id='note1'/>
+               </p>
+               <p id='note2l' type='roman_upper'>
+                 <bookmark id='note2'/>
+               </p>
+             </clause>
+           </clause>
+         </sections>
+         <annex id='annex1'>
+           <title>
+             <strong>Annex A</strong>
+             <br/>
+             (informative)
+           </title>
+           <clause id='annex1a'>
+             <title>A.1.</title>
+             <p id='ANl' type='alphabet_upper'>
+               <bookmark id='AN'/>
+             </p>
+           </clause>
+           <clause id='annex1b'>
+             <title>A.2.</title>
+             <p id='Anote1l' type='roman' start='4'>
+               <bookmark id='Anote1'/>
+             </p>
+             <p id='Anote2l'>
+               <bookmark id='Anote2'/>
+             </p>
+           </clause>
+         </annex>
+       </iso-standard>
+OUTPUT
+end
+
    it "realises subsequences" do
     expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
         <iso-standard xmlns="http://riboseinc.com/isoxml">

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-30 00:00:00.000000000 Z
+date: 2020-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath