isodoc 3.1.7 → 3.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a295da0c0143ef7732aca192d4ebc1e9eb7c0b4ec6b515bb00609cd7b9dce1e2
-  data.tar.gz: 33b46c1df1e837cdd1df7034f434bb7740bdb720d4309a663e51368df5898998
+  metadata.gz: 6a8388650d37a65faf83e9279b1d749045fb6a0ad26367a2530eb0ccae120ad8
+  data.tar.gz: 518346e1d25294060e5e32d2b6188a7817dd8dc3a54834c1406a5d2285deab97
 SHA512:
-  metadata.gz: 12e4328d0d97cec33a1fe8a3afb339f6488e91d410c5cd40ff85ae46e571e8575ef50929d5756bfaa24604cdf1545ffef061c1429a80d1cb7c5af7527ce3be23
-  data.tar.gz: e55fc19631f6075ca61f459bb5026a435ff6eadc2f604fdd269abebf1fe4153a975fb095061b289371c08ba76d271e868b7fe2a1f3fc0b9a53bd50c5671b2a7f
+  metadata.gz: c8db9974c553f9385126d0a67d1b50dcca7b84a9d9df5e2ef8f0923fa2f617efc2300e8e500bf0b29d9dd2a3a73307b5ff20e483e1cffd820b80a718f200716a
+  data.tar.gz: 6d9b8daf2cd962bd1fa6ec201aa54fd67f342293e91ea513be06ed2335e2fb20df5ebf8f8d9d86536cb93923418e18d5e9eb67f099b2bc13022ce018ffe88e7b

data/lib/isodoc/function/footnotes.rb

@@ -3,7 +3,7 @@ module IsoDoc
     module Footnotes
       def make_table_footnote_link(out, fnid, node)
         attrs = { href: "##{fnid}", class: "TableFootnoteRef" }
-        sup = node.at(ns("./sup")) and sup.replace(sup.children)
+        sup = node.at(ns(".//sup")) and sup.replace(sup.children)
         out.a **attrs do |a|
           children_parse(node, a)
         end
@@ -34,7 +34,7 @@ module IsoDoc
           return
         fnbody["reference"] = reference
         fnbody["is_table"] = true
-        sup = fnbody.at(ns(".//fmt-fn-label/sup")) and sup.replace(sup.children)
+        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"

data/lib/isodoc/function/inline.rb

@@ -220,6 +220,7 @@ module IsoDoc
       def amend_parse(node, out); end
       def semx_sourcecode_parse(node, out); end
       def review_note_parse(node, out); end
+      def semx_source_parse(node, out); end
 
       def fmt_name_parse(node, out)
         children_parse(node, out)

data/lib/isodoc/function/lists.rb

@@ -34,21 +34,6 @@ module IsoDoc
         OL_STYLE[type.to_sym]
       end
 
-      # We don't really want users to specify type of ordered list;
-      # we will use a fixed hierarchy as practiced by ISO (though not
-      # fully spelled out): a) 1) i) A) I)
-      # Fallback, this is now being done in Presentation XML
-      # KILL
-      def ol_depthx(node)
-        depth = node.ancestors("ul, ol").size + 1
-        type = :alphabet
-        type = :arabic if [2, 7].include? depth
-        type = :roman if [3, 8].include? depth
-        type = :alphabet_upper if [4, 9].include? depth
-        type = :roman_upper if [5, 10].include? depth
-        ol_style(type)
-      end
-
       def ol_attrs(node)
         { # type: node["type"] ? ol_style(node["type"].to_sym) : ol_depth(node),
           type: ol_style(node["type"]&.to_sym),

data/lib/isodoc/function/table.rb

@@ -84,7 +84,7 @@ module IsoDoc
 
       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("./fmt-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) }

data/lib/isodoc/function/to_word_html.rb

@@ -153,7 +153,8 @@ module IsoDoc
           when "fn" then footnote_parse(node, out)
           when "p" then para_parse(node, out)
           when "quote" then quote_parse(node, out)
-          when "source" then source_parse(node, out)
+          when "source" then semx_source_parse(node, out)
+          when "fmt-source" then source_parse(node, out)
           when "tr" then tr_parse(node, out)
           when "note" then note_parse(node, out)
           when "review" then review_note_parse(node, out)

data/lib/isodoc/presentation_function/block.rb

@@ -142,38 +142,65 @@ module IsoDoc
     def amend1(elem)
       ret = semx_fmt_dup(elem)
       ret.xpath(ns("./locality | ./localityStack | ./autonumber | " \
-                    "./classification | ./contributor")).each(&:remove)
+                   "./classification | ./contributor")).each(&:remove)
       ret.xpath(ns("./newcontent")).each { |a| a.name = "quote" }
       ret.xpath(ns("./description")).each { |a| a.replace(a.children) }
       elem.xpath(ns(".//fmt-name | .//fmt-xref-label")).each(&:remove)
       elem.next = ret
     end
 
