isodoc 3.1.1 → 3.1.2

data/lib/isodoc/presentation_function/erefs.rb

@@ -5,7 +5,7 @@ module IsoDoc
     def citeas(xmldoc)
       xmldoc.xpath(ns("//fmt-eref | //fmt-origin | //fmt-link"))
         .each do |e|
-          sem_xml_descendant?(e) and next
+        sem_xml_descendant?(e) and next
         e["bibitemid"] && e["citeas"] or next
         a = @xrefs.anchor(e["bibitemid"], :xref, false) or next
         e["citeas"] = citeas_cleanup(a)
@@ -35,7 +35,6 @@ module IsoDoc
       ret = resolve_eref_connectives(locs)
       elem["id"] ||= "_#{UUIDTools::UUID.random_create}"
       elem.next = "<semx element='erefstack' source='#{elem['id']}'>#{ret[1]}</semx>"
-      #elem.replace(ret[1])
     end
 
     def eref_localities(refs, target, node)
@@ -198,7 +197,7 @@ module IsoDoc
       docxml.xpath(ns("//display-text")).each { |f| f.replace(f.children) }
       docxml.xpath(ns("//fmt-eref | //fmt-origin[not(.//termref)]"))
         .each do |e|
-          sem_xml_descendant?(e) and next
+        sem_xml_descendant?(e) and next
         href = eref_target(e) or next
         e.xpath(ns("./locality | ./localityStack")).each(&:remove)
         if href[:type] == :anchor then eref2xref(e)

data/lib/isodoc/presentation_function/footnotes.rb

@@ -0,0 +1,140 @@
+module IsoDoc
+  class PresentationXMLConvert < ::IsoDoc::Convert
+    def footnote_collect(fnotes)
+      seen = {}
+      fnotes.each_with_object([]) do |x, m|
+        x["id"] ||= "_#{UUIDTools::UUID.random_create}"
+        seen[x["reference"]] or m << fnbody(x, seen)
+        x["target"] = seen[x["reference"]]
+        ref = x["hiddenref"] == "true" ? "" : fn_ref_label(x)
+        x << "<fmt-fn-label>#{ref}</fmt-fn-label>"
+      end
+    end
+
+    def footnote_container(fnotes, fnbodies)
+      fnbodies.empty? and return
+      ctr = Nokogiri::XML::Node.new("fmt-footnote-container",
+                                    fnotes.first.document)
+      fnbodies.each { |x| ctr << x }
+      ctr
+    end
+
+    def fnbody(fnote, seen)
+      body = Nokogiri::XML::Node.new("fmt-fn-body", fnote.document)
+      body["id"] = "_#{UUIDTools::UUID.random_create}"
+      body["target"] = fnote["id"]
+      body["reference"] = fnote["reference"]
+      body << semx_fmt_dup(fnote)
+      insert_fn_body_ref(fnote, body)
+      seen[fnote["reference"]] = body["id"]
+      body
+    end
+
+    def insert_fn_body_ref(fnote, body)
+      ins = body.at(ns(".//p")) ||
+        body.at(ns("./semx")).children.first.before("<p> </p>").previous
+      lbl = fn_body_label(fnote)
+      ins.children.first.previous = <<~FNOTE.strip
+        <fmt-fn-label>#{lbl}<span class="fmt-caption-delim"><tab/></fmt-fn-label>
+      FNOTE
+    end
+
+    def fn_ref_label(fnote)
+      "<sup>#{fn_label(fnote)}</sup>"
+    end
+
+    def fn_body_label(fnote)
+      "<sup>#{fn_label(fnote)}</sup>"
+    end
+
+    def fn_label(fnote)
+      <<~FNOTE.strip
+        <semx element="autonum" source="#{fnote['id']}">#{fnote['reference']}</semx>
+      FNOTE
+    end
+
+    def table_fn(elem)
+      fnotes = elem.xpath(ns(".//fn")) - elem.xpath(ns("./name//fn"))
+      ret = footnote_collect(fnotes)
+      f = footnote_container(fnotes, ret) and elem << f
+    end
+
+    def document_footnotes(docxml)
+      sects = sort_footnote_sections(docxml)
+      excl = non_document_footnotes(docxml)
+      fns = filter_document_footnotes(sects, excl)
+      fns = renumber_document_footnotes(fns, 1)
+      ret = footnote_collect(fns)
+      f = footnote_container(fns, ret) and docxml.root << f
+    end
+
+    # bibdata, boilerplate, @displayorder sections
+    def sort_footnote_sections(docxml)
+      sects = docxml.xpath(".//*[@displayorder]")
+        .sort_by { |c| c["displayorder"].to_i }
+      b = docxml.at(ns("//boilerplate")) and sects.unshift b
+      b = docxml.at(ns("//bibdata")) and sects.unshift b
+      sects
+    end
+
+    def non_document_footnotes(docxml)
+      table_fns = docxml.xpath(ns("//table//fn")) -
+        docxml.xpath(ns("//table/name//fn"))
+      fig_fns = docxml.xpath(ns("//figure//fn")) -
+        docxml.xpath(ns("//figure/name//fn"))
+      table_fns + fig_fns
+    end
+
+    def filter_document_footnotes(sects, excl)
+      sects.each_with_object([]) do |s, m|
+        docfns = s.xpath(ns(".//fn")) - excl
+        m << docfns
+      end
+    end
+
+    # can instead restart at i=1 each section
+    def renumber_document_footnotes(fns_by_section, idx)
+      fns_by_section.reject(&:empty?).each_with_object({}) do |s, seen|
+        s.each do |f|
+          idx = renumber_document_footnote(f, idx, seen)
+        end
+      end
+      fns_by_section.flatten
+    end
+
+    def renumber_document_footnote(fnote, idx, seen)
+      fnote["original-reference"] = fnote["reference"]
+      if seen[fnote["reference"]]
+        fnote["reference"] = seen[fnote["reference"]]
+      else
+        seen[fnote["reference"]] = idx
+        fnote["reference"] = idx
+        idx += 1
+      end
+      idx
+    end
+
+    # move footnotes into key
+    def figure_fn(elem)
+      fn = elem.xpath(ns(".//fn")) - elem.xpath(ns("./name//fn"))
+      fn.empty? and return
+      dl = figure_key_insert_pt(elem)
+      footnote_collect(fn).each do |f|
+        label, fbody = figure_fn_to_dt_dd(f)
+        dl.previous = "<dt><p>#{to_xml(label)}</p></dt><dd>#{to_xml(fbody)}</dd>"
+      end
+    end
+
+    def figure_fn_to_dt_dd(f)
+      label = f.at(ns(".//fmt-fn-label")).remove
+      label.at(ns(".//span[@class = 'fmt-caption-delim']"))&.remove
+      [label, f]
+    end
+
+    def figure_key_insert_pt(elem)
+      elem.at(ns(".//dl/name"))&.next ||
+        elem.at(ns(".//dl"))&.children&.first ||
+        elem.add_child("<dl> </dl>").first.children.first
+    end
+  end
+end

data/lib/isodoc/presentation_function/image.rb

@@ -73,24 +73,6 @@ module IsoDoc
       prefix_name(elem, { caption: figure_delim(elem) }, l10n(s&.strip), "name")
     end
 
-    # move footnotes into key, and get rid of footnote reference
-    # since it is in diagram
-    def figure_fn(elem)
-      fn = elem.xpath(ns(".//fn")) - elem.xpath(ns("./name//fn"))
-      fn.empty? and return
-      dl = figure_key_insert_pt(elem)
-      fn.each do |f|
-        dl.previous = "<dt><p><sup>#{f['reference']}</sup></p></dt>" \
-          "<dd>#{f.remove.children.to_xml}</dd>"
-      end
-    end
-
-    def figure_key_insert_pt(elem)
-      elem.at(ns("//dl/name"))&.next ||
-        elem.at(ns("//dl"))&.children&.first ||
-        elem.add_child("<dl> </dl>").first.children.first
-    end
-
     def figure_label?(elem)
       elem.at(ns("./figure")) && !elem.at(ns("./name")) and return false
       true

data/lib/isodoc/presentation_function/inline.rb

@@ -39,16 +39,19 @@ module IsoDoc
     def anchor_id_postprocess(node); end
 
     def xref(docxml)
-      #docxml.xpath(ns("//display-text")).each { |f| f.replace(f.children) }
       docxml.xpath(ns("//fmt-xref")).each { |f| xref1(f) }
