metanorma 2.0.11 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7fa8deddc619f4709beefe82cce7b877ea9402963b037b9c84770b3ca0c14a90
-  data.tar.gz: 185080156bee2c43d4a5b87e0bd0ba4925569e94c2f19eeeed2e82d6bb563ec3
+  metadata.gz: 61f89a2c7a4e3b018425e87162e66fa5e1a8c20a4cf546ff477fd525be04e455
+  data.tar.gz: 3af3ca357995db324f7f8f844ff01a0651e0ba9c4fcd4c4f585c15baa4f33269
 SHA512:
-  metadata.gz: fe6ac88b648d30a9f82c5d5bc9b4c14b021204126fc5513772bfa2263519c767e19a395ca26d4f82f2cbd41ca014549d3919b4083832cd282865a70a4105064c
-  data.tar.gz: f3937b78290728d24cbd89245f696c6163ff60f2e4b1b0bc645fa63aec27673d971484a507b15101b1a1c7e3b4b86442c4edf6784913873b5cceed931e7a948c
+  metadata.gz: d8128a3b6b239af0af4e7cef15b5429ac3d4294c4407bcd618d22413ac49f98ee38dcba53c6e78604399321c059f33f93ee4a42d437b258cb5823e609936267c
+  data.tar.gz: 90bcc67a7a066eb8b84bd7abe26398d4cf7513fd8a804fa0cd60944d709ca8352ecfdbc94cc8a02c7d6e423cfddb9abc0754db3e2ecd1d54f3eb95fd64701e37

data/lib/metanorma/collection/collection.rb

@@ -214,6 +214,9 @@ module Metanorma
       # @param fileref [String]
       # @return [String]
       def resolve_fileref(ref_folder, fileref)
+        warn ref_folder
+        warn fileref
+        #require "debug"; binding.b
         unless @fileref_resolver
           (Pathname.new fileref).absolute? or
             fileref = File.join(ref_folder, fileref)

data/lib/metanorma/collection/config/config.rb

@@ -9,7 +9,6 @@ require_relative "manifest"
 module Metanorma
   class Collection
     module Config
-      require "shale/adapter/nokogiri"
       Lutaml::Model::Config.configure do |config|
         config.xml_adapter = Lutaml::Model::XmlAdapter::NokogiriAdapter
       end
@@ -71,7 +70,7 @@ module Metanorma
         end
 
         def manifest_from_xml(model, node)
-          model.manifest = Manifest.from_xml(node.node.to_xml)
+          model.manifest = Manifest.from_xml(node.to_xml)
         end
 
         def manifest_to_xml(model, parent, doc)
@@ -80,7 +79,7 @@ module Metanorma
         end
 
         def prefatory_from_xml(model, node)
-          model.prefatory_content = node
+          model.prefatory_content = node.children.map(&:to_xml).join
         end
 
         def prefatory_to_xml(model, parent, doc)
@@ -105,7 +104,7 @@ module Metanorma
         end
 
         def final_from_xml(model, node)
-          model.final_content = node
+          model.final_content = node.children.map(&:to_xml).join
         end
 
         def directives_from_yaml(model, value)

data/lib/metanorma/collection/config/converters.rb

@@ -15,7 +15,7 @@ module Metanorma
 
         def bibdata_from_xml(model, node)
           node and
-            model.bibdata = Relaton::Cli.parse_xml(node.node.adapter_node)
+            model.bibdata = Relaton::Cli.parse_xml(node.adapter_node)
         end
 
         def bibdata_to_xml(model, parent, doc)

data/lib/metanorma/collection/config/manifest.rb

@@ -7,7 +7,6 @@ require_relative "bibdata"
 module Metanorma
   class Collection
     module Config
-      require "shale/adapter/nokogiri"
       Lutaml::Model::Config.configure do |config|
         config.xml_adapter = Lutaml::Model::XmlAdapter::NokogiriAdapter
       end

data/lib/metanorma/collection/manifest/manifest.rb