+    # TODO will go back to just one source/modification, preserving it
     def source(docxml)
-     docxml.xpath(ns("//source/modification")).each do |f|
+      fmt_source(docxml)
+      docxml.xpath(ns("//fmt-source/source/modification")).each do |f|
         source_modification(f)
       end
-      docxml.xpath(ns("//table/source")).each { |f| tablesource(f) }
-      docxml.xpath(ns("//figure/source")).each { |f| figuresource(f) }
+      source_types(docxml)
+      docxml.xpath(ns("//fmt-source/source")).each do |f|
+        f.replace(semx_fmt_dup(f))
+      end
+    end
+
+    def source_types(docxml)
+      docxml.xpath(ns("//table/fmt-source")).each { |f| tablesource(f) }
+      docxml.xpath(ns("//figure/fmt-source")).each { |f| figuresource(f) }
+    end
+
+    def fmt_source(docxml)
+      n = docxml.xpath(ns("//source")) - docxml.xpath(ns("//term//source")) -
+        docxml.xpath(ns("//quote/source"))
+      n.each do |s|
+        dup = s.clone
+        modification_dup_align(s, dup)
+        s.next = "<fmt-source>#{to_xml(dup)}</fmt-source>"
+      end
     end
 
     def tablesource(elem)
-      source1(elem)
+      source1(elem, :table)
     end
 
     def figuresource(elem)
-      source1(elem)
+      source1(elem, :figure)
     end
 
-    def source1(elem)
-      while elem&.next_element&.name == "source"
-        elem << "; #{to_xml(elem.next_element.remove.children)}"
+    def source1(elem, ancestor)
+      n = elem
+      while n = n&.next_element
+        case n.name
+        when "source"
+        when "fmt-source"
+          elem << "; #{to_xml(n.remove.children)}"
+        else break
+        end
       end
-      elem.children = l10n("[#{@i18n.source}: #{to_xml(elem.children).strip}]")
+      source1_label(elem, to_xml(elem.children).strip, ancestor)
+    end
+
+    def source1_label(elem, sources, _ancestor)
+      elem.children = l10n("[#{@i18n.source}: #{sources}]")
     end
 
-    # TODO just as termsource is duplicated in fmt-termsource to allow for changes,
-    # should double up source with fmt-source 
     def source_modification(mod)
       termsource_modification(mod.parent)
     end

data/lib/isodoc/presentation_function/concepts.rb

@@ -7,7 +7,7 @@ module IsoDoc
     end
 
     def concept1(node)
-      node.ancestors("definition, termsource, related").empty? or return
+      node.ancestors("definition, source, related").empty? or return
       xref = node&.at(ns("./semx/fmt-xref/@target"))&.text or
         return concept_render(node, ital: "true", ref: "true", bold: "false",
                                     linkref: "true", linkmention: "false")
@@ -192,8 +192,8 @@ module IsoDoc
       desgn.parent.name == "related" and return
       out = desgn.parent.at(ns("./fmt-#{desgn.name}"))
       d1 = semx_fmt_dup(desgn)