-      docxml.xpath(ns("//fmt-xref//fmt-xref")).each { |f| f.replace(f.children) }
+      docxml.xpath(ns("//fmt-xref//fmt-xref")).each do |f|
+        f.replace(f.children)
+      end
       docxml.xpath(ns("//fmt-xref//xref")).each { |f| f.replace(f.children) }
     end
 
     def eref(docxml)
       docxml.xpath(ns("//eref[@deleteme]")).each { |f| redundant_eref(f) }
       docxml.xpath(ns("//fmt-eref")).each { |f| xref1(f) }
-      docxml.xpath(ns("//fmt-eref//fmt-xref")).each { |f| f.replace(f.children) }
+      docxml.xpath(ns("//fmt-eref//fmt-xref")).each do |f|
+        f.replace(f.children)
+      end
       docxml.xpath(ns("//erefstack")).each { |f| erefstack1(f) }
     end
 
@@ -65,19 +68,14 @@ module IsoDoc
       docxml.xpath(ns("//fmt-origin[not(.//termref)]")).each { |f| xref1(f) }
     end
 
-    # KILL
-    def quotesourcex(docxml)
-      docxml.xpath(ns("//quote//source")).each { |f| xref1(f) }
-      docxml.xpath(ns("//quote//source//xref")).each do |f|
-        f.replace(f.children)
-      end
-    end
-
     # do not change to Presentation XML rendering
     def sem_xml_descendant?(node)
       !node.ancestors("preferred, admitted, deprecated, related, " \
         "definition, termsource").empty? and return true
       !node.ancestors("xref, eref, origin, link").empty? and return true
+      !node.ancestors("name, title").empty? and return true
+      node.ancestors("bibitem") &&
+        !node.ancestors("formattedref, biblio-tag") and return true
       !node.ancestors("requirement, recommendation, permission").empty? &&
         node.ancestors("fmt-provision").empty? and return true
       false
@@ -112,8 +110,8 @@ module IsoDoc
       docxml.xpath(ns("//identifier")).each do |n|
         %w(bibdata bibitem requirement recommendation permission)
           .include?(n.parent.name) and next
-          s = semx_fmt_dup(n)
-          n.next = "<fmt-identifier><tt>#{to_xml(s)}</tt></fmt-identifier>"
+        s = semx_fmt_dup(n)
+        n.next = "<fmt-identifier><tt>#{to_xml(s)}</tt></fmt-identifier>"
       end
     end
 

data/lib/isodoc/presentation_function/refs.rb

@@ -86,10 +86,15 @@ module IsoDoc
     def bibrender_formattedref(formattedref, xml); end
 
     def bibrender_relaton(xml, renderings)
-      f = renderings[xml["id"]][:formattedref]
+      f = renderings[xml["id"]][:formattedref] or return
       f &&= "<formattedref>#{f}</formattedref>"
-      x = xml.xpath(ns("./docidentifier | ./uri | ./note | ./biblio-tag"))
-      xml.children = "#{f}#{x.to_xml}"
+      if x = xml.at(ns("./formattedref"))
+        x.replace(f)
+      elsif xml.children.empty?
+        xml << f
+      else
+        xml.children.first.previous = f
+      end
     end
 
     def citestyle
@@ -205,7 +210,7 @@ module IsoDoc
       ret = ident_fn(bib)
       date_note = bib.at(ns("./note[@type = 'Unpublished-Status']"))
       date_note.nil? and return ret
-      id = UUIDTools::UUID.random_create.to_s
+      id = "_#{UUIDTools::UUID.random_create}"
       "#{ret}<fn reference='#{id}'><p>#{date_note.content}</p></fn>"
     end
 

data/lib/isodoc/presentation_function/sourcecode.rb

@@ -42,7 +42,7 @@ module IsoDoc
       sourcehighlighter_css(docxml)
       @highlighter = sourcehighlighter
       @callouts = {}
-      (docxml.xpath(ns("//sourcecode")) - 
+      (docxml.xpath(ns("//sourcecode")) -
        docxml.xpath(ns("//metanorma-extension//sourcecode")))
         .each do |f|
         sourcecode1(f)
@@ -52,7 +52,6 @@ module IsoDoc
     def sourcecode1(elem)
       ret1 = semx_fmt_dup(elem)
       b = ret1.at(ns(".//body")) and b.replace(b.children)
-      #sourcecode_annot_id(elem)
       source_label(elem)
       source_highlight(ret1, elem["linenums"] == "true", elem["lang"])
       callouts(elem)
@@ -68,25 +67,11 @@ module IsoDoc
       elem << ret
     end
 
-    # KILL
-    def sourcecode_annot_id(elem)
-      elem.xpath(ns("./annotation")).each do |a|
-        if a["original-id"]
-          a["id"] = a["original-id"]
-          a.delete("original-id")
-        end
-          a.xpath(".//*[@original-id]").each do |n|
-            n["id"] = n["original-id"]
-          n.delete("original-id")
-          end
-        end
-    end
-
     def annotations(elem, fmt_elem)
       elem.at(ns("./annotation")) or return
       ret = ""
       elem.xpath(ns("./annotation")).each do |a|
-        id = a['original-id']
+        id = a["original-id"]
         dd = semx_fmt_dup(a)
         dd["source"] = a["id"]
         ret += <<~OUT
@@ -183,8 +168,6 @@ module IsoDoc
     def source_label(elem)
       if !labelled_ancestor(elem) && # do not number if labelled_ancestor
           lbl = @xrefs.anchor(elem["id"], :label, false)
-        #a = autonum(elem["id"], lbl)
-        #s = "<span class='fmt-element-name'>#{lower2cap @i18n.figure}</span> #{a}"
         s = labelled_autonum(lower2cap(@i18n.figure), elem["id"], lbl)&.strip
       end
       prefix_name(elem, { caption: block_delim }, s, "name")

data/lib/isodoc/presentation_xml_convert.rb

@@ -10,6 +10,7 @@ require_relative "presentation_function/section"
 require_relative "presentation_function/index"
 require_relative "presentation_function/bibdata"
 require_relative "presentation_function/metadata"
+require_relative "presentation_function/footnotes"
 
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
@@ -85,7 +86,8 @@ module IsoDoc
       floattitle docxml # feeds rearrange_clauses
       index docxml # fed by strip_duplicate_ids
       toc docxml
-      display_order docxml
+      display_order docxml # feeds document_footnotes
+      document_footnotes docxml
     end
 
     def block(docxml)

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "3.1.1".freeze
+  VERSION = "3.1.2".freeze
 end

data/lib/isodoc/word_function/body.rb

@@ -51,7 +51,7 @@ module IsoDoc
       def make_body3(body, docxml)
         body.div class: "WordSection3" do |div3|
           content(div3, docxml, ns(self.class::MAIN_ELEMENTS))
-          footnotes div3
+          footnotes docxml, div3
           comments div3
         end
       end
@@ -79,7 +79,8 @@ module IsoDoc
         node.xpath(ns("./note")).each { |n| parse(n, out) }
       end
 
-      def figure_get_or_make_dl(node)
+      # 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>")
@@ -89,7 +90,8 @@ module IsoDoc
       end
 
       # get rid of footnote link, it is in diagram
-      def figure_aside_process(fig, aside, key)
+      # 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

data/lib/isodoc/word_function/footnotes.rb

@@ -10,75 +10,67 @@ module IsoDoc
         sprintf "%09d", ret
       end
 
-      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
 
-      def make_table_footnote_target(out, fnid, fnref)
-        attrs = { id: fnid, class: "TableFootnoteRef" }
-        out.span do |s|
-          out.span **attrs do |a|
-            a << fnref
-          end
-          insert_tab(s, 1)
+      def fmt_fn_body_parse(node, out)
+        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|
+          node.children.each { |n| parse(n, div) }
         end
       end
 
-      def make_table_footnote_text(node, fnid, fnref)
-        attrs = { id: "ftn#{fnid}" }
-        noko do |xml|
-          xml.div **attr_code(attrs) do |div|
-            make_table_footnote_target(div, fnid, fnref)
-            node.children.each { |n| parse(n, div) }
-          end
-        end.join("\n")
-      end
-
-      def make_generic_footnote_text(node, fnid)
-        noko do |xml|
-          xml.aside id: "ftn#{fnid}" do |div|
-            node.children.each { |n| parse(n, div) }
-          end
-        end.join("\n")
-      end
-
-      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"]
+      # dupe to HTML
+ 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.last, table.last["id"]]
       end
 
+      # dupe to HTML
       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")))
         # do not output footnote text if we have already seen it for this table
         return if @seen_footnote.include?(tid + fn)
-
-        @in_footnote = true
-        out.aside { |a| a << make_table_footnote_text(node, tid + fn, fn) }
-        @in_footnote = false
+        update_table_fn_body_ref(node, table, tid + fn)
         @seen_footnote << (tid + fn)
       end
 
-      def seen_footnote_parse(_node, out, footnote)
-        out.span style: "mso-element:field-begin"
-        out << " NOTEREF _Ref#{@fn_bookmarks[footnote]} \\f \\h"
-        out.span style: "mso-element:field-separator"
-        out.span class: "MsoFootnoteReference" do |s|
-          s << footnote
+      # 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
+        s.replace(semx)
+        out.span class: "MsoFootnoteReference" do |fn|
+          children_parse(f, fn)
         end
-        out.span style: "mso-element:field-end"
       end
 
       def footnote_parse(node, out)
@@ -89,26 +81,23 @@ module IsoDoc
         return seen_footnote_parse(node, out, fn) if @seen_footnote.include?(fn)
 
         @fn_bookmarks[fn] = bookmarkid
-        out.span style: "mso-bookmark:_Ref#{@fn_bookmarks[fn]}" do |s|
-          s.a class: "FootnoteRef", "epub:type": "footnote",
-              href: "#ftn#{fn}" do |a|
-            a.sup { |sup| sup << fn }
-          end
+        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
+        if semx = out.parent.at(".//span[@class = 'FMT-PLACEHOLDER']")
+          semx.name = "a"
+          semx["class"] = "FootnoteRef"
+          semx["epub:type"] = "footnote"
+          semx["href"] = "#ftn#{fn}"
         end
-        @in_footnote = true
-        @footnotes << make_generic_footnote_text(node, fn)
-        @in_footnote = false
         @seen_footnote << fn
       end
-
-      def make_footnote(node, footnote)
-        return if @seen_footnote.include?(footnote)
-
-        @in_footnote = true
-        @footnotes << make_generic_footnote_text(node, footnote)
-        @in_footnote = false
-        @seen_footnote << footnote
-      end
     end
   end
 end

data/lib/isodoc/word_function/postprocess.rb

@@ -63,7 +63,7 @@ module IsoDoc
         word_section_breaks(docxml)
         word_tab_clean(docxml)
         authority_cleanup(docxml)
-        word_footnote_format(docxml)
+        #word_footnote_format(docxml)
         word_remove_empty_toc(docxml)
         word_remove_empty_sections(docxml)
         docxml
@@ -172,12 +172,16 @@ module IsoDoc
         end
       end
 
-      def word_footnote_format(docxml)
+      # KILL
+      def word_footnote_formatx(docxml)
         # the content is in a[@epub:type = 'footnote']//sup, but in Word,
         # we need to inject content around the autonumbered footnote reference
         docxml.xpath("//a[@epub:type = 'footnote']").each do |x|
           footnote_reference_format(x)
         end
+        docxml.xpath("//span[@class = 'MsoFootnoteReference']").each do |x|
+          footnote_reference_format(x)
+        end
         docxml.xpath("//a[@class = 'TableFootnoteRef'] | " \
                      "//span[@class = 'TableFootnoteRef']").each do |x|
           table_footnote_reference_format(x)

data/lib/isodoc/xref/xref_gen.rb

@@ -36,12 +36,6 @@ module IsoDoc
         end
       end
 
-      def increment_label(elems, node, counter, increment: true)
-        elems.size == 1 && !node["number"] and return ""
-        counter.increment(node) if increment
-        counter.print
-      end
-
       def termnote_anchor_names(docxml)
         docxml.xpath(ns("//*[termnote]")).each do |t|
           c = Counter.new
@@ -240,8 +234,7 @@ refer_list)
       def bookmark_container(parent)
         if parent
           clause = parent.xpath(CLAUSE_ANCESTOR)&.last
-          if clause["id"] == id
-            nil
+          if clause["id"] == id then nil
           else
             @anchors.dig(clause["id"], :xref)
           end
@@ -251,7 +244,6 @@ refer_list)
       def bookmark_anchor_names(xml)
         xml.xpath(ns(".//bookmark")).noblank.each do |n|
           _parent, id = id_ancestor(n)
-          # container = bookmark_container(parent)
           @anchors[n["id"]] = { type: "bookmark", label: nil, value: nil,
                                 xref: @anchors.dig(id, :xref) || "???",
                                 container: @anchors.dig(id, :container) }