isodoc 3.1.3 → 3.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cc231c707c79c5af17d4a07818b64395a13328377f6ab4521e2cdfe1ad8c884
-  data.tar.gz: 1b6a810aae9f30c35eeea2f59daddc10d62d63cfd3efd3a0c0813c1c6a7b8bf0
+  metadata.gz: 6f7b717e7e536647796abc2df27f9a3b00730a7b14790b1724defd797f19ed13
+  data.tar.gz: f12c2f1b8e16e8cbb5543940b828308c4aa7a7b5719a0f37e7fa3677f1c4e8cd
 SHA512:
-  metadata.gz: 4403a6d48af622fc31f0829683d4c11d2c76226a15f877deb449eaf8fcdf37e9b7fe55b25225ac1889fc2d3a15eda554d568efb9a988def3fe7bdc3e4d1632fc
-  data.tar.gz: 3365c6b7317a602ea24bf62d3ccc73cadd8ac3b872735945388172f029c0b02460e8f2337f95a192b786057ea69045acc4917a7454c4145bb670777da770ce9e
+  metadata.gz: 860033b6e8cd5abf55cd4d4ab172706ac001696758216aff66bc47a53ce3e22a867664ed3325a3c41f7471b9d6afbf65b44df3376b6b8cafbadd845ecda711ea
+  data.tar.gz: e8430c322a91a674085aa9acfeb71a41bf8dc0f32e7d481c81208b36f6afa207f3943cad61580a391df54ecfc345d288f73bbd07993474e15debbc7e2af9cca7

data/isodoc.gemspec

@@ -30,21 +30,19 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "base64"
   spec.add_dependency "bigdecimal"
-  spec.add_dependency "html2doc", "~> 1.8.1"
+  spec.add_dependency "html2doc", "~> 1.9.0"
   # spec.add_dependency "isodoc-i18n", "~> 1.1.0" # already in relaton-render and mn-requirements
   # spec.add_dependency "relaton-cli"
   # spec.add_dependency "metanorma-utils", "~> 1.5.0" # already in isodoc-i18n
   spec.add_dependency "mn2pdf", ">= 2.13"
   spec.add_dependency "mn-requirements", "~> 0.5.0"
 
-  spec.add_dependency "nokogiri", "<= 1.16.8"
   spec.add_dependency "relaton-render", "~> 0.9.0"
   spec.add_dependency "roman-numerals"
   spec.add_dependency "rouge", "~> 4.0"
   spec.add_dependency "thread_safe"
   spec.add_dependency "twitter_cldr", ">= 6.6.0"
   spec.add_dependency "uuidtools"
-  spec.add_dependency "lutaml-model", "~> 0.6.0"
 
   spec.add_development_dependency "bigdecimal"
   spec.add_development_dependency "debug"

data/lib/isodoc/base_style/all.css

@@ -311,6 +311,13 @@ h6:hover > a.anchor,
   padding: 0;
 }
 
+svg {
+  width: 100%;
+  padding-bottom: 92%;
+  height: 1px;
+  overflow: visible;
+}
+
 #standard-band {
   background-color: #0AC442;
 }

data/lib/isodoc/base_style/reset.css

@@ -310,3 +310,10 @@ h6:hover > a.anchor,
   overflow: hidden;
   padding: 0;
 }
+
+svg {
+  width: 100%;
+  padding-bottom: 92%;
+  height: 1px;
+  overflow: visible;
+}

data/lib/isodoc/base_style/reset.scss

@@ -276,3 +276,7 @@ visibility:visible;
   overflow: hidden;
   padding: 0;
 }
+
+svg {
+   width: 100%; padding-bottom: 92%; height: 1px; overflow: visible;
+}

data/lib/isodoc/function/blocks.rb

@@ -198,9 +198,9 @@ module IsoDoc
       def fmt_fn_body_parse(node, out)
         node.ancestors("table, figure").empty? and
           node.at(ns(".//fmt-fn-label"))&.remove
-        aside = node.parent.name == "fmt-footnote-container"
-        tag = aside ? "aside" : "div"
-        out.send tag, id: "fn:#{node['reference']}", class: "footnote" do |div|
+        tag = node.parent.name == "fmt-footnote-container" ? "aside" : "div"
+        id = node["is_table"] ? node["reference"] : node["id"]
+        out.send tag, id: "fn:#{id}", class: "footnote" do |div|
           node.children.each { |n| parse(n, div) }
         end
       end