-      s = d1.at(ns("./termsource"))
-      s0 = desgn.at(ns("./termsource"))
+      s = d1.at(ns("./source"))
+      s0 = desgn.at(ns("./source"))
       modification_dup_align(s0, s)
       name = d1.at(ns("./expression/name | ./letter-symbol/name | " \
                          "./graphical-symbol")) or return

data/lib/isodoc/presentation_function/erefs.rb

@@ -33,7 +33,6 @@ module IsoDoc
         [e["connective"], to_xml(e.parent.remove)]
       end.flatten
       ret = resolve_eref_connectives(locs)
-      elem["id"] ||= "_#{UUIDTools::UUID.random_create}"
       elem.next = "<semx element='erefstack' source='#{elem['id']}'>#{ret[1]}</semx>"
     end
 

data/lib/isodoc/presentation_function/footnotes.rb

@@ -3,11 +3,12 @@ module IsoDoc
     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>"
+        x << <<~FNOTE.strip
+          <fmt-fn-label><span class='fmt-caption-label'>#{ref}</span</fmt-fn-label>
+        FNOTE
       end
     end
 
@@ -35,7 +36,7 @@ module IsoDoc
         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>
+        <fmt-fn-label><span class='fmt-caption-label'>#{lbl}</span><span class="fmt-caption-delim"><tab/></fmt-fn-label>
       FNOTE
     end
 
@@ -145,7 +146,6 @@ module IsoDoc
     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}"

data/lib/isodoc/presentation_function/ids.rb

@@ -0,0 +1,79 @@
+module IsoDoc
+  class PresentationXMLConvert < ::IsoDoc::Convert
+    def id_validate(docxml)
+      repeat_id_validate(docxml)
+      idref_validate(docxml)
+    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
+    end
+
+    def repeat_id_validate(doc)
+      @log or return
+      @doc_ids = {}
+      doc.xpath("//*[@id]").each do |x|
+        repeat_id_validate1(x)
+      end
+    end
+
+    def idref_validate(doc)
+      @log or return
+      doc.xpath("//*[@original-id]").each do |x|
+        @doc_ids[x["original-id"]] = x.line
+      end
+      Metanorma::Utils::anchor_attributes(presxml: true).each do |e|
+        doc.xpath("//xmlns:#{e[0]}[@#{e[1]}]").each do |x|
+          idref_validate1(x, e[1])
+        end
+      end
+    end
+
+    def idref_validate1(node, attr)
+      node[attr].strip.empty? and return
+      @doc_ids[node[attr]] and return
+      @log.add("Anchors", node,
+               "Anchor #{node[attr]} pointed to by #{node.name} " \
+               "is not defined in the document", severity: 1)
+    end
+
+    def provide_ids(docxml)
+      anchor_sanitise(docxml)
+      populate_id(docxml)
+      add_missing_id(docxml)
+    end
+
+    def anchor_sanitise(docxml)
+      Metanorma::Utils::anchor_attributes.each do |a|
+        docxml.xpath("//xmlns:#{a[0]}").each do |x|
+          x[a[1]] &&= to_ncname(x[a[1]])
+        end
+      end
+    end
+
+    def populate_id(docxml)
+      docxml.xpath("//*[@id]").each do |x|
+        x["semx-id"] = x["id"]
+        x["anchor"] and x["id"] = to_ncname(x["anchor"])
+      end
+    end
+
+    def add_missing_id(docxml)
+      docxml.xpath(ns("//source | //modification | //erefstack | //fn | " \
+        "//review | //floating-title")).each do |s|
+        s["id"] ||= "_#{UUIDTools::UUID.random_create}"
+      end
+    end
+
+    # do not sanitise "#"
+    def to_ncname(ident)
+      ret = ident.split("#", 2)
+      ret.map { |x| Metanorma::Utils::to_ncname(x) }.join("#")
+    end
+  end
+end

data/lib/isodoc/presentation_function/inline.rb