@@ -14,6 +14,7 @@ module Metanorma
       # @param docref [Array<Hash{String=>String}>]
       # @param manifest [Array<Metanorma::Collection::Manifest>]
       def initialize(config, collection, dir)
+        #require "debug"; binding.b
         @collection = collection
         @dir = dir
         @disambig = ::Metanorma::Collection::Util::DisambigFiles.new
@@ -21,6 +22,7 @@ module Metanorma
       end
 
       def manifest_postprocess(config)
+        #require "debug"; binding.b
         manifest_bibdata(config)
         manifest_expand_yaml(config, @dir)
         manifest_compile_adoc(config)
@@ -94,6 +96,7 @@ module Metanorma
 
       def manifest_filexist(config)
         if config.file
+        #require "debug"; binding.b
           file = @collection.class.resolve_fileref(@dir, config.file)
           @collection.class.check_file_existence(file)
           config.file = Pathname.new(file).relative_path_from(Pathname.new(@dir))
@@ -108,6 +111,7 @@ module Metanorma
           currdir = dir
           /\.ya?ml$/.match?(e.file) and
             currdir = manifest_expand_yaml_entry(e, dir)
+          #require "debug"; binding.b
           manifest_expand_yaml(e, currdir)
         end
         config
@@ -118,8 +122,10 @@ module Metanorma
         currdir = File.dirname(f)
         @collection.class.check_file_existence(f)
         entry.file = nil
+        #require 'debug'; binding.b
         entry.entry = ::Metanorma::Collection::Config::Config.from_yaml(File.read(f)).manifest
         if currdir != dir
+          #require "debug"; binding.b
           prefix = Pathname.new(currdir).relative_path_from(Pathname.new(dir))
           update_filepaths(entry.entry, prefix.to_s)
         end
@@ -127,6 +133,7 @@ module Metanorma
       end
 
       def update_filepaths(entry, prefix)
+        #require "debug"; binding.b
         entry.file && !(Pathname.new entry.file).absolute? and
           entry.file = File.join(prefix, entry.file)
         entry.entry.each do |f|

data/lib/metanorma/collection/renderer/fileparse.rb

@@ -16,20 +16,23 @@ module Metanorma
       # @return [String] XML content
       def update_xrefs(file, docid, internal_refs)
         xml, sso = update_xrefs_prep(file, docid)
+        #require "debug"; binding.b if /This document is also unrelated/.match?(xml.to_xml)
+        #warn (/fmt-title/.match?(xml.to_xml) ? "*** PRESENTATION" : "*** SEMANTIC")
         @nested || sso or
           Metanorma::Collection::XrefProcess::xref_process(xml, xml, nil, docid,
-                                                           @isodoc)
+                                                           @isodoc, sso)
         @ncnames = {}
-        @nested or update_indirect_refs_to_docs(xml, docid, internal_refs)
+        @nested or update_indirect_refs_to_docs(xml, docid, internal_refs, sso)
         @files.add_document_suffix(docid, xml)
-        @nested or update_sectionsplit_refs_to_docs(xml, internal_refs)
-        update_direct_refs_to_docs(xml, docid)
+        @nested or update_sectionsplit_refs_to_docs(xml, internal_refs, sso)
+        update_direct_refs_to_docs(xml, docid, sso)
         hide_refs(xml)
-        sso and eref2link(xml)
-        @nested or svgmap_resolve(xml, docid)
+        sso and eref2link(xml, sso)
+        @nested or svgmap_resolve(xml, docid, sso)
         xml.to_xml
       end
 
+      ## sso files are Presentation XML; otherwise, Semantic XML
       def update_xrefs_prep(file, docid)
         docxml = file.is_a?(String) ? Nokogiri::XML(file, &:huge) : file
         supply_repo_ids(docxml)
@@ -37,8 +40,8 @@ module Metanorma
         [docxml, sso]
       end
 