data/lib/isodoc/function/footnotes.rb

@@ -32,6 +32,7 @@ module IsoDoc
       def update_table_fn_body_ref(fnote, table, reference)
         fnbody = table.at(ns(".//fmt-fn-body[@id = '#{fnote['target']}']")) or return
         fnbody["reference"] = reference
+        fnbody["is_table"] = true
         sup = fnbody.at(ns(".//fmt-fn-label/sup")) and sup.replace(sup.children)
         fnbody.xpath(ns(".//fmt-fn-label")).each do |s|
           s["class"] = "TableFootnoteRef"
@@ -41,17 +42,22 @@ module IsoDoc
         end
       end
 
-      def footnote_parse(node, out)
-        return table_footnote_parse(node, out) if (@in_table || @in_figure) &&
+      def table_footnote?(node)
+        (@in_table || @in_figure) &&
           !node.ancestors.map(&:name).include?("fmt-name")
+      end
 
-        fn = node["reference"] || UUIDTools::UUID.random_create.to_s
+      def footnote_parse(node, out)
+        table_footnote?(node) and return table_footnote_parse(node, out)
+        fn = node["target"] # || UUIDTools::UUID.random_create.to_s
         attrs = { class: "FootnoteRef", href: "#fn:#{fn}" }
         f = node.at(ns("./fmt-fn-label"))
         out.a **attrs do |a|
           children_parse(f, a)
         end
       end
+
+      def fmt_review_body_parse(node, out); end
     end
   end
 end

data/lib/isodoc/function/inline.rb

@@ -213,6 +213,7 @@ module IsoDoc
       def svgmap_parse(node, out); end
       def amend_parse(node, out); end
       def semx_sourcecode_parse(node, out); end
+      def review_note_parse(node, out); end
 
       def fmt_name_parse(node, out)
         children_parse(node, out)
@@ -237,6 +238,14 @@ module IsoDoc
       def fmt_footnote_container_parse(node, out)
         children_parse(node, out)
       end
+
+      def fmt_review_start_parse(node, out)
+        children_parse(node, out)
+      end
+
+      def fmt_review_end_parse(node, out)
+        children_parse(node, out)
+      end
     end
   end
 end

data/lib/isodoc/function/table.rb

@@ -106,6 +106,7 @@ module IsoDoc
 
       def make_tr_attr(cell, row, totalrows, header, bordered)
         style = cell.name == "th" ? "font-weight:bold;" : ""
+        cell["style"] and style += "#{cell['style']};"
         cell["align"] and style += "text-align:#{cell['align']};"
         cell["valign"] and style += "vertical-align:#{cell['valign']};"
         rowmax = cell["rowspan"] ? row + cell["rowspan"].to_i - 1 : row
@@ -125,10 +126,14 @@ module IsoDoc
         STYLE
       end
 
-      def tr_parse(node, out, ord, totalrows, header)
+      def table_bordered?(node)
         c = node.parent.parent["class"]
-        bordered = %w(modspec).include?(c) || !c
-        out.tr do |r|
+        %w(modspec).include?(c) || !c
+      end
+
+      def tr_parse(node, out, ord, totalrows, header)
+        bordered = table_bordered?(node)
+        out.tr **attr_code(style: node["style"]) do |r|
           node.elements.each do |td|
             attrs = make_tr_attr(td, ord, totalrows - 1, header, bordered)
             r.send td.name, **attr_code(attrs) do |entry|

data/lib/isodoc/function/to_word_html.rb

@@ -54,7 +54,7 @@ module IsoDoc
           boilerplate docxml, div3
           content(div3, docxml, ns(self.class::TOP_ELEMENTS))
           footnotes docxml, div3
-          comments div3
+          comments docxml, div3
         end
       end
 
@@ -234,6 +234,9 @@ module IsoDoc
           when "fmt-fn-body" then fmt_fn_body_parse(node, out)
           when "fmt-fn-label" then fmt_fn_label_parse(node, out)
           when "fmt-footnote-container" then fmt_footnote_container_parse(node, out)
+          when "fmt-review-start" then fmt_review_start_parse(node, out)
+          when "fmt-review-end" then fmt_review_end_parse(node, out)
+          when "fmt-review-body" then fmt_review_body_parse(node, out)
           else error_parse(node, out)
           end
         end

data/lib/isodoc/headlesshtml_convert.rb

@@ -1,10 +1,8 @@
-require_relative "html_function/comments"
 require_relative "html_function/html"
 require "fileutils"
 
 module IsoDoc
   class HeadlessHtmlConvert < ::IsoDoc::Convert
-    include HtmlFunction::Comments
     include HtmlFunction::Html
 
     def tmpimagedir_suffix

data/lib/isodoc/html_convert.rb

@@ -1,4 +1,3 @@
-require_relative "html_function/comments"
 require_relative "html_function/html"
 require_relative "html_function/postprocess"
 require_relative "html_function/form"
@@ -6,7 +5,6 @@ require_relative "html_function/form"
 module IsoDoc
   class HtmlConvert < ::IsoDoc::Convert
 
-    include HtmlFunction::Comments
     include HtmlFunction::Form
     include HtmlFunction::Html
 

data/lib/isodoc/html_function/html.rb

@@ -110,6 +110,13 @@ module IsoDoc
         else super
         end
       end
+
+      def in_comment
+        @in_comment
+      end
+
+      def comments(docxml, div); end
+      def comment_cleanup(docxml); end
     end
   end
 end

data/lib/isodoc/pdf_convert.rb

@@ -1,9 +1,7 @@
-require_relative "html_function/comments"
 require_relative "html_function/html"
 
 module IsoDoc
   class PdfConvert < ::IsoDoc::Convert
-    include HtmlFunction::Comments
     include HtmlFunction::Html
 
     def initialize(options)

data/lib/isodoc/presentation_function/footnotes.rb

@@ -125,10 +125,10 @@ module IsoDoc
       end
     end
 
-    def figure_fn_to_dt_dd(f)
-      label = f.at(ns(".//fmt-fn-label")).remove
+    def figure_fn_to_dt_dd(fnote)
+      label = fnote.at(ns(".//fmt-fn-label")).remove
       label.at(ns(".//span[@class = 'fmt-caption-delim']"))&.remove
-      [label, f]
+      [label, fnote]
     end
 
     def figure_key_insert_pt(elem)
@@ -136,5 +136,74 @@ module IsoDoc
         elem.at(ns(".//dl"))&.children&.first ||
         elem.add_child("<dl> </dl>").first.children.first
     end
+
+    def comments(docxml)
+      docxml.xpath(ns("//review")).each do |c|
+        c1 = comment_body(c)
+        comment_bookmarks(c1)
+      end
+    end
+
+    def comment_body(elem)
+      elem["id"] ||= "_#{UUIDTools::UUID.random_create}"
+      c1 = elem.after("<fmt-review-body/>").next
+      elem.attributes.each_key { |k| c1[k] = elem[k] }
+      c1["id"] = "_#{UUIDTools::UUID.random_create}"
+      c1 << semx_fmt_dup(elem)
+    end
+
+    def comment_bookmarks(elem)
+      from, to = comment_bookmarks_locate(elem)
+      new_from = comment_bookmark_start(from, elem)
+      new_to = comment_bookmark_end(to, elem)
+      elem["from"] = new_from["id"]
+      elem["to"] = new_to["id"]
+    end
+
+    # Do not insert a comment bookmark inside another comment bookmark
+    AVOID_COMMENT_BOOKMARKS = <<~XPATH.freeze
+      [not(ancestor::xmlns:fmt-review-start)][not(ancestor::xmlns:fmt-review-end)]
+    XPATH
+
+    def comment_bookmarks_locate(elem)
+      from = elem.document.at("//*[@id = '#{elem['from']}']")
+      f = from.at(".//text()#{AVOID_COMMENT_BOOKMARKS}") and from = f
+      to = elem.document.at("//*[@id = '#{elem['to']}']") || from
+      f = to.at(".//text()[last()]#{AVOID_COMMENT_BOOKMARKS}") and to = f
+      [from, to]
+    end
+
+    def comment_to_bookmark_attrs(elem, bookmark, start: true)
+      bookmark["target"] = elem["id"]
+      if start then bookmark["end"] = elem["to"]
+      else bookmark["start"] = elem["from"] end
+      %w(author date).each { |k| bookmark[k] = elem[k] }
+    end
+
+    def comment_bookmark_start(from, elem)
+      ret = from.before("<fmt-review-start/>").previous
+      ret["id"] = "_#{UUIDTools::UUID.random_create}"
+      ret["source"] = elem["from"]
+      comment_to_bookmark_attrs(elem, ret, start: true)
+      ret << comment_bookmark_start_label(elem)
+      ret
+    end
+
+    def comment_bookmark_end(to, elem)
+      ret = to.after("<fmt-review-end/>").next
+      ret["id"] = "_#{UUIDTools::UUID.random_create}"
+      ret["source"] = elem["to"]
+      comment_to_bookmark_attrs(elem, ret, start: false)
+      ret << comment_bookmark_end_label(elem)
+      ret
+    end
+
+    def comment_bookmark_start_label(_elem)
+      ""
+    end
+
+    def comment_bookmark_end_label(_elem)
+      ""
+    end
   end
 end