@@ -71,7 +71,7 @@ module IsoDoc
     # do not change to Presentation XML rendering
     def sem_xml_descendant?(node)
       ancestor_names = node.ancestors.map(&:name)
-      %w[preferred admitted deprecated related definition termsource]
+      %w[preferred admitted deprecated related definition source]
         .any? do |name|
         ancestor_names.include?(name)
       end and return true

data/lib/isodoc/presentation_function/refs.rb

@@ -211,7 +211,7 @@ module IsoDoc
       date_note = bib.at(ns("./note[@type = 'Unpublished-Status']"))
       date_note.nil? and return ret
       id = "_#{UUIDTools::UUID.random_create}"
-      "#{ret}<fn reference='#{id}'><p>#{date_note.content}</p></fn>"
+      "#{ret}<fn id='#{id}' reference='#{id}'><p>#{date_note.content}</p></fn>"
     end
 
     def ident_fn(bib)

data/lib/isodoc/presentation_function/terms.rb

@@ -1,24 +1,29 @@
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
     DESIGNATION_ELEMS =
-      %w(preferred admitted deprecates related definition termsource).freeze
+      %w(preferred admitted deprecates related definition source).freeze
+
+    def target_desgn_elem(name)
+      target = "fmt-#{name}"
+      name == "source" and target = "fmt-termsource"
+      target
+    end
 
     def termcontainers(docxml)
       docxml.xpath(ns("//term")).each do |t|
         DESIGNATION_ELEMS.each do |w|
-          d = t.at(ns("./#{w}[last()]")) and d.after("<fmt-#{w}/>")
+          target = target_desgn_elem(w)
+          d = t.at(ns("./#{w}[last()]")) and d.after("<#{target}/>")
         end
       end
-      docxml.xpath(ns("//termsource")).each do |s|
-        s["id"] ||= "_#{UUIDTools::UUID.random_create}"
-      end
     end
 
     def termcleanup(docxml)
       docxml.xpath(ns("//term")).each do |t|
         DESIGNATION_ELEMS.each do |w|
+          target = target_desgn_elem(w)
           t.xpath(ns("./#{w}//fmt-name | ./#{w}//fmt-xref-label")).each(&:remove)
-          f = t.at(ns(".//fmt-#{w}"))
+          f = t.at(ns(".//#{target}"))
           f&.children&.empty? and f.remove
         end
       end
@@ -56,12 +61,12 @@ module IsoDoc
       else singledef(elem, d, d1)
       end
       unwrap_definition(elem, d1)
-s1 = d.xpath(ns(".//termsource"))
-s2 = d1.xpath(ns(".//termsource"))
-s1.each_with_index do |s, i|
-      modification_dup_align(s, s2[i])
-end
-termdomain(elem, d1)
+      s1 = d.xpath(ns(".//source"))
+      s2 = d1.xpath(ns(".//source"))
+      s1.each_with_index do |s, i|
+        modification_dup_align(s, s2[i])
+      end
+      termdomain(elem, d1)
     end
 
     def multidef(_elem, defn, fmt_defn)
@@ -94,7 +99,8 @@ termdomain(elem, d1)
     def termsource(docxml)
       copy_baselevel_termsource(docxml)
       # TODO should I wrap fmt-definition//termsource in fmt-termsource, in order to preserve termsource attributes?
-      docxml.xpath(ns("//fmt-termsource/termsource | //fmt-definition//termsource | //fmt-preferred//termsource | //fmt-admitted//termsource | //fmt-deprecates//termsource"))
+      # differentiating term and nonterm source under designations is not worth it
+      docxml.xpath(ns("//fmt-termsource/source | //fmt-definition//source | //fmt-preferred//source | //fmt-admitted//source | //fmt-deprecates//source"))
         .each do |f|
         termsource_modification(f)
       end
@@ -102,7 +108,7 @@ termdomain(elem, d1)
         .each do |f|
           termsource_designation(f)
         end
-      docxml.xpath(ns("//fmt-termsource/termsource | //fmt-definition//termsource | //fmt-preferred//termsource | //fmt-admitted//termsource | //fmt-deprecates//termsource"))
+      docxml.xpath(ns("//fmt-termsource/source | //fmt-definition//source | //fmt-preferred//source | //fmt-admitted//source | //fmt-deprecates//source"))
         .each do |f|
         f.parent and termsource1(f)
       end
@@ -116,11 +122,8 @@ termdomain(elem, d1)
     end
 
     def copy_baselevel_termsource(docxml)
-      docxml.xpath(ns("//term//modification")).each do |f|
-        f["id"] ||= "_#{UUIDTools::UUID.random_create}"
-      end
-      docxml.xpath(ns("//term[termsource]")).each do |x|
-        s = x.xpath(ns("./termsource"))
+      docxml.xpath(ns("//term[source]")).each do |x|
+        s = x.xpath(ns("./source"))
         s1 = x.at(ns("./fmt-termsource"))
         s.each do |ss|
           dup = ss.clone
@@ -135,13 +138,17 @@ termdomain(elem, d1)
     def modification_dup_align(sem, pres)
       m = sem&.at(ns("./modification")) or return
       m1 = pres.at(ns("./modification"))
+      if m["original-id"]
+        m["id"] = m["original-id"]
+        m.delete("original-id")
+      end
       new_m1 = semx_fmt_dup(m)
       m1.replace("<modification>#{to_xml(new_m1)}</modification>")
     end
 
     def termsource1(elem)
       ret = [semx_fmt_dup(elem)]
-      while elem&.next_element&.name == "termsource"
+      while elem&.next_element&.name == "source"
         ret << semx_fmt_dup(elem.next_element.remove)
       end
       s = ret.map { |x| to_xml(x) }.map(&:strip).join("; ")
@@ -167,7 +174,7 @@ termdomain(elem, d1)
         return
       end
       mod.previous = " &#x2014; "
-      c = mod.at(ns("./semx" )) || mod
+      c = mod.at(ns("./semx")) || mod
       c.elements.size == 1 and c.children = to_xml(c.elements[0].children)
       mod.replace(mod.children)
     end

data/lib/isodoc/presentation_function/title.rb

@@ -25,7 +25,6 @@ module IsoDoc
 
     # TODO not currently doing anything with the @depth attribute of floating-title
     def floattitle1(elem)
-      elem["id"] ||= "_#{UUIDTools::UUID.random_create}"
       p = elem.dup
       p.children = "<semx element='floating-title' source='#{elem['id']}'>" \
         "#{to_xml(p.children)}</semx>"

data/lib/isodoc/presentation_xml_convert.rb

@@ -12,6 +12,7 @@ require_relative "presentation_function/index"
 require_relative "presentation_function/bibdata"
 require_relative "presentation_function/metadata"
 require_relative "presentation_function/footnotes"
+require_relative "presentation_function/ids"
 
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
@@ -25,8 +26,7 @@ module IsoDoc
       presxml_convert_init(docxml, filename, dir)
       conversions(docxml)
       docxml.root["type"] = "presentation"
-      repeat_id_validate(docxml.root)
-      idref_validate(docxml.root)
+      id_validate(docxml.root)
       docxml.to_xml.gsub("&lt;", "&#x3c;").gsub("&gt;", "&#x3e;")
     end
 
@@ -38,59 +38,13 @@ module IsoDoc
       @outputdir = dir
       @outputfile = Pathname.new(filename).basename.to_s
       docid_prefixes(docxml) # feeds @xrefs.parse citation processing
+      provide_ids docxml # feeds @xrefs.parse
       @xrefs.parse docxml
       @xrefs.klass.meta = @meta
       @xrefs.klass.info docxml, nil
       counter_init
     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
-    end
-
-    def repeat_id_validate(doc)
-      @log or return
-      @doc_ids = {}
-      doc.xpath("//*[@id]").each do |x|
-        repeat_id_validate1(x)
-      end
-    end
-
-    IDREF =
-      [%w(review from), %w(review to), %w(index to), %w(xref target),
-       %w(callout target), %w(eref bibitemid), %w(citation bibitemid),
-       %w(admonition target), %w(label for), %w(semx source),
-       %w(fmt-title source), %w(fmt-xref-label container), %w(fn target),
-       %w(fmt-fn-body target), %w(fmt-review-start source),
-       %w(fmt-review-start end), %w(fmt-review-start target),
-       %w(fmt-review-end source), %w(fmt-review-end start),
-       %w(fmt-review-end target)].freeze
-
-    def idref_validate(doc)
-      @log or return
-      doc.xpath("//*[@original-id]").each do |x|
-        @doc_ids[x["original-id"]] = x.line
-      end
-      IDREF.each do |e|
-        doc.xpath("//xmlns:#{e[0]}[@#{e[1]}]").each do |x|
-          idref_validate1(x, e[1])
-        end
-      end
-    end
-
-    def idref_validate1(node, attr)
-      node[attr].strip.empty? and return
-      @doc_ids[node[attr]] and return
-      @log.add("Anchors", node,
-               "Anchor #{node[attr]} pointed to by #{node.name} " \
-               "is not defined in the document", severity: 1)
-    end
-
     def bibitem_lookup(docxml)
       @bibitem_lookup ||= docxml.xpath(ns("//references/bibitem"))
         .each_with_object({}) do |b, m|
@@ -188,35 +142,6 @@ module IsoDoc
           .previous_element
     end
 
-    def embedable_semantic_xml(xml)
-      xml = embedable_semantic_xml_tags(xml)
-      embedable_semantic_xml_attributes(xml)
-    end
-
-    def embedable_semantic_xml_tags(xml)
-      ret = to_xml(xml)
-        .sub(/ xmlns=['"][^"']+['"]/, "") # root XMLNS
-        .split(/(?=[<> \t\r\n\f\v])/).map do |x|
-          case x
-          when /^<[^:]+:/ then x.sub(":", ":semantic__")
-          when /^<[^:]+$/ then x.sub(%r{(</?)([[:alpha:]])},
-                                     "\\1semantic__\\2")
-          else x end
-        end
-      Nokogiri::XML(ret.join).root
-    end
-
-    def embedable_semantic_xml_attributes(xml)
-      Metanorma::Utils::anchor_attributes.each do |(tag_name, attr_name)|
-        tag_name == "*" or tag_name = "semantic__#{tag_name}"
-        xml.xpath("//#{tag_name}[@#{attr_name}]").each do |elem|
-          elem.attributes[attr_name].value =
-            "semantic__#{elem.attributes[attr_name].value}"
-        end
-      end
-      xml
-    end
-
     def postprocess(result, filename, _dir)
       to_xml_file(result, filename)
       @files_to_delete.each { |f| FileUtils.rm_rf f }

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "3.1.7".freeze
+  VERSION = "3.1.8".freeze
 end

data/lib/isodoc/word_function/footnotes.rb

@@ -10,14 +10,6 @@ module IsoDoc
         sprintf "%09d", ret
       end
 
-      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|
-          children_parse(node, a)
-        end
-      end
-
       def fmt_fn_body_parse(node, out)
         node.at(ns(".//fmt-fn-label"))&.remove
         aside = node.parent.name == "fmt-footnote-container"
@@ -28,27 +20,6 @@ module IsoDoc
         end
       end
 
-      # 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
-        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)
-
-        update_table_fn_body_ref(node, table, tid + fn)
-        @seen_footnote << (tid + fn)
-      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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 3.1.7
+  version: 3.1.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-28 00:00:00.000000000 Z
+date: 2025-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -442,6 +442,7 @@ files:
 - lib/isodoc/presentation_function/docid.rb
 - lib/isodoc/presentation_function/erefs.rb
 - lib/isodoc/presentation_function/footnotes.rb
+- lib/isodoc/presentation_function/ids.rb
 - lib/isodoc/presentation_function/image.rb
 - lib/isodoc/presentation_function/index.rb
 - lib/isodoc/presentation_function/inline.rb