metanorma 2.0.0 → 2.1.2

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

@@ -16,19 +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)
-        @nested or update_indirect_refs_to_docs(xml, docid, internal_refs)
+                                                           @isodoc, sso)
+        @ncnames = {}
+        @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)
-        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)
@@ -36,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"],
@@ -49,9 +53,11 @@ module Metanorma
         end
       end
 
+      ANCHOR_XPATH = "xmlns:locality[@type = 'anchor']/xmlns:referenceFrom"
+        .freeze
+
       def update_sectionsplit_eref_to_doc(eref, internal_refs, doclist, opts)
-        a = eref.at(ns("./localityStack/locality[@type = 'anchor']/" \
-                       "referenceFrom")) or return
+        a = eref.at("./xmlns:localityStack/#{ANCHOR_XPATH}") or return
         doc = internal_refs[opts[:key]]["#{a.text}_#{opts[:target_suffix]}"]
         bibitemid = Metanorma::Utils::to_ncname("#{doc}_#{opts[:source_suffix]}")
         eref["bibitemid"] = bibitemid
@@ -59,19 +65,6 @@ module Metanorma
         doclist
       end
 
-      def new_hidden_ref(xmldoc)
-        ins = xmldoc.at(ns("bibliography")) or
-          xmldoc.root << "<bibliography/>" and ins = xmldoc.at(ns("bibliography"))
-        ins.at(ns("./referenced[@hidden = 'true']")) or
-          ins.add_child("<references hidden='true' normative='false'/>").first
-      end
-
-      def eref2link(docxml)
-        isodoc = IsoDoc::PresentationXMLConvert.new({})
-        isodoc.bibitem_lookup(docxml)
-        isodoc.eref2link(docxml)
-      end
-
       BIBITEM_NOT_REPO_XPATH = "//bibitem[not(ancestor::bibitem)]" \
         "[not(./docidentifier[@type = 'repository'])]".freeze
 
@@ -86,47 +79,38 @@ module Metanorma
         end
       end
 
-      def svgmap_resolve(docxml, docid)
-        ids = @files.get(docid, :ids)
-        dir = File.join(@dirname, File.dirname(@files.get(docid, :rel_path)))
-        docxml = datauri_encode(docxml, dir)
-        isodoc = IsoDoc::PresentationXMLConvert.new({})
-        isodoc.bibitem_lookup(docxml)
-        docxml.xpath(ns("//svgmap//eref")).each do |e|
-          svgmap_resolve1(e, isodoc, docxml, ids)
-        end
-        Vectory::SvgMapping.new(docxml, "").call
-        docxml.xpath(ns("//svgmap")).each { |s| isodoc.svgmap_extract(s) }
-      end
-
-      def svgmap_resolve1(eref, isodoc, _docxml, ids)
-        href = isodoc.eref_target(eref) or return
-        href == "##{eref['bibitemid']}" ||
-          (href =~ /^#/ && !ids[href.sub(/^#/, "")]) and return
-        eref["target"] = href.strip
-        eref.name = "link"
-        eref.elements&.remove
-      end
-
       # repo(current-metanorma-collection/ISO 17301-1:2016)
       # replaced by bibdata of "ISO 17301-1:2016" in situ as bibitem.
       # 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)
-        erefs, erefs1 = update_direct_refs_to_docs_prep(docxml)
+      def update_direct_refs_to_docs(docxml, identifier, presxml)
+        erefs, erefs_no_anchor, anchors, erefs1 =
+          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
           update_bibitem(b, identifier)
           docid = docid_to_citeas(b) or next
-          erefs[docid] and update_anchors(b, docid, erefs[docid])
+          erefs[docid] and
+            update_anchors(b, docid, erefs[docid], erefs_no_anchor[docid],
+                           anchors[docid])
         end
       end
 
-      def update_direct_refs_to_docs_prep(docxml)
-        @ncnames = {}
-        [Util::gather_citeases(docxml), Util::gather_bibitemids(docxml)]
+      # Hash(docid) of arrays
+      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|
+          v.each do |e|
+            if loc = e.at(".//#{ANCHOR_XPATH}") then anchors[k] << loc
+            else no_anchor[k] << e end
+          end
+        end
+        #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
@@ -144,90 +128,122 @@ 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)
-        bibitems, erefs = update_indirect_refs_to_docs_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|
-            k = indirect_ref_key(schema, id, docxml)
-            update_indirect_refs_to_docs1(docxml, k, file, bibitems, erefs)
+            f[file] ||= { url: @files.url?(file),
+                          parentid: @files.get(file) && @files.get(file,
+                                                                   :parentid) }
+            k = indirect_ref_key(schema, id, doc_suffix, add_suffix)
+            update_indirect_refs_to_docs1(f[file], k, file, bib, erefs)
           end
         end
       end
 
