preserve Semantic XML in bibitem: https://github.com/metanorma/isodoc…

lib/isodoc/function/blocks.rb

@@ -192,6 +192,14 @@ def cross_align_parse(node, out)
       end
 
       def columnbreak_parse(node, out); end
+
+      def fmt_fn_body_parse(node, out)
+        node.ancestors("table, figure").empty? and
+          node.at(ns(".//fmt-fn-label"))&.remove
+        out.aside id: "fn:#{node['reference']}", class: "footnote" do |div|
+          node.children.each { |n| parse(n, div) }
+        end
+      end
     end
   end
 end

lib/isodoc/function/cleanup.rb

@@ -16,7 +16,7 @@ def passthrough_cleanup(docxml)
       def cleanup(docxml)
         @i18n ||= i18n_init(@lang, @script, @locale)
         comment_cleanup(docxml)
-        footnote_cleanup(docxml)
+        #footnote_cleanup(docxml)
         inline_header_cleanup(docxml)
         figure_cleanup(docxml)
         table_cleanup(docxml)
@@ -58,7 +58,7 @@ def inline_header_cleanup(docxml)
         docxml
       end
 
-      # todo PRESENTATION XML
+      # KILL
       def footnote_cleanup(docxml)
         docxml.xpath('//a[@class = "FootnoteRef"]/sup')
           .each_with_index do |x, i|
@@ -80,7 +80,7 @@ def table_footnote_cleanup(docxml)
             merge_fnref_into_fn_text(a)
             a.name = "div"
             a["class"] = "TableFootnote"
-            t << a.remove
+            t << a.remove # this is redundant
           end
         end
         table_footnote_cleanup_propagate(docxml)
@@ -142,14 +142,6 @@ def table_cleanup(docxml)
       end
 
       def symbols_cleanup(docxml); end
-
-      def table_footnote_reference_format(link)
-        link
-      end
-
-      def footnote_reference_format(link)
-        link
-      end
     end
   end
 end

lib/isodoc/function/inline.rb

@@ -233,6 +233,14 @@ def fmt_concept_parse(node, out)
       def fmt_date_parse(node, out)
         children_parse(node, out)
       end
+
+      def fmt_fn_label_parse(node, out)
+        children_parse(node, out)
+      end
+
+      def fmt_footnote_container_parse(node, out)
+        children_parse(node, out)
+      end
     end
   end
 end

lib/isodoc/function/section.rb

@@ -219,6 +219,13 @@ def feedback_parse(node, out)
           node.children.each { |n| parse(n, div) }
         end
       end
+
+      def footnotes(docxml, div)
+        docxml.xpath(ns("/*/fmt-footnote-container"))
+          .each do |fn|
+            fn.children.each { |n| parse(n, div) }
+          end
+      end
     end
   end
 end

lib/isodoc/function/table.rb

@@ -86,6 +86,8 @@ def table_parse_tail(node, out)
         (dl = node.at(ns("./dl"))) && parse(dl, out)
         node.xpath(ns("./source")).each { |n| parse(n, out) }
         node.xpath(ns("./note")).each { |n| parse(n, out) }
+        node.xpath(ns("./fmt-footnote-container/fmt-fn-body"))
+          .each { |n| parse(n, out) }
       end
 
       def table_parse_core(node, out)

lib/isodoc/function/to_word_html.rb

@@ -88,7 +88,7 @@ def make_body3(body, docxml)
         body.div class: "main-section" do |div3|
           boilerplate docxml, div3
           content(div3, docxml, ns(self.class::TOP_ELEMENTS))
-          footnotes div3
+          footnotes docxml, div3
           comments div3
         end
       end
@@ -286,6 +286,9 @@ def parse(node, out)
           when "amend" then amend_parse(node, out)
           when "date" then date_parse(node, out)
           when "fmt-date" then fmt_date_parse(node, out)
+          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)
           else error_parse(node, out)
           end
         end

lib/isodoc/html_function/footnotes.rb

@@ -1,19 +1,15 @@
 module IsoDoc
   module HtmlFunction
     module Footnotes
-      def footnotes(div)
-        return if @footnotes.empty?
-
-        @footnotes.each { |fn| div.parent << fn }
-      end
-
-      def make_table_footnote_link(out, fnid, fnref)
+      def make_table_footnote_link(out, fnid, node)
         attrs = { href: "##{fnid}", class: "TableFootnoteRef" }
+        sup = node.at(ns("./sup")) and sup.replace(sup.children)
         out.a **attrs do |a|
-          a << fnref
+          children_parse(node, a)
         end
       end
 
+      # KILL
       def make_table_footnote_target(out, fnid, fnref)
         attrs = { id: fnid, class: "TableFootnoteRef" }
         out.span do |s|
@@ -25,6 +21,7 @@ def make_table_footnote_target(out, fnid, fnref)
       end
 
       # Move to Presentation XML, as <fmt-footnote>: it's a footnote body
+      # # KILL
       def make_table_footnote_text(node, fnid, fnref)
         attrs = { id: "fn:#{fnid}" }
         noko do |xml|
@@ -35,6 +32,7 @@ def make_table_footnote_text(node, fnid, fnref)
         end.join("\n")
       end
 
+      # KILL
       def make_generic_footnote_text(node, fnid)
         noko do |xml|
           xml.aside id: "fn:#{fnid}", class: "footnote" do |div|
@@ -45,40 +43,56 @@ def make_generic_footnote_text(node, fnid)
 
       def get_table_ancestor_id(node)
         table = node.ancestors("table") || node.ancestors("figure")
-        return UUIDTools::UUID.random_create.to_s if table.empty?
-
-        table.last["id"]
+        table.empty? and return [nil, UUIDTools::UUID.random_create.to_s]
+        [table.last, table.last["id"]]
       end
 
       # @seen_footnote:
       # do not output footnote text if we have already seen it for this table
 
       def table_footnote_parse(node, out)
         fn = node["reference"] || UUIDTools::UUID.random_create.to_s
-        tid = get_table_ancestor_id(node)
-        make_table_footnote_link(out, tid + fn, fn)
+        table, tid = get_table_ancestor_id(node)
+        make_table_footnote_link(out, tid + fn, node.at(ns("./fmt-fn-label")))
         return if @seen_footnote.include?(tid + fn)
-
+        update_table_fn_body_ref(node, table, tid + fn)
+=begin
         @in_footnote = true
         out.aside class: "footnote" do |a|
           a << make_table_footnote_text(node, tid + fn, fn)
         end
         @in_footnote = false
+=end
         @seen_footnote << (tid + fn)
       end
 
+      def update_table_fn_body_ref(fnote, table, reference)
+        fnbody = table.at(ns("./fmt-footnote-container/" \
+          "fmt-fn-body[@id = '#{fnote['target']}']"))
+        fnbody["reference"] = reference
+        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 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
         attrs = { class: "FootnoteRef", href: "#fn:#{fn}" }
+        f = node.at(ns("./fmt-fn-label"))
         out.a **attrs do |a|
-          a.sup { |sup| sup << fn }
+          #a.sup { |sup| sup << fn }
+                          children_parse(f, a)
         end
-        make_footnote(node, fn)
+        #make_footnote(node, fn)
       end
 
+      # KILL
       def make_footnote(node, fnote)
         return if @seen_footnote.include?(fnote)
 

lib/isodoc/html_function/postprocess.rb

@@ -26,7 +26,8 @@ def html5(doc)
 
       def html_cleanup(html)
         html = term_header(html_footnote_filter(html_preface(htmlstyle(html))))
-        html = footnote_format(footnote_backlinks(html))
+        #html = footnote_format(footnote_backlinks(html))
+        html = (footnote_backlinks(html))
         html = mathml(html_list_clean(remove_placeholder_paras(html)))
         html_toc(heading_anchors(sourcecode_cleanup(html)))
       end

lib/isodoc/html_function/postprocess_footnotes.rb

@@ -49,7 +49,8 @@ def footnote_backlinks(docxml)
         docxml
       end
 
-      def footnote_format(docxml)
+      # KILL
+      def footnote_formatx(docxml)
         docxml.xpath("//a[@class = 'FootnoteRef']/sup").each do |x|
           footnote_reference_format(x)
         end

lib/isodoc/presentation_function/block.rb

@@ -8,7 +8,8 @@ class PresentationXMLConvert < ::IsoDoc::Convert
     def lower2cap(text)
       text.nil? and return text
       x = Nokogiri::XML("<a>#{text}</a>")
-      firsttext = x.at(".//text()[string-length(normalize-space(.))>0]") or return text
+      firsttext = x.at(".//text()[string-length(normalize-space(.))>0]") or
+        return text
       /^[[:upper:]][[:upper:]]/.match?(firsttext.text) and return text
       firsttext.replace(firsttext.text.capitalize)
       to_xml(x.root.children)
@@ -80,16 +81,13 @@ def admonition1(elem)
     end
 
     def admonition_numbered1(elem)
-      # elem["unnumbered"] && !elem.at(ns("./name")) and return
       label = admonition_label(elem, @xrefs.anchor(elem["id"], :label, false))
       prefix_name(elem, { caption: block_delim }, label, "name")
     end
 
     def admonition_label(elem, num)
       lbl = if elem["type"] == "box" then @i18n.box
             else @i18n.admonition[elem["type"]]&.upcase end
-      #lbl &&= "<span class='fmt-element-name'>#{lbl}</span>"
-      #num and lbl = l10n("#{lbl} #{autonum(elem['id'], num)}")
       labelled_autonum(lbl, elem["id"], num)
     end
 
@@ -107,8 +105,6 @@ def table1(elem)
       labelled_ancestor(elem) and return
       elem["unnumbered"] && !elem.at(ns("./name")) and return
       n = @xrefs.anchor(elem["id"], :label, false)
-      #lbl = "<span class='fmt-element-name'>#{lower2cap @i18n.table}</span> "\
-        #"#{autonum(elem['id'], n)}"
       lbl = labelled_autonum(lower2cap(@i18n.table), elem["id"], n)
       prefix_name(elem, { caption: table_delim }, l10n(lbl), "name")
     end
@@ -128,7 +124,8 @@ def table_long_strings_cleanup(docxml)
       end
     end
 
-    def table_fn(elem)
+    # KILL 
+    def table_fnx(elem)
       (elem.xpath(ns(".//fn")) - elem.xpath(ns("./name//fn")))
         .each_with_index do |f, i|
           table_fn1(elem, f, i)
@@ -233,19 +230,23 @@ def quote1(elem)
       author = elem.at(ns("./author"))
       source = elem.at(ns("./source"))
       author.nil? && source.nil? and return
+      p = quote_attribution(author, source, elem)
+      elem << "<attribution><p>#{l10n p}</p></attribution>"
+    end
+
+    # e["deleteme"]: duplicate of source, will be duplicated in fmt-eref, need to delete after
+    def quote_attribution(author, source, elem)
       p = "&#x2014; "
       p += to_xml(semx_fmt_dup(author)) if author
       p += ", " if author && source
-      if source
-        s = semx_fmt_dup(source)
-e = Nokogiri::XML::Node.new("eref", elem.document)
-e << s.children
-s << e
-source.attributes.each_key { |k| e[k] = source[k] }
-e["deleteme"] = "true" # duplicate of source, will be duplicated in fmt-eref, need to delete after
-        p += to_xml(s)
-      end
-      elem << "<attribution><p>#{l10n p}</p></attribution>"
+      source or return p
+      s = semx_fmt_dup(source)
+      e = Nokogiri::XML::Node.new("eref", elem.document)
+      e << s.children
+      s << e
+      source.attributes.each_key { |k| e[k] = source[k] }
+      e["deleteme"] = "true"
+      p + to_xml(s)
     end
   end
 end

lib/isodoc/presentation_function/concepts.rb

@@ -20,7 +20,6 @@ def concept1(node)
     end
 
     def concept_render(node, defaults)
-      #require "debug"; binding.b
       opts, render, ref, ret = concept_render_init(node, defaults)
       ret&.at(ns("./refterm"))&.remove
       ref && opts[:ref] != "false" and render&.next = " "
@@ -31,7 +30,8 @@ def concept_render(node, defaults)
     end
 
     def concept_dup(node, ret)
-      node.xpath(".//xmlns:semx[xmlns:fmt-xref | xmlns:fmt-eref | xmlns:fmt-origin | xmlns:fmt-link]").each(&:remove)
+      node.xpath(".//xmlns:semx[xmlns:fmt-xref | xmlns:fmt-eref | " \
+        "xmlns:fmt-origin | xmlns:fmt-link]").each(&:remove)
       ret.xpath(ns(".//xref | .//eref | .//origin | .//link")).each(&:remove)
       ret.xpath(ns(".//semx")).each do |s|
         s.children.empty? and s.remove
@@ -66,10 +66,11 @@ def concept1_linkmention(ref, renderterm, opts)
       (opts[:linkmention] == "true" && !renderterm.nil? && !ref.nil?) or return
       ref2 = ref.clone
       r2 = renderterm.clone
-      #renderterm.replace(ref2).children = r2
       ref2.children = r2
       if ref.parent.name == "semx"
-        renderterm.replace("<semx element='#{ref.parent['element']}' source='#{ref.parent['source']}'>#{to_xml(ref2)}</semx>")
+        renderterm.replace(<<~SEMX)
+          <semx element='#{ref.parent['element']}' source='#{ref.parent['source']}'>#{to_xml(ref2)}</semx>
+        SEMX
       else
         renderterm.replace(ref2)
       end
@@ -103,7 +104,7 @@ def related1(node)
       p, ref, orig = related1_prep(node)
       label = @i18n.relatedterms[orig["type"]].upcase
       if p && ref
-        node.children =(l10n("<p><strong>#{label}:</strong> " \
+        node.children = (l10n("<p><strong>#{label}:</strong> " \
                           "<em>#{to_xml(p)}</em> (#{Common::to_xml(ref)})</p>"))
       else
         node.children = (l10n("<p><strong>#{label}:</strong> " \
@@ -198,8 +199,6 @@ def designation1(desgn)
     def designation_annotate(desgn, name, orig)
       designation_boldface(desgn)
       designation_field(desgn, name, orig)
-      #g = desgn.at(ns("./expression/grammar")) and
-        #name << ", #{designation_grammar(g).join(', ')}"
       designation_grammar(desgn, name)
       designation_localization(desgn, name, orig)
       designation_pronunciation(desgn, name)
@@ -213,7 +212,7 @@ def designation_boldface(desgn)
       name.children = "<strong>#{name.children}</strong>"
     end
 
-    def designation_field(desgn, name, orig)
+    def designation_field(_desgn, name, orig)
       f = orig.xpath(ns("./field-of-application | ./usage-info"))
         &.map { |u| to_xml(semx_fmt_dup(u)) }&.join(", ")
       f&.empty? and return nil