data/lib/isodoc/presentation_function/image.rb

@@ -10,15 +10,19 @@ module IsoDoc
       docxml.xpath(ns("//figure")).each { |f| figure1(f) }
       docxml.xpath(ns("//svgmap")).each { |s| svgmap_extract(s) }
       imageconvert(docxml)
+      docxml.xpath("//m:svg", SVG).each { |f| svg_scale(f) }
     end
 
     def svg_wrap(elem)
-      return if elem.parent.name == "image"
-
+      elem.parent.name == "image" and return
       elem.wrap("<image src='' mimetype='image/svg+xml' height='auto' " \
                 "width='auto'></image>")
     end
 
+    def svg_scale(elem)
+      elem["preserveaspectratio"] = "xMidYMin slice"
+    end
+
     def svgmap_extract(elem)
       if elem.at(ns("./figure"))# then elem.replace(f)
         n = semx_fmt_dup(elem)

data/lib/isodoc/presentation_xml_convert.rb

@@ -34,21 +34,21 @@ module IsoDoc
     end
 
     def repeat_id_validate1(elem)
-        if @doc_ids[elem["id"]]
-          @log.add("Anchors", elem,
-                   "Anchor #{elem['id']} has already been " \
-                   "used at line #{@doc_ids[elem['id']]}", severity: 0)
-        end
-        @doc_ids[elem["id"]] = elem.line
+      if @doc_ids[elem["id"]]
+        @log.add("Anchors", elem,
+                 "Anchor #{elem['id']} has already been " \
+                 "used at line #{@doc_ids[elem['id']]}", severity: 0)
       end
+      @doc_ids[elem["id"]] = elem.line
+    end
 
-      def repeat_id_validate(doc)
-        @log or return
-        @doc_ids = {}
-        doc.xpath("//*[@id]").each do |x|
-          repeat_id_validate1(x)
-        end
+    def repeat_id_validate(doc)
+      @log or return
+      @doc_ids = {}
+      doc.xpath("//*[@id]").each do |x|
+        repeat_id_validate1(x)
       end
+    end
 
     def bibitem_lookup(docxml)
       @bibitem_lookup ||= docxml.xpath(ns("//references/bibitem"))
@@ -58,7 +58,7 @@ module IsoDoc
     end
 
     def conversions(docxml)
-      #semantic_xml_insert(docxml)
+      # semantic_xml_insert(docxml)
       metadata docxml
       bibdata docxml
       @xrefs.parse docxml
@@ -88,6 +88,7 @@ module IsoDoc
       toc docxml
       display_order docxml # feeds document_footnotes
       document_footnotes docxml
+      comments docxml
     end
 
     def block(docxml)
@@ -117,7 +118,6 @@ module IsoDoc
       xref docxml
       eref docxml # feeds eref2link
       origin docxml # feeds eref2link
-      #quotesource docxml # feeds eref2link
       concept docxml
       eref2link docxml
       mathml docxml
@@ -136,21 +136,10 @@ module IsoDoc
       termdefinition docxml
       designation docxml
       termsource docxml
-      #concept docxml
       related docxml
       termcleanup docxml
     end
 
-    # KILL
-    def semantic_xml_insert(xml)
-      @semantic_xml_insert or return
-      embed = embedable_semantic_xml(xml)
-      ins = metanorma_extension_insert_pt(xml)
-      ins = ins.at(ns("./metanorma")) || ins.add_child("<metanorma/>").first
-      ins = ins.add_child("<source/>").first
-      ins << embed
-    end
-
     def metanorma_extension_insert_pt(xml)
       xml.at(ns("//metanorma-extension")) ||
         xml.at(ns("//bibdata"))&.after("<metanorma-extension/>")

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "3.1.3".freeze
+  VERSION = "3.1.4".freeze
 end

data/lib/isodoc/word_function/body.rb

@@ -52,7 +52,7 @@ module IsoDoc
         body.div class: "WordSection3" do |div3|
           content(div3, docxml, ns(self.class::MAIN_ELEMENTS))
           footnotes docxml, div3
-          comments div3
+          comments docxml, div3
         end
       end
 
@@ -79,31 +79,6 @@ module IsoDoc
         node.xpath(ns("./note")).each { |n| parse(n, out) }
       end
 
-      # KILL
-      def figure_get_or_make_dlx(node)
-        dl = node.at(".//table[@class = 'dl']")
-        if dl.nil?
-          node.add_child("<p><b>#{@i18n.key}</b></p><table class='dl'></table>")
-          dl = node.at(".//table[@class = 'dl']")
-        end
-        dl
-      end
-
-      # get rid of footnote link, it is in diagram
-      # KILL
-      def figure_aside_processx(fig, aside, key)
-        fig.at("./a[@class='TableFootnoteRef']")&.remove
-        fnref = fig.at(".//span[@class='TableFootnoteRef']/..")
-        tr = key.add_child("<tr></tr>").first
-        dt = tr.add_child("<td valign='top' align='left'></td>").first
-        dd = tr.add_child("<td valign='top'></td>").first
-        fnref.parent = dt
-        aside.xpath(".//p").each do |a|
-          a.delete("class")
-          a.parent = dd
-        end
-      end
-
       def note_p_class
         "Note"
       end

data/lib/isodoc/word_function/comments.rb

@@ -1,15 +1,18 @@
 module IsoDoc
   module WordFunction
     module Comments
-      def comments(div)
-        return if @comments.empty?
-
-        div.div style: "mso-element:comment-list" do |div1|
-          @comments.each { |fn| div1.parent << fn }
+      def comments(docxml, out)
+        c = docxml.xpath(ns("//fmt-review-body"))
+        c.empty? and return
+        out.div style: "mso-element:comment-list" do |div|
+          @in_comment = true
+          c.each { |fn| parse(fn, div) }
+          @in_comment = false
         end
       end
 
-      def review_note_parse(node, out)
+      # KILL
+      def review_note_parsex(node, out)
         fn = @comments.length + 1
         make_comment_link(out, fn, node)
         @in_comment = true
@@ -19,10 +22,15 @@ module IsoDoc
 
       def comment_link_attrs(fnote, node)
         { style: "MsoCommentReference", target: fnote,
-          class: "commentLink", from: node["from"],
-          to: node["to"] }
+          class: "commentLink", from: node["source"],
+          to: node["end"] }
+      end
+
+      def fmt_review_start_parse(node, out)
+        make_comment_link(out, node["target"], node)
       end
 
+      # TODO: CONSOLIDATE
       # add in from and to links to move the comment into place
       def make_comment_link(out, fnote, node)
         out.span(**comment_link_attrs(fnote, node)) do |s1|
@@ -43,6 +51,7 @@ module IsoDoc
         end
       end
 
+      # KILL
       def make_comment_text(node, fnote)
         noko do |xml|
           xml.div style: "mso-element:comment", id: fnote do |div|
@@ -53,12 +62,46 @@ module IsoDoc
         end.join("\n")
       end
 
+      def fmt_review_body_parse(node, out)
+        out.div style: "mso-element:comment", id: node["id"] do |div|
+          div.span style: %{mso-comment-author:"#{node['reviewer']}"}
+          make_comment_target(div)
+          node.children.each { |n| parse(n, div) }
+        end
+      end
+
       def comment_cleanup(docxml)
+        number_comments(docxml)
         move_comment_link_to_from(docxml)
         reorder_comments_by_comment_link(docxml)
         embed_comment_in_comment_list(docxml)
       end
 
+      def number_comments(docxml)
+        map = comment_id_to_number(docxml)
+        docxml.xpath("//span[@style='MsoCommentReference' or " \
+        "'mso-special-character:comment']").each do |x|
+          x["target"] &&= map[x["target"]]
+        end
+        docxml.xpath("//div[@style='mso-element:comment']").each do |x|
+          x["id"] = map[x["id"]]
+        end
+        docxml.xpath("//a[@style]").each do |x|
+          m = /mso-comment-reference:SMC_([^;]+);/.match(x["style"]) or next
+          x["style"] = x["style"].sub(/mso-comment-reference:SMC_#{m[1]}/,
+                                      "mso-comment-reference:SMC_#{map[m[1]]}")
+        end
+      end
+
+      def comment_id_to_number(docxml)
+        ids = docxml.xpath("//span[@style='MsoCommentReference']").map do |x|
+          x["target"]
+        end
+        ids.uniq.each_with_index.with_object({}) do |(id, i), m|
+          m[id] = i + 1
+        end
+      end
+
       COMMENT_IN_COMMENT_LIST1 =
         '//div[@style="mso-element:comment-list"]//' \
         'span[@style="MsoCommentReference"]'.freeze
@@ -123,14 +166,12 @@ module IsoDoc
       end
 
       def get_comments_from_text(docxml, link_order)
-        comments = []
-        docxml.xpath("//div[@style='mso-element:comment']").each do |c|
-          next unless c["id"] && !link_order[c["id"]].nil?
-
-          comments << { text: c.remove.to_s, id: c["id"] }
+        comments = docxml.xpath("//div[@style='mso-element:comment']")
+          .each_with_object([]) do |c, m|
+          c["id"] && !link_order[c["id"]].nil? or next
+          m << { text: c.remove.to_s, id: c["id"] }
         end
-        comments.sort! { |a, b| link_order[a[:id]] <=> link_order[b[:id]] }
-        # comments
+        comments.sort { |a, b| link_order[a[:id]] <=> link_order[b[:id]] }
       end
 
       COMMENT_TARGET_XREFS1 =

data/lib/isodoc/word_function/footnotes.rb

@@ -22,16 +22,18 @@ module IsoDoc
         node.at(ns(".//fmt-fn-label"))&.remove
         aside = node.parent.name == "fmt-footnote-container"
         tag = aside ? "aside" : "div"
-        out.send tag, id: "ftn#{node['reference']}" do |div|
+        id = node["is_table"] ? node["reference"] : node["id"]
+        out.send tag, id: "ftn#{id}" do |div|
           node.children.each { |n| parse(n, div) }
         end
       end
 
       # dupe to HTML
- def get_table_ancestor_id(node)
-    table = node.ancestors("table")
+      def get_table_ancestor_id(node)
+        table = node.ancestors("table")
         table.empty? and table = node.ancestors("figure")
-        table.empty? and return [nil, UUIDTools::UUID.random_create.to_s]
+        table.empty? and return [nil,
+                                 UUIDTools::UUID.random_create.to_s]
         [table.last, table.last["id"]]
       end
 
@@ -42,30 +44,17 @@ module IsoDoc
         make_table_footnote_link(out, tid + fn, node.at(ns("./fmt-fn-label")))
         # do not output footnote text if we have already seen it for this table
         return if @seen_footnote.include?(tid + fn)
+
         update_table_fn_body_ref(node, table, tid + fn)
         @seen_footnote << (tid + fn)
       end
 
-      # TODO merge with HTML
-      def update_table_fn_body_ref(fnote, table, reference)
-        fnbody = table.at(ns(".//fmt-fn-body[@id = '#{fnote['target']}']")) or return
-        fnbody["reference"] = reference
-        sup = fnbody.at(ns(".//fmt-fn-label/sup")) and sup.replace(sup.children)
-        fnbody.xpath(ns(".//fmt-fn-label")).each do |s|
-          s["class"] = "TableFootnoteRef"
-          s.name = "span"
-          d = s.at(ns("./span[@class = 'fmt-caption-delim']")) and
-            s.next = d
-        end
-      end
-
       def seen_footnote_parse(node, out, footnote)
         f = node.at(ns("./fmt-fn-label"))
         sup = f.at(ns(".//sup")) and sup.replace(sup.children)
         s = f.at(ns(".//semx[@source = '#{node['id']}']"))
-
         semx = <<~SPAN.strip
-<span style="mso-element:field-begin"/> NOTEREF _Ref#{@fn_bookmarks[footnote]} \\f \\h<span style="mso-element:field-separator"/>#{footnote}<span style="mso-element:field-end"/>
+          <span style="mso-element:field-begin"/> NOTEREF _Ref#{@fn_bookmarks[footnote]} \\f \\h<span style="mso-element:field-separator"/>#{footnote}<span style="mso-element:field-end"/>
         SPAN
         s.replace(semx)
         out.span class: "MsoFootnoteReference" do |fn|
@@ -74,29 +63,36 @@ module IsoDoc
       end
 
       def footnote_parse(node, out)
-        return table_footnote_parse(node, out) if (@in_table || @in_figure) &&
-          !node.ancestors.map(&:name).include?("fmt-name")
-
-        fn = node["reference"] || UUIDTools::UUID.random_create.to_s
-        return seen_footnote_parse(node, out, fn) if @seen_footnote.include?(fn)
-
+        table_footnote?(node) and return table_footnote_parse(node, out)
+        fn = node["reference"] # || UUIDTools::UUID.random_create.to_s
+        @seen_footnote.include?(fn) and return seen_footnote_parse(node, out, fn)
         @fn_bookmarks[fn] = bookmarkid
+        f = footnote_label_process(node)
+        out.span style: "mso-bookmark:_Ref#{@fn_bookmarks[fn]}",
+                 class: "MsoFootnoteReference" do |s|
+          children_parse(f, s)
+        end
+        footnote_hyperlink(node, out)
+        @seen_footnote << fn
+      end
+
+      def footnote_label_process(node)
         f = node.at(ns("./fmt-fn-label"))
         sup = f.at(ns(".//sup")) and sup.replace(sup.children)
         if semx = f.at(ns(".//semx[@element = 'autonum']"))
           semx.name = "span"
           semx["class"] = "FMT-PLACEHOLDER"
         end
-        out.span style: "mso-bookmark:_Ref#{@fn_bookmarks[fn]}", class: "MsoFootnoteReference" do |s|
-              children_parse(f, out)
-        end
+        f
+      end
+
+      def footnote_hyperlink(node, out)
         if semx = out.parent.at(".//span[@class = 'FMT-PLACEHOLDER']")
           semx.name = "a"
           semx["class"] = "FootnoteRef"
           semx["epub:type"] = "footnote"
-          semx["href"] = "#ftn#{fn}"
+          semx["href"] = "#ftn#{node['target']}"
         end
-        @seen_footnote << fn
       end
     end
   end

data/lib/isodoc/word_function/table.rb

@@ -23,6 +23,7 @@ module IsoDoc
 
       def make_tr_attr(cell, row, totalrows, header, bordered)
         style = cell.name == "th" ? "font-weight:bold;" : ""
+        cell["style"] and style += "#{cell['style']};"
         rowmax = cell["rowspan"] ? row + cell["rowspan"].to_i - 1 : row
         style += make_tr_attr_style(cell, row, rowmax, totalrows,
                                     { header: header, bordered: bordered })

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.1.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-17 00:00:00.000000000 Z
+date: 2025-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 1.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: mn2pdf
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.0
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: 1.16.8
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: 1.16.8
 - !ruby/object:Gem::Dependency
   name: relaton-render
   requirement: !ruby/object:Gem::Requirement
@@ -178,20 +164,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: lutaml-model
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: bigdecimal
   requirement: !ruby/object:Gem::Requirement
@@ -449,7 +421,6 @@ files:
 - lib/isodoc/headlesshtml_convert.rb
 - lib/isodoc/html_convert.rb
 - lib/isodoc/html_function.rb
-- lib/isodoc/html_function/comments.rb
 - lib/isodoc/html_function/form.rb
 - lib/isodoc/html_function/html.rb
 - lib/isodoc/html_function/mathvariant_to_plain.rb

data/lib/isodoc/html_function/comments.rb

@@ -1,142 +0,0 @@
-module IsoDoc
-  module HtmlFunction
-    module Comments
-      def in_comment
-        @in_comment
-      end
-
-      def comments(div)
-        #       return if @comments.empty?
-        #       div.div **{ style: "mso-element:comment-list" } do |div1|
-        #         @comments.each { |fn| div1.parent << fn }
-        #       end
-      end
-
-      def review_note_parse(node, out)
-        #       fn = @comments.length + 1
-        #       make_comment_link(out, fn, node)
-        #       @in_comment = true
-        #       @comments << make_comment_text(node, fn)
-        #       @in_comment = false
-      end
-
-      def comment_link_attrs(fnote, node)
-        { style: "MsoCommentReference", target: fnote,
-          class: "commentLink", from: node["from"],
-          to: node["to"] }
-      end
-
-      # add in from and to links to move the comment into place
-      def make_comment_link(out, fnote, node)
-        out.span(**comment_link_attrs(fnote, node)) do |s1|
-          s1.a **{ style: "mso-comment-reference:SMC_#{fnote};"\
-                          "mso-comment-date:#{node['date'].gsub(/[-:Z]/,
-                                                                '')}" }
-        end
-      end
-
-      def make_comment_target(out)
-        out.span **{ style: "MsoCommentReference" } do |s1|
-          s1.span **{ style: "mso-special-character:comment" }
-        end
-      end
-
-      def make_comment_text(node, fnote)
-        noko do |xml|
-          xml.div **{ style: "mso-element:comment", id: fnote } do |div|
-            div.span **{ style: %{mso-comment-author:"#{node['reviewer']}"} }
-            make_comment_target(div)
-            node.children.each { |n| parse(n, div) }
-          end
-        end.join("\n")
-      end
-
-      def comment_cleanup(docxml)
-        #       move_comment_link_to_from(docxml)
-        #       reorder_comments_by_comment_link(docxml)
-        #       embed_comment_in_comment_list(docxml)
-      end
-
-      COMMENT_IN_COMMENT_LIST =
-        '//div[@style="mso-element:comment-list"]//'\
-        'span[@style="MsoCommentReference"]'.freeze
-
-      def embed_comment_in_comment_list(docxml)
-        docxml.xpath(COMMENT_IN_COMMENT_LIST).each do |x|
-          n = x.next_element
-          n&.children&.first&.add_previous_sibling(x.remove)
-        end
-        docxml
-      end
-
-      def move_comment_link_to_from1(x, fromlink)
-        x.remove
-        link = x.at(".//a")
-        fromlink.replace(x)
-        link.children = fromlink
-      end
-
-      def comment_attributes(docxml, x)
-        fromlink = docxml.at("//*[@id='#{x['from']}']")
-        return(nil) if fromlink.nil?
-
-        tolink = docxml.at("//*[@id='#{x['to']}']") || fromlink
-        target = docxml.at("//*[@id='#{x['target']}']")
-        { from: fromlink, to: tolink, target: target }
-      end
-
-      def wrap_comment_cont(from, target)
-        s = from.replace("<span style='mso-comment-continuation:#{target}'>")
-        s.first.children = from
-      end
-
-      def skip_comment_wrap(from)
-        from["style"] != "mso-special-character:comment"
-      end
-
-      def insert_comment_cont(from, upto, target)
-        # includes_to = from.at(".//*[@id='#{upto}']")
-        while !from.nil? && from["id"] != upto
-          following = from.xpath("./following::*")
-          (from = following.shift) && incl_to = from.at(".//*[@id='#{upto}']")
-          while !incl_to.nil? && !from.nil? && skip_comment_wrap(from)
-            (from = following.shift) && incl_to = from.at(".//*[@id='#{upto}']")
-          end
-          wrap_comment_cont(from, target) if !from.nil?
-        end
-      end
-
-      def move_comment_link_to_from(docxml)
-        docxml.xpath('//span[@style="MsoCommentReference"][@from]').each do |x|
-          attrs = comment_attributes(docxml, x) || next
-          move_comment_link_to_from1(x, attrs[:from])
-          insert_comment_cont(attrs[:from], x["to"], x["target"])
-        end
-      end
-
-      def get_comments_from_text(docxml, link_order)
-        comments = []
-        docxml.xpath("//div[@style='mso-element:comment']").each do |c|
-          next unless c["id"] && !link_order[c["id"]].nil?
-
-          comments << { text: c.remove.to_s, id: c["id"] }
-        end
-        comments.sort! { |a, b| link_order[a[:id]] <=> link_order[b[:id]] }
-        # comments
-      end
-
-      COMMENT_TARGET_XREFS =
-        "//span[@style='mso-special-character:comment']/@target".freeze
-
-      def reorder_comments_by_comment_link(docxml)
-        link_order = {}
-        docxml.xpath(COMMENT_TARGET_XREFS).each_with_index do |target, i|
-          link_order[target.value] = i
-        end
-        comments = get_comments_from_text(docxml, link_order)
-        list = docxml.at("//*[@style='mso-element:comment-list']") || return
-        list.children = comments.map { |c| c[:text] }.join("\n")
-      end
-    end
-  end
-end