-      def update_indirect_refs_to_docs_prep(docxml)
+      def update_indirect_refs_prep(docxml, presxml)
         @updated_anchors = {}
-        [Util::gather_bibitems(docxml), Util::gather_bibitemids(docxml)]
+        @indirect_keys = {}
+        [Util::gather_bibitems(docxml), Util::gather_bibitemids(docxml, presxml),
+         docxml.root["document_suffix"], docxml.root["type"], {}]
       end
 
-      def indirect_ref_key(schema, id, docxml)
+      # 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("::")
+        x = @indirect_keys[key] and return x
         ret = "#{schema}_#{id}"
-        suffix = docxml.root["document_suffix"]
-        (k = docxml.root["type"]) && k != schema && suffix and
-          ret = "#{ret}_#{suffix}"
+        doc_suffix && doc_type && doc_type != schema and
+          ret = "#{ret}_#{doc_suffix}"
+        @indirect_keys[key] = ret
         ret
       end
 
-      def update_indirect_refs_to_docs1(_docxml, key, file, bibitems, erefs)
+      def indirect_ref_key(schema, id, doc_suffix, add_suffix)
+        /^#{schema}_/.match?(id) and return id
+        #key = "#{schema}_#{id}"
+        x = @indirect_keys.dig(schema, id) and return x
+        @indirect_keys[schema] ||= {}
+        @indirect_keys[schema][id] = if add_suffix
+                                  "#{schema}_#{id}_#{doc_suffix}"
+                                else
+                                   "#{schema}_#{id}"
+                                end
+      end
+
+      # KILL
+      def indirect_ref_keyx(schema, id, doc_suffix, doc_type)
+        /^#{schema}_/.match?(id) and return id
+        ret = "#{schema}_#{id}"
+        doc_suffix && doc_type && doc_type != schema and
+          ret = "#{ret}_#{doc_suffix}"
+        ret
+      end
+
+      def update_indirect_refs_to_docs1(filec, key, file, bibitems, erefs)
         erefs[key]&.each do |e|
           e["citeas"] = file
-          update_indirect_refs_to_docs_anchor(e, file)
+          update_indirect_refs_to_docs_anchor(e, file, filec[:url],
+                                              filec[:parentid])
         end
         update_indirect_refs_to_docs_docid(bibitems[key], file)
       end
 
-      def update_indirect_refs_to_docs_anchor(eref, file)
-        a = eref.at(ns(".//locality[@type = 'anchor']/referenceFrom")) or return
-        suffix = file
-        @files.get(file) && p = @files.get(file, :parentid) and
-          suffix = "#{p}_#{suffix}"
+      def update_indirect_refs_to_docs_anchor(eref, file, url, parentid)
+        a = eref.at(".//#{ANCHOR_XPATH}") or return
+        parentid and file = "#{parentid}_#{file}"
         existing = a.text
-        anchor = existing
-        @files.url?(file) or
-          anchor = Metanorma::Utils::to_ncname("#{anchor}_#{suffix}")
+        anchor = if url then existing
+                   else 
+                     #suffix_anchor_indirect(existing, suffix)
+                     #k = "#{existing}_#{file}"
+        #@ncnames[k] ||= Metanorma::Utils::to_ncname(k)
+        @indirect_keys[existing] ||= {}
+        @indirect_keys[existing][file] ||= Metanorma::Utils::to_ncname("#{existing}_#{file}")
+                   end
         @updated_anchors[existing] or a.children = anchor
         @updated_anchors[anchor] = true
       end
 
-      def update_indirect_refs_to_docs_docid(bibitem, file)
-        docid = bibitem&.at(ns("./docidentifier[@type = 'repository']")) or
-          return
+      def update_indirect_refs_to_docs_docid(bib, file)
+        docid = bib&.at(ns("./docidentifier[@type = 'repository']")) or return
         docid.children = "current-metanorma-collection/#{file}"
         docid.previous =
           "<docidentifier type='metanorma-collection'>#{file}</docidentifier>"
       end
 
-      # update crossrefences to other documents, to include
-      # disambiguating document suffix on id
-      def update_anchors(bib, docid, erefs)
-        erefs.each do |e|
-          if @files.get(docid) then update_anchor_loc(bib, e, docid)
-          else
-            msg = "<strong>** Unresolved reference to document #{docid} " \
-                  "from eref</strong>"
-            e << msg
-            strip_eref(e)
-            @log&.add("Cross-References", e, msg)
-          end
+      # bottleneck
+      def update_anchors(bib, docid, erefs, erefs_no_anchor, erefs_anchors)
+        @files.get(docid) or error_anchor(erefs, docid)
+        has_anchors, url, ncn_docid = update_anchors_prep(docid)
+        erefs_no_anchor.each do |e|
+          update_anchor_create_loc(bib, e, docid)
+        end
+        !url && has_anchors or return
+        erefs_anchors.each do |e|
+          update_anchors1(docid, ncn_docid, e)
+        end
+      end
+
+      def update_anchors1(docid, ncn_docid, anchor)
+        @concat_anchors[anchor.text] ||= "#{ncn_docid}_#{anchor.text}"
+        if @files.get(docid).dig(:anchors_lookup, @concat_anchors[anchor.text])
+          anchor.content = @concat_anchors[anchor.text]
         end
       end
 
-      def update_anchor_loc(bib, eref, docid)
-        loc = eref.at(".//xmlns:locality[@type = 'anchor']") or
-          return update_anchor_create_loc(bib, eref, docid)
-        ref = loc.at("./xmlns:referenceFrom") or return
-        anchor = suffix_anchor(ref, docid)
-        a = @files.get(docid, :anchors) or return
-        a.inject([]) { |m, (_, x)| m + x.values }
-          .include?(anchor) or return
-        ref.content = anchor
+      def update_anchors_prep(docid)
+        @concat_anchors = {}
+        [@files.get(docid)&.key?(:anchors_lookup), @files.url?(docid),
+         Metanorma::Utils::to_ncname(docid)]
       end
 
-      def suffix_anchor(ref, docid)
-        @ncnames[docid] ||= Metanorma::Utils::to_ncname(docid)
-        anchor = ref.text
-        @files.url?(docid) or anchor = "#{@ncnames[docid]}_#{anchor}"
-        anchor
+      # encode both prefix and suffix to NCName
+      def suffix_anchor_indirect(prefix, suffix)
+        k = "#{prefix}_#{suffix}"
+        @ncnames[k] ||= Metanorma::Utils::to_ncname(k)
       end
 
       # if there is a crossref to another document, with no anchor, retrieve the
@@ -237,10 +253,9 @@ module Metanorma
         type = ins.at(ns("./locality/@type"))&.text
         type = "clause" if type == "annex"
         ref = ins.at(ns("./locality/referenceFrom"))&.text
-        anchor = @files.get(docid, :anchors).dig(type, ref) or return
-        ins << "<locality type='anchor'><referenceFrom>#{anchor.sub(/^_/,
-                                                                    '')}" \
-               "</referenceFrom></locality>"
+        a = @files.get(docid, :anchors).dig(type, ref) or return
+        ins << "<locality type='anchor'><referenceFrom>#{a.sub(/^_/, '')}" \
+          "</referenceFrom></locality>"
       end
     end
   end

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, {})
@@ -35,7 +36,8 @@ module Metanorma
 
       def file_compile_formats(filename, identifier)
         f = @files.get(identifier, :outputs)
-        @format << :presentation if @format.include?(:pdf)
+        concatenate_presentation?({ format: @format }) and
+          @format << :presentation
         @format.each do |e|
           ext = @compile.processor.output_formats[e]
           fn = File.basename(filename).sub(/(?<=\.)[^.]+$/, ext.to_s)
@@ -51,7 +53,8 @@ module Metanorma
           out = out.relative_path_from(File.expand_path(FileUtils.pwd))
         dest = File.join(@outdir, @disambig.source2dest_filename(out.to_s))
         FileUtils.mkdir_p(File.dirname(dest))
-        FileUtils.cp @files.get(identifier, :ref), dest
+        source = @files.get(identifier, :ref)
+        source != dest and FileUtils.cp_r source, dest, remove_destination: true
       end
 
       # process each file in the collection
@@ -83,6 +86,7 @@ module Metanorma
       def gather_internal_refs
         @files.keys.each_with_object({}) do |i, refs|
           @files.get(i, :attachment) and next
+          @files.get(i, :sectionsplit) and next
           file, = @files.targetfile_id(i, read: true)
           gather_internal_refs1(file, i, refs)
         end

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

@@ -114,7 +114,7 @@ module Metanorma
             files.each { |f| docrefs(f, u) }
           end
         end
-        r.doc.root&.to_html&.gsub("\n", " ")
+        r.doc.root&.to_html&.tr("\n", " ")
       end
 
       def liquid_docrefs(mnfs)

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

@@ -3,8 +3,8 @@ module Metanorma
     class Renderer
       def docconv
         @tempfile_cache ||= []
-        doctype = @doctype.to_sym
-        x = Asciidoctor.load nil, backend: doctype
+        flavor = @flavor.to_sym
+        x = Asciidoctor.load nil, backend: flavor
         x.converter.doc_converter(DocOptionsNode.new(@directives, @dirname))
       end
 
@@ -34,7 +34,8 @@ module Metanorma
 
       def wrapping_doc_body(doc)
         doc.xpath(ns("//annex | //preface | //bibliography")).each(&:remove)
-        s = doc.at(ns("//sections"))
+        s = doc.at(ns("//sections")) ||
+          doc.root.elements[-1].after("<sections/>").next
         repl = <<~BODY
           <sections><clause id='_collection_placeholder'><p>PLACEHOLDER</p></clause></sections>
         BODY
@@ -50,8 +51,8 @@ module Metanorma
         doc
       end
 
-      SECTION_BREAK = '<p class="MsoNormal"><br clear="all" class="section"/></p>'
-        .freeze
+      SECTION_BREAK =
+        '<p class="MsoNormal"><br clear="all" class="section"/></p>'.freeze
       DIV1 = '<div class="WordSection1">&#xa0;</div>'.freeze
       DIV2 = '<div class="WordSection2">&#xa0;</div>'.freeze
 
@@ -69,10 +70,10 @@ module Metanorma
       end
 
       def collection_coverpages(conv, docs)
-        conv.wordintropage and [DIV2, SECTION_BREAK].reverse.each do |s|
+        conv.wordintropage and [DIV2, SECTION_BREAK].reverse_each do |s|
           docs.unshift(Nokogiri::XML(s).root)
         end
-        conv.wordcoverpage and [DIV1, SECTION_BREAK].reverse.each do |s|
+        conv.wordcoverpage and [DIV1, SECTION_BREAK].reverse_each do |s|
           docs.unshift(Nokogiri::XML(s).root)
         end
         docs

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

@@ -4,9 +4,11 @@ require_relative "fileprocess"
 require_relative "../../util/fontist_helper"
 require_relative "../../util/util"
 require_relative "../filelookup/filelookup"
+require_relative "../multilingual/multilingual"
 require_relative "utils"
 require_relative "render_word"
 require_relative "navigation"
+require_relative "svg"
 
 module Metanorma
   class Collection
@@ -36,11 +38,13 @@ module Metanorma
         @lang = collection.bibdata.language.first || "en"
         @script = collection.bibdata.script.first || "Latn"
         @locale = @xml.at("//xmlns:bibdata/xmlns:locale")&.text
-        @doctype = doctype
+        @registry = Metanorma::Registry.instance
+        @flavor = options[:flavor] || flavor
         @compile = Compile.new
-        @compile.load_flavor(@doctype)
+        @compile.load_flavor(@flavor)
 
-        @isodoc = isodoc_create # output processor for flavour
+        # output processor for flavour
+        @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])
@@ -58,7 +62,8 @@ module Metanorma
         @final = collection.final
         @c = HTMLEntities.new
         @files_to_delete = []
-        @nested = options[:nested] # if false, this is the root instance of Renderer
+        @nested = options[:nested]
+        # if false, this is the root instance of Renderer
         # if true, then this is not the last time Renderer will be run
         # (e.g. this is sectionsplit)
 
@@ -71,6 +76,7 @@ module Metanorma
 
       def flush_files
         warn "\n\n\n\n\nDone: #{DateTime.now.strftime('%H:%M:%S')}"
+        warn "\nFiles to delete:\n"
         warn @files.files_to_delete
         @files.files_to_delete.each { |f| FileUtils.rm_f(f) }
         @files_to_delete.each { |f| FileUtils.rm_f(f) }
@@ -93,53 +99,68 @@ module Metanorma
 
       def concatenate(col, options)
         warn "\n\n\n\n\nConcatenate: #{DateTime.now.strftime('%H:%M:%S')}"
-        (options[:format] & %i(pdf doc)).empty? or
+        concatenate_presentation?(options) and
           options[:format] << :presentation
         concatenate_prep(col, options)
         concatenate_outputs(options)
       end
 
+      def concatenate_presentation?(options)
+        !(options[:format] & %i(pdf doc)).empty? ||
+          (@directives.detect { |d| d.key == "bilingual" } &&
+          options[:format].include?(:html))
+      end
+
       def concatenate_prep(col, options)
         %i(xml presentation).each do |e|
           options[:format].include?(e) or next
           ext = e == :presentation ? "presentation.xml" : e.to_s
           File.open(File.join(@outdir, "collection.#{ext}"), "w:UTF-8") do |f|
             b = concatenate1(col.clone, e).to_xml
-            e == :presentation and
-              b.sub!("<metanorma-collection>", "<metanorma-collection xmlns='http://metanorma.org'>")
-            # TODO BEING FORCED TO DO THAT BECAUSE SHALE IS NOT DEALING WITH DEFAULT NAMESPACES
+            e == :presentation and b = concatenate_presentation(b)
             f.write(b)
           end
         end
       end
 
+      def concatenate_presentation(xml)
+        xml.sub!("<metanorma-collection>", "<metanorma-collection xmlns='http://metanorma.org'>")
+        # TODO BEING FORCED TO DO THAT BECAUSE SHALE IS NOT DEALING WITH DEFAULT NAMESPACES
+        @directives.detect { |d| d.key == "bilingual" } and
+          xml = Metanorma::Collection::Multilingual
+            .new({ align_cross_elements: %w(p note) }).to_bilingual(xml)
+        xml
+      end
+
       def concatenate_outputs(options)
         pres = File.join(@outdir, "collection.presentation.xml")
         options[:format].include?(:pdf) and pdfconv.convert(pres)
         options[:format].include?(:doc) and docconv_convert(pres)
+        @directives.detect { |d| d.key == "bilingual" } &&
+          options[:format].include?(:html) and
+          Metanorma::Collection::Multilingual.new(
+            { flavor: flavor.to_sym,
+              converter_options: PdfOptionsNode.new(flavor, @compile_options),
+              outdir: @outdir },
+          ).to_html(pres)
       end
 
       def concatenate1(out, ext)
-        out.directives << ::Metanorma::Collection::Config::Directive.new(key: "documents-inline")
+        out.directives << ::Metanorma::Collection::Config::Directive
+          .new(key: "documents-inline")
         out.bibdatas.each_key do |ident|
           id = @isodoc.docid_prefix(nil, ident.dup)
           @files.get(id, :attachment) || @files.get(id, :outputs).nil? and next
           out.documents[Util::key id] =
-            Metanorma::Collection::Document.raw_file(@files.get(id,
-                                                                :outputs)[ext])
+            Metanorma::Collection::Document
+              .raw_file(@files.get(id, :outputs)[ext])
         end
         out
       end
 
-      # infer the flavour from the first document identifier; relaton does that
-      def doctype
-        if (docid = @xml.at("//bibdata/docidentifier/@type")&.text)
-          dt = docid.downcase
-        elsif (docid = @xml.at("//bibdata/docidentifier")&.text)
-          dt = docid.sub(/\s.*$/, "").lowercase
-        else return "standoc"
-        end
-        @registry = Metanorma::Registry.instance
+      # TODO: infer flavor from publisher when available
+      def flavor
+        dt = @xml.at("//bibdata/ext/flavor")&.text or return "standoc"
         @registry.alias(dt.to_sym)&.to_s || dt
       end
 

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

@@ -0,0 +1,52 @@
+module Metanorma
+  class Collection
+    class Renderer
+      def svg_datauri(docxml, docid)
+        rel = @files.get(docid, :rel_path)
+        parent = @files.get(docid, :parentid) and
+          rel = @files.get(parent, :rel_path)
+        # if sectionsplit, use orig file dir
+        dir = File.join(@dirname, File.dirname(rel))
+        datauri_encode(docxml, dir)
+      end
+
+      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)
+        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) }
+      end
+
+      def svg_unnest(docxml)
+        docxml.xpath(ns("//svgmap//image[.//*[name() = 'image']]")).each do |i|
+          s = i.elements.detect { |e| e.name == "svg" } and
+            i.replace(s)
+        end
+        docxml
+      end
+
+      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 = presxml ? "fmt-link" : "link"
+        eref.elements&.remove
+      end
+    end
+  end
+end