-      def update_sectionsplit_refs_to_docs(docxml, internal_refs)
-        Util::gather_citeases(docxml).each do |k, v|
+      def update_sectionsplit_refs_to_docs(docxml, internal_refs, presxml)
+        Util::gather_citeases(docxml, presxml).each do |k, v|
           (@files.get(k) && @files.get(k, :sectionsplit)) or next
           opts = { key: @files.get(k, :indirect_key),
                    source_suffix: docxml.root["document_suffix"],
@@ -81,9 +84,9 @@ module Metanorma
       # Any erefs to that bibitem id are replaced with relative URL
       # Preferably with anchor, and is a job to realise dynamic lookup
       # of localities.
-      def update_direct_refs_to_docs(docxml, identifier)
+      def update_direct_refs_to_docs(docxml, identifier, presxml)
         erefs, erefs_no_anchor, anchors, erefs1 =
-          update_direct_refs_to_docs_prep(docxml)
+          update_direct_refs_to_docs_prep(docxml, presxml)
         docxml.xpath(ns("//bibitem")).each do |b|
           docid = b.at(ns("./docidentifier[@type = 'repository']")) or next
           strip_unresolved_repo_erefs(identifier, docid, erefs1, b) or next
@@ -96,8 +99,8 @@ module Metanorma
       end
 
       # Hash(docid) of arrays
-      def update_direct_refs_to_docs_prep(docxml)
-        erefs = Util::gather_citeases(docxml)
+      def update_direct_refs_to_docs_prep(docxml, presxml)
+        erefs = Util::gather_citeases(docxml, presxml)
         no_anchor = erefs.keys.each_with_object({}) { |k, m| m[k] = [] }
         anchors = erefs.keys.each_with_object({}) { |k, m| m[k] = [] }
         erefs.each do |k, v|
@@ -106,7 +109,8 @@ module Metanorma
             else no_anchor[k] << e end
           end
         end
-        [erefs, no_anchor, anchors, Util::gather_bibitemids(docxml)]
+        #require "debug"; binding.b
+        [erefs, no_anchor, anchors, Util::gather_bibitemids(docxml, presxml)]
       end
 
       # strip erefs if they are repository erefs, but do not point to a document
@@ -124,8 +128,8 @@ module Metanorma
 
       # Resolve erefs to a container of ids in another doc,
       # to an anchor eref (direct link)
-      def update_indirect_refs_to_docs(docxml, _docidentifier, internal_refs)
-        bib, erefs, doc_suffix, doc_type, f = update_indirect_refs_prep(docxml)
+      def update_indirect_refs_to_docs(docxml, _docidentifier, internal_refs, presxml)
+        bib, erefs, doc_suffix, doc_type, f = update_indirect_refs_prep(docxml, presxml)
         internal_refs.each do |schema, ids|
           add_suffix = doc_suffix && doc_type && doc_type != schema
           ids.each do |id, file|
@@ -138,13 +142,14 @@ module Metanorma
         end
       end
 
-      def update_indirect_refs_prep(docxml)
+      def update_indirect_refs_prep(docxml, presxml)
         @updated_anchors = {}
         @indirect_keys = {}
-        [Util::gather_bibitems(docxml), Util::gather_bibitemids(docxml),
+        [Util::gather_bibitems(docxml), Util::gather_bibitemids(docxml, presxml),
          docxml.root["document_suffix"], docxml.root["type"], {}]
       end
 
+      # KILL
       def indirect_ref_key(schema, id, doc_suffix, doc_type)
         /^#{schema}_/.match?(id) and return id
         key = [schema, id, doc_suffix, doc_type].join("::")
@@ -168,6 +173,7 @@ module Metanorma
                                 end
       end
 
+      # KILL
       def indirect_ref_keyx(schema, id, doc_suffix, doc_type)
         /^#{schema}_/.match?(id) and return id
         ret = "#{schema}_#{id}"

data/lib/metanorma/collection/renderer/fileprocess.rb

@@ -15,6 +15,7 @@ module Metanorma
           format: :asciidoc,
           extension_keys: @format,
           output_dir: @outdir,
+          type: @flavor,
         }.merge(compile_options_update(identifier))
         @compile.compile file, opts
         @files.set(identifier, :outputs, {})

data/lib/metanorma/collection/renderer/renderer.rb

@@ -44,7 +44,7 @@ module Metanorma
         @compile.load_flavor(@flavor)
 
         # output processor for flavour
-        @isodoc = Util::isodoc_create(@flavor, @lang, @scropt, @xml)
+        @isodoc = Util::isodoc_create(@flavor, @lang, @script, @xml)
         @outdir = dir_name_cleanse(options[:output_folder])
         @coverpage = options[:coverpage] || collection.coverpage
         @format = ::Metanorma::Util.sort_extensions_execution(options[:format])

data/lib/metanorma/collection/renderer/svg.rb

@@ -10,13 +10,21 @@ module Metanorma
         datauri_encode(docxml, dir)
       end
 
-      def svgmap_resolve(docxml, docid)
+      def svgmap_resolve(docxml, docid, presxml)
+        #require "debug"; binding.b
         ids = @files.get(docid, :ids)
         docxml = svg_unnest(svg_datauri(docxml, docid))
         isodoc = IsoDoc::PresentationXMLConvert.new({})
         isodoc.bibitem_lookup(docxml)
-        docxml.xpath(ns("//svgmap//eref")).each do |e|
-          svgmap_resolve_eref(e, isodoc, docxml, ids)
+        tag = presxml ? "fmt-eref" : "eref"
+        docxml.xpath(ns("//svgmap//#{tag}")).each do |e|
+        #require "debug"; binding.b
+          svgmap_resolve_eref(e, isodoc, docxml, ids, presxml)
+        end
+        docxml.xpath(ns("//svgmap/target")).each do |t| # undo Presentation XML: Vectory takes eref not fmt-eref
+          n = t.at(ns(".//fmt-link | .//fmt-xref | .//fmt-eref")) or next
+          n.name = n.name.sub(/^fmt-/, "")
+          t.children = n
         end
         Vectory::SvgMapping.new(docxml, "").call
         docxml.xpath(ns("//svgmap")).each { |s| isodoc.svgmap_extract(s) }
@@ -30,13 +38,13 @@ module Metanorma
         docxml
       end
 
-      def svgmap_resolve_eref(eref, isodoc, _docxml, ids)
+      def svgmap_resolve_eref(eref, isodoc, _docxml, ids, presxml)
         href = isodoc.eref_target(eref) or return
         href = href[:link]
         href == "##{eref['bibitemid']}" ||
           (href =~ /^#/ && !ids[href.sub(/^#/, "")]) and return
         eref["target"] = href.strip
-        eref.name = "link"
+        eref.name = presxml ? "fmt-link" : "link"
         eref.elements&.remove
       end
     end

data/lib/metanorma/collection/renderer/utils.rb

@@ -58,8 +58,9 @@ module Metanorma
         ::Metanorma::Collection::Util::key(docid_prefix(docid))
       end
 
-      def collect_erefs(docxml)
-        docxml.xpath(ns("//eref"))
+      def collect_erefs(docxml, presxml)
+        tag = presxml ? "fmt-eref" : "eref"
+        docxml.xpath(ns("//#{tag}"))
           .each_with_object({ citeas: {}, bibitemid: {} }) do |i, m|
           m[:citeas][i["citeas"]] = true
           m[:bibitemid][i["bibitemid"]] = true
@@ -195,7 +196,7 @@ module Metanorma
         end.doc.root.to_html
       end
 
-      def eref2link(docxml)
+      def eref2link(docxml, presxml)
         isodoc = IsoDoc::PresentationXMLConvert.new({})
         isodoc.bibitem_lookup(docxml)
         isodoc.eref2link(docxml)

data/lib/metanorma/collection/sectionsplit/sectionsplit.rb

@@ -39,7 +39,8 @@ module Metanorma
         empty = empty_doc(xml)
         empty1 = empty_attachments(empty)
         @mutex = Mutex.new
-        @pool = Concurrent::FixedThreadPool.new(4)
+        #@pool = Concurrent::FixedThreadPool.new(4)
+        @pool = Concurrent::FixedThreadPool.new(1)
         sectionsplit1(xml, empty, empty1, 0)
       end
 
@@ -85,6 +86,7 @@ module Metanorma
         xml, type = sectionsplit_preprocess_semxml(file, filename)
         flags = { format: :asciidoc, extension_keys: [:presentation],
                   type: type }.merge(@compile_opts)
+        #require "debug"; binding.b
         Compile.new.compile(xml, flags)
         f = File.open(xml.sub(/\.xml$/, ".presentation.xml"), encoding: "utf-8")
         r = Nokogiri::XML(f, &:huge)
@@ -95,7 +97,8 @@ module Metanorma
 
       def sectionsplit_preprocess_semxml(file, filename)
         xml = Nokogiri::XML(file, &:huge)
-        type = xml.root.name.sub("-standard", "").to_sym
+        type = xml.root["flavor"]
+        type ||= xml.root.name.sub("-standard", "").to_sym
         sectionsplit_update_xrefs(xml)
         xml1 = sectionsplit_write_semxml(filename, xml)
         @tmp_filename = xml1
@@ -106,6 +109,7 @@ module Metanorma
         if c = @fileslookup&.parent
           n = c.nested
           c.nested = true # so unresolved erefs are not deleted
+        #require "debug"; binding.b
           c.update_xrefs(xml, @ident, {})
           c.nested = n
           xml.xpath("//xmlns:svgmap").each { |x| x.name = "svgmap1" }
@@ -160,10 +164,11 @@ module Metanorma
 
       def create_sectionfile(xml, out, file, chunks, parentnode)
         ins = out.at(ns("//metanorma-extension")) || out.at(ns("//bibdata"))
+        #require "debug"; binding.b
         sectionfile_insert(ins, chunks, parentnode)
         Metanorma::Collection::XrefProcess::xref_process(out, xml, @key,
-                                                         @ident, @isodoc)
-        truncate_semxml(out, chunks)
+                                                         @ident, @isodoc, true)
+        #truncate_semxml(out, chunks)
         outname = "#{file}.xml"
         File.open(File.join(@splitdir, outname), "w:UTF-8") do |f|
           f.write(out)
@@ -171,6 +176,7 @@ module Metanorma
         outname
       end
 
+      # KILL
       def semantic_xml_ids_gather(out)
         out.at(ns("//semantic__bibdata")) or return
         SPLITSECTIONS.each_with_object({}) do |s, m|
@@ -181,12 +187,14 @@ module Metanorma
         end
       end
 
+      # KILL
       def semxml_presxml_nodes_match(nodes, chunks)
         chunks.each do |x|
           nodes[x["id"]] and nodes.delete(x["id"])
         end
       end
 
+      # KILL
       def truncate_semxml(out, chunks)
         nodes = semantic_xml_ids_gather(out) or return
         semxml_presxml_nodes_match(nodes, chunks)

data/lib/metanorma/collection/util/util.rb

@@ -14,17 +14,19 @@ module Metanorma
           end
         end
 
-        def gather_bibitemids(xml)
+        def gather_bibitemids(xml, presxml)
           xml.xpath("//*[@bibitemid]").each_with_object({}) do |e, m|
-            /^semantic__/.match?(e.name) and next
+            #/^semantic__/.match?(e.name) and next
+            presxml && %w(xref eref link).include?(e.name) and next
             m[e["bibitemid"]] ||= []
             m[e["bibitemid"]] << e
           end
         end
 
-        def gather_citeases(xml)
+        def gather_citeases(xml, presxml)
           xml.xpath("//*[@citeas]").each_with_object({}) do |e, m|
-            /^semantic__/.match?(e.name) and next
+            #/^semantic__/.match?(e.name) and next
+            presxml && %w(xref eref link).include?(e.name) and next
             k = key(e["citeas"])
             m[k] ||= []
             m[k] << e

data/lib/metanorma/collection/xrefprocess/xrefprocess.rb

@@ -5,12 +5,14 @@ module Metanorma
         # xml.root["type"] = key # to force recognition of internal refs
         # bookmarks etc as new id elements introduced in Presentation XML:
         # add doc suffix
+        # Run on Semantic XML
         def xref_preprocess(xml, isodoc)
           @isodoc = isodoc
           key = (0...8).map { rand(65..90).chr }.join # random string
           xml.root["type"] = key
           Metanorma::Utils::anchor_attributes
             .each do |(tag_name, attr_name)|
+              #tag_name == "xref" and tag_name = "fmt-xref"
             ::Metanorma::Collection::Util::add_suffix_to_attrs(
               xml, xml.root["document_suffix"], tag_name, attr_name, isodoc
             )
@@ -22,21 +24,21 @@ module Metanorma
           @isodoc.ns(xpath)
         end
 
-        def xref_process(section, xml, key, ident, isodoc)
+        def xref_process(section, xml, key, ident, isodoc, presxml)
           @isodoc ||= isodoc
-          svg_preprocess(section, Metanorma::Utils::to_ncname(ident))
-          refs = eref_to_internal_eref(section, xml, key)
-          refs += xref_to_internal_eref(section, xml, key)
+          svg_preprocess(section, Metanorma::Utils::to_ncname(ident), presxml)
+          refs = eref_to_internal_eref(section, xml, key, presxml)
+          refs += xref_to_internal_eref(section, xml, key, presxml)
           ins = new_hidden_ref(section)
           copied_refs = copy_repo_items_biblio(ins, section, xml)
           insert_indirect_biblio(ins, refs - copied_refs, key, xml)
         end
 
-        def svg_preprocess(xml, doc_suffix)
+        def svg_preprocess(xml, doc_suffix, presxml)
           suffix = doc_suffix.nil? || doc_suffix.blank? ? "" : "_#{doc_suffix}"
           xml.xpath("//m:svg", "m" => "http://www.w3.org/2000/svg").each do |s|
             m = svgmap_wrap(s)
-            svg_xrefs(s, m, suffix)
+            svg_xrefs(s, m, suffix, presxml)
           end
           xml
         end
@@ -48,12 +50,13 @@ module Metanorma
           svg.at("./ancestor::xmlns:svgmap")
         end
 
-        def svg_xrefs(svg, svgmap, suffix)
+        def svg_xrefs(svg, svgmap, suffix, presxml)
+          tag = presxml ? "fmt-xref" : "xref"
           svg.xpath(".//m:a", "m" => "http://www.w3.org/2000/svg").each do |a|
             /^#/.match? a["href"] or next
             a["href"] = a["href"].sub(/^#/, "")
             svgmap << "<target href='#{a['href']}'>" \
-              "<xref target='#{a['href']}#{suffix}'/></target>"
+              "<#{tag} target='#{a['href']}#{suffix}'/></target>"
           end
         end
 
@@ -65,15 +68,16 @@ module Metanorma
               "#{anchor}</referenceFrom></locality></localityStack>"
         end
 
-        def xref_to_internal_eref(section, xml, key)
+        def xref_to_internal_eref(section, xml, key, presxml)
           key or return [] # no sectionsplit, no playing with xrefs
           bibitems, indirect = xref_to_internal_eref_prep(section, xml)
-          section.xpath(ns("//xref")).each_with_object({}) do |x, m|
+          tag = presxml ? "fmt-xref" : "xref"
+          section.xpath(ns("//#{tag}")).each_with_object({}) do |x, m|
             xref_prefix_key(x, key, indirect)
             x["bibitemid"] = x["target"]
             m[x["bibitemid"]] = true
             xref_to_internal_eref_anchor(x, key, bibitems,
-                                         xml.root["document_suffix"])
+                                         xml.root["document_suffix"], presxml)
           end.keys
         end
 
@@ -84,7 +88,7 @@ module Metanorma
           [bibitems, indirect_bibitems]
         end
 
-        def xref_to_internal_eref_anchor(xref, key, bibitems, document_suffix)
+        def xref_to_internal_eref_anchor(xref, key, bibitems, document_suffix, presxml)
           t = xref["target"]
           if d = bibitems[t]&.at(ns("./docidentifier[@type = 'repository']"))
             m = %r{^([^/]+)}.match(d.text) and
@@ -93,7 +97,7 @@ module Metanorma
           key and t.sub!(%r{^#{key}_}, "")
           make_anchor(xref, t.sub(%r(_#{document_suffix}$), ""))
           xref.delete("target")
-          xref.name = "eref"
+          xref.name = presxml ? "fmt-eref" : "eref"
         end
 
         def xref_prefix_key(xref, key, indirect)
@@ -114,32 +118,32 @@ module Metanorma
           url&.text
         end
 
-        def eref_to_internal_eref(section, xml, key)
+        def eref_to_internal_eref(section, xml, key, presxml)
           bibitems, indirect, bibids, lang =
-            eref_to_internal_eref_prep(section, xml)
-          eref_to_internal_eref_select(section, xml, bibitems)
+            eref_to_internal_eref_prep(section, xml, presxml)
+          eref_to_internal_eref_select(section, xml, bibitems, presxml)
             .each_with_object([]) do |x, m|
               url = select_citation_uri(bibitems[x], lang)
               bibids[x]&.each do |e|
                 e.at(ns("./localityStack | ./locality")) and next
-                id = eref_to_internal_eref1(e, key, url, indirect) and m << id
+                id = eref_to_internal_eref1(e, key, url, indirect, presxml) and m << id
               end
             end
         end
 
-        def eref_to_internal_eref_prep(section, xml)
+        def eref_to_internal_eref_prep(section, xml, presxml)
           bibitems = ::Metanorma::Collection::Util::gather_bibitems(xml)
             .delete_if { |_, v| internal_bib?(v) }
           indirect = ::Metanorma::Collection::Util::gather_bibitems(xml)
             .select { |_, v| indirect_bib?(v) }
-          bibitemids = ::Metanorma::Collection::Util::gather_bibitemids(section)
+          bibitemids = ::Metanorma::Collection::Util::gather_bibitemids(section, presxml)
           lang = xml.at(ns("//bibdata/language"))&.text || "en"
           [bibitems, indirect, bibitemids, lang]
         end
 
-        def eref_to_internal_eref1(elem, key, url, indirect)
+        def eref_to_internal_eref1(elem, key, url, indirect, presxml)
           if url
-            elem.name = "link"
+            elem.name = presxml ? "fmt-link" : "link"
             elem["target"] = url
             nil
           elsif !indirect[elem["bibitemid"]]
@@ -162,8 +166,8 @@ module Metanorma
           elem["bibitemid"]
         end
 
-        def eref_to_internal_eref_select(section, _xml, bibitems)
-          refs = ::Metanorma::Collection::Util::gather_bibitemids(section).keys
+        def eref_to_internal_eref_select(section, _xml, bibitems, presxml)
+          refs = ::Metanorma::Collection::Util::gather_bibitemids(section, presxml).keys
           refs.uniq.reject do |x|
             b = bibitems[x] and (indirect_bib?(b) || internal_bib?(b))
           end

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "2.0.11".freeze
+  VERSION = "2.1.2".freeze
 end

data/metanorma.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "concurrent-ruby"
   spec.add_runtime_dependency "fontist", ">= 1.14.3"
   spec.add_runtime_dependency "htmlentities"
-  spec.add_runtime_dependency "isodoc", ">= 2.12.2"
+  spec.add_runtime_dependency "isodoc", ">= 3.0.0"
   spec.add_runtime_dependency "mn2pdf", "~> 2"
   spec.add_runtime_dependency "nokogiri"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 2.0.11
+  version: 2.1.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-20 00:00:00.000000000 Z
+date: 2025-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.12.2
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.12.2
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: mn2pdf
   requirement: !ruby/object:Gem::Requirement