metanorma 1.7.6 → 1.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f574203232cd03cda37b838dadb48b3c1b6a8f5c77e014baa361d520c7849690
-  data.tar.gz: d13191d73999401fc80e40eac105a1561d7275e423e86eb61a1c6bb29b660145
+  metadata.gz: 5d25e0a641fe7ce0087e3d06ebb5851e52a3c85924259e6cf39f731f378d7212
+  data.tar.gz: 5ae477f5ad66882bf1b22ee0f9511636c14f937d4f50eb9defa7c8122c874f7c
 SHA512:
-  metadata.gz: 128ccdcbb3366e183dce6e0e2de0a6b68be1275fd5d159ac4c6326daa3be1ceba039e810a65f569260d2315f8e1f295c0a524717b43acc88bafc02b076edf3f9
-  data.tar.gz: 01562ff056874fb738098f843952a80de45aa71d9bfac65b61209233b8942bb77ab3bc43fbc2572a74e87d68b8e8f9b0002f4a1643853be10d19ecc39206cce4
+  metadata.gz: 8375fbebae7cb30ae9775b5329c567274ad47cdfc40652f7cf35f00b3691629198dc3ee56c95f0c332b7edf63788ad0f2586ecb4305c18737bdbeed8c16bff91
+  data.tar.gz: 6e6f57ff7e26d519cfeea98daf8a027ff27fb39f02f0ac8928f2bfab01030fa866992172ef8f8f9ca7f666783afa2e878f412a4a79b7b9d62fbe86d9a2c8c2e7

data/lib/metanorma/collection.rb

@@ -39,7 +39,8 @@ module Metanorma
                                                @coverpage_style)
       @documents = args[:documents] || {}
       @bibdatas = args[:documents] || {}
-      if @documents.any? && !@directives.include?("documents-inline")
+      if (@documents.any? || @manifest) &&
+          (%w(documents-inline documents-external) & @directives).empty?
         @directives << "documents-inline"
       end
       @documents.merge! @manifest.documents(@dirname)

data/lib/metanorma/collection_fileparse.rb

@@ -1,18 +1,6 @@
 module Metanorma
   # XML collection renderer
   class CollectionRenderer
-    def update_bibitem(bib, identifier)
-      docid = get_bibitem_docid(bib, identifier) or return
-      newbib = dup_bibitem(docid, bib)
-      _file, url = @files
-        .targetfile_id(docid, relative: true, read: false,
-                              doc: !@files.get(docid, :attachment))
-      dest = newbib.at("./docidentifier") || newbib.at(ns("./docidentifier"))
-      dest or dest = newbib.elements[-1]
-      dest.previous = "<uri type='citation'>#{url}</uri>"
-      bib.replace(newbib)
-    end
-
     # Resolves references to other files in the collection. Three routines:
     # 1. Eref to a document that has been split into multiple documents
     # (sectionsplit) are resolved to direct eref to the split document
@@ -27,16 +15,23 @@ module Metanorma
     #   anchor to filename
     # @return [String] XML content
     def update_xrefs(file, docid, internal_refs)
+      xml, sso = update_xrefs_prep(file, docid)
+      @nested || sso or Metanorma::XrefProcess::xref_process(xml, xml, nil, docid, @isodoc)
+      @nested or update_indirect_refs_to_docs(xml, docid, internal_refs)
+      @files.add_document_suffix(docid, xml)
+      @nested or update_sectionsplit_refs_to_docs(xml, internal_refs)
+      update_direct_refs_to_docs(xml, docid)
+      hide_refs(xml)
+      sso and eref2link(xml)
+      svgmap_resolve(datauri_encode(xml), @files.get(docid, :ids))
+      xml.to_xml
+    end
+
+    def update_xrefs_prep(file, docid)
       docxml = file.is_a?(String) ? Nokogiri::XML(file, &:huge) : file
       supply_repo_ids(docxml)
-      @nested or update_indirect_refs_to_docs(docxml, docid, internal_refs)
-      @files.add_document_suffix(docid, docxml)
-      @nested or update_sectionsplit_refs_to_docs(docxml, internal_refs)
-      update_direct_refs_to_docs(docxml, docid)
-      hide_refs(docxml)
-      @files.get(docid, :sectionsplit_output) and eref2link(docxml)
-      svgmap_resolve(datauri_encode(docxml), @files.get(docid, :ids))
-      docxml.to_xml
+      sso = @files.get(docid, :sectionsplit_output)
+      [docxml, sso]
     end
 
     def update_sectionsplit_refs_to_docs(docxml, internal_refs)
@@ -72,7 +67,7 @@ module Metanorma
     def add_hidden_bibliography(xmldoc, refs)
       ins = new_hidden_ref(xmldoc)
       refs.each do |k, v|
-        _, url = @files.targetfile_id(v, {})
+        url = @files.url(v, {})
         ins << <<~XML
           <bibitem id="#{k}">
             <docidentifier type="repository">current-metanorma-collection/#{v}</docidentifier>
@@ -88,11 +83,11 @@ module Metanorma
       isodoc.eref2link(docxml)
     end
 
+    BIBITEM_NOT_REPO_XPATH = "//bibitem[not(ancestor::bibitem)]" \
+      "[not(./docidentifier[@type = 'repository'])]".freeze
+
     def supply_repo_ids(doc)
-      doc.xpath(
-        ns("//bibitem[not(ancestor::bibitem)]" \
-           "[not(./docidentifier[@type = 'repository'])]"),
-      ).each do |b|
+      doc.xpath(ns(BIBITEM_NOT_REPO_XPATH)).each do |b|
         b.xpath(ns("./docidentifier")).each do |docid|
           id = @isodoc.docid_prefix(docid["type"], docid.children.to_xml)
           @files.get(id) or next
@@ -163,8 +158,7 @@ module Metanorma
       internal_refs.each do |schema, ids|
         ids.each do |id, file|
           k = indirect_ref_key(schema, id, docxml)
-          update_indirect_refs_to_docs1(docxml, k,
-                                        file, bibitems, erefs)
+          update_indirect_refs_to_docs1(docxml, k, file, bibitems, erefs)
         end
       end
     end
@@ -179,8 +173,8 @@ module Metanorma
     def indirect_ref_key(schema, id, docxml)
       /^#{schema}_/.match?(id) and return id
       ret = "#{schema}_#{id}"
-      suffix = docxml.root['document_suffix']
-      (k = docxml.root["type"]) && k != schema && suffix and 
+      suffix = docxml.root["document_suffix"]
+      (k = docxml.root["type"]) && k != schema && suffix and
         ret = "#{ret}_#{suffix}"
       ret
     end
@@ -199,7 +193,9 @@ module Metanorma
       @files.get(file) && p = @files.get(file, :parentid) and
         suffix = "#{p}_#{suffix}"
       existing = a.text
-      anchor = Metanorma::Utils::to_ncname("#{existing}_#{suffix}")
+      anchor = existing
+      @files.url?(file) or
+        anchor = Metanorma::Utils::to_ncname("#{anchor}_#{suffix}")
       @updated_anchors[existing] or a.children = anchor
       @updated_anchors[anchor] = true
     end
@@ -230,15 +226,22 @@ module Metanorma
     def update_anchor_loc(bib, eref, docid)
       loc = eref.at(".//xmlns:locality[@type = 'anchor']") or
         return update_anchor_create_loc(bib, eref, docid)
-      @ncnames[docid] ||= Metanorma::Utils::to_ncname(docid)
       ref = loc.at("./xmlns:referenceFrom") or return
-      anchor = "#{ref.text}_#{@ncnames[docid]}"
-      @files.get(docid, :anchors).inject([]) do |m, (_, x)|
+      anchor = suffix_anchor(ref, docid)
+      a = @files.get(docid, :anchors) or return
+      a.inject([]) do |m, (_, x)|
         m += x.values
       end.include?(anchor) or return
       ref.content = anchor
     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
+    end
+
     # if there is a crossref to another document, with no anchor, retrieve the
     # anchor given the locality, and insert it into the crossref
     def update_anchor_create_loc(_bib, eref, docid)

data/lib/metanorma/collection_fileprocess.rb

@@ -134,7 +134,8 @@ module Metanorma
     end
 
     def locate_internal_refs1(refs, identifier, ident)
-      t = locate_internal_refs1_prep(ident)
+      file, = @files.targetfile_id(ident, read: true)
+      t = locate_internal_refs1_prep(file)
       refs.each do |schema, ids|
         ids.keys.select { |id| t[id] }.each do |id|
           t[id].at("./ancestor-or-self::*[@type = '#{schema}']") and
@@ -143,8 +144,7 @@ module Metanorma
       end
     end
 
-    def locate_internal_refs1_prep(ident)
-      file, = @files.targetfile_id(ident, read: true)
+    def locate_internal_refs1_prep(file)
       xml = Nokogiri::XML(file, &:huge)
       r = xml.root["document_suffix"]
       xml.xpath("//*[@id]").each_with_object({}) do |i, x|
@@ -153,5 +153,16 @@ module Metanorma
         r and x[i["id"].sub(/_#{r}$/, "")] = i
       end
     end
+
+    def update_bibitem(bib, identifier)
+      docid = get_bibitem_docid(bib, identifier) or return
+      newbib = dup_bibitem(docid, bib)
+      url = @files.url(docid, relative: true,
+                              doc: !@files.get(docid, :attachment))
+      dest = newbib.at("./docidentifier") || newbib.at(ns("./docidentifier"))
+      dest or dest = newbib.elements[-1]
+      dest.previous = "<uri type='citation'>#{url}</uri>"
+      bib.replace(newbib)
+    end
   end
 end

data/lib/metanorma/collection_manifest.rb

@@ -28,7 +28,7 @@ module Metanorma
           from_yaml m
         end
         docref = RelatonBib.array mnf["docref"]
-        new(mnf["level"], mnf["title"], docref, manifest)
+        new(mnf["level"], mnf["title"], parse_docrefs_yaml(docref), manifest)
       end
 
       # @param mnf [Nokogiri::XML::Element]
@@ -37,23 +37,44 @@ module Metanorma
         level = mnf.at("level").text
         title = mnf.at("title")&.text
         manifest = mnf.xpath("xmlns:manifest").map { |m| from_xml(m) }
-        new(level, title, parse_docref(mnf), manifest)
+        new(level, title, parse_docrefs_xml(mnf), manifest)
       end
 
       private
 
+      def parse_docrefs_yaml(docrefs)
+        docrefs.map do |dr|
+          h = {}
+          h["identifier"] = dr["identifier"] ||
+            UUIDTools::UUID.random_create.to_s
+          dr["manifest"] and h["manifest"] = from_yaml(dr["manifest"].first)
+          %w(fileref url attachment sectionsplit index presentation-xml).each do |k|
+            dr.has_key?(k) and h[k] = dr[k]
+          end
+          h
+        end
+      end
+
       # @param mnf [Nokogiri::XML::Element]
       # @return [Hash{String=>String}]
-      def parse_docref(mnf)
+      def parse_docrefs_xml(mnf)
         mnf.xpath("xmlns:docref").map do |dr|
-          h = { "identifier" => dr.at("identifier").children.to_xml }
-          %i(fileref attachment sectionsplit index).each do |s|
+          h = { "identifier" => parse_docrefs_xml_id(dr) }
+          %i(fileref url attachment sectionsplit index).each do |s|
             h[s.to_s] = dr[s] if dr[s]
           end
+          m = dr.at("manifest") and h["manifest"] = from_xml(m)
           h["presentation-xml"] = dr[:presentationxml] if dr[:presentationxml]
           h
         end
       end
+
+      def parse_docrefs_xml_id(docref)
+        if i = docref.at("identifier")
+          i.children.to_xml
+        else UUIDTools::UUID.random_create
+        end
+      end
     end
 
     # @param col [Metanorma::Collection]
@@ -66,23 +87,30 @@ module Metanorma
     # @return [Hash<String, Metanorma::Document>]
     def documents(dir = "")
       docs = @docref.each_with_object({}) do |dr, m|
-        dr["fileref"] or next m
-        m[Util::key dr["identifier"]] = Document.parse_file(
-          Util::rel_path_resolve(dir, dr["fileref"]),
-          dr["attachment"], dr["identifier"], dr["index"]
-        )
+        if dr["fileref"]
+          m[Util::key dr["identifier"]] = documents_add(dir, dr)
+        elsif dr["manifest"]
+          m.merge! dr["manifest"].documents(dir)
+        end
         m
       end
       @manifest.reduce(docs) { |mem, mnf| mem.merge mnf.documents(dir) }
     end
 
+    def documents_add(dir, docref)
+      Document.parse_file(
+        Util::rel_path_resolve(dir, docref["fileref"]),
+        docref["attachment"], docref["identifier"], docref["index"]
+      )
+    end
+
     # @param builder [Nokogiri::XML::Builder]
     def to_xml(builder)
       builder.manifest do |b|
         b.level @level
         b.title @title if @title
         docref_to_xml b
-        @manifest.each { |m| m.to_xml b }
+        @manifest&.each { |m| m.to_xml b }
       end
     end
 
@@ -97,7 +125,7 @@ module Metanorma
     def docref_by_id(docid)
       refs = docrefs
       dref = refs.detect { |k| k["identifier"] == docid }
-      dref || docrefs.detect { |k| /^#{k["identifier"]}/ =~ docid }
+      dref || docrefs.detect { |k| /^#{k['identifier']}/ =~ docid }
     end
 
     private
@@ -108,17 +136,18 @@ module Metanorma
       @docref.each do |dr|
         drf = builder.docref do |b|
           b.identifier { |i| i << dr["identifier"] }
-          !dr["attachment"] && !dr["sectionsplit"] &&
+          !dr["attachment"] && !dr["sectionsplit"] && @collection &&
             d = @collection.bibdatas[Util::key dr["identifier"]] and
             b.parent.add_child(d.bibitem.to_xml(bibdata: true))
+          m = dr["manifest"] and m.to_xml b
         end
         docref_to_xml_attrs(drf, dr)
       end
     end
 
     def docref_to_xml_attrs(elem, docref)
-      elem[:fileref] = @disambig.strip_root(docref["fileref"])
-      %i(attachment sectionsplit).each do |i|
+      f = docref["fileref"] and elem[:fileref] = @disambig.strip_root(f)
+      %i(attachment sectionsplit url).each do |i|
         elem[i] = docref[i.to_s] if docref[i.to_s]
       end
       elem[:index] = docref.has_key?("index") ? docref["index"] : "true"
@@ -128,11 +157,11 @@ module Metanorma
     end
 
     def docref_to_xml_attrs_id(elem, docref)
-      if collection.directives.include?("documents-inline")
+      if collection&.directives&.include?("documents-inline")
         id = collection.documents.find_index do |k, _|
           k == docref["identifier"]
         end
-        elem[:id] = format("doc%<index>09d", index: id)
+        id and elem[:id] = format("doc%<index>09d", index: id)
       end
     end
   end

data/lib/metanorma/collection_renderer.rb

@@ -162,6 +162,9 @@ module Metanorma
     # @param builder [Nokogiri::XML::Builder]
     def docrefs(elm, builder)
       elm.xpath(ns("./docref[@index = 'true']")).each do |d|
+        if m = d.at(ns("./manifest"))
+          builder << indexfile(m, ul: false)
+        else
         ident = docref_ident(d)
         builder.li do |li|
           li.a href: index_link(d, ident) do |a|
@@ -171,6 +174,7 @@ module Metanorma
           end
         end
       end
+      end
     end
 
     def docref_ident(docref)
@@ -189,8 +193,8 @@ module Metanorma
     #
     # @param elm [Nokogiri::XML::Element]
     # @return [String] XML
-    def indexfile(elm)
-      Nokogiri::HTML::Builder.new do |b|
+    def indexfile(elm, ul: true)
+      ret = Nokogiri::HTML::Builder.new do |b|
         b.ul do
           b.li indexfile_title(elm)
           indexfile_docref(elm, b)
@@ -198,7 +202,10 @@ module Metanorma
             b << indexfile(d)
           end
         end
-      end.doc.root.to_html
+      end
+      ret = ret.doc.root
+      ul or ret = ret.children
+        ret.to_html
     end
 
     # object to construct navigation out of in Liquid

data/lib/metanorma/collection_xref_process.rb

@@ -0,0 +1,217 @@
+module Metanorma
+  module XrefProcess
+    class << self
+      def xref_preprocess(xml, isodoc)
+        @isodoc = isodoc
+        key = (0...8).map { rand(65..90).chr }.join # random string
+        xml.root["type"] = key # to force recognition of internal refs
+        # bookmarks etc as new id elements introduced in Presentation XML:
+        # add doc suffix
+        Metanorma::Utils::anchor_attributes.each do |(tag_name, attribute_name)|
+          Util::add_suffix_to_attributes(xml, xml.root["document_suffix"],
+                                         tag_name, attribute_name, isodoc)
+        end
+        key
+      end
+
+      def ns(xpath)
+        @isodoc.ns(xpath)
+      end
+
+      def xref_process(section, xml, key, ident, isodoc)
+        @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)
+        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)
+        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)
+        end
+        xml
+      end
+
+      def svgmap_wrap(svg)
+        ret = svg.at("./ancestor::xmlns:svgmap") and return ret
+        ret = svg.at("./ancestor::xmlns:figure")
+        ret.wrap("<svgmap/>")
+        svg.at("./ancestor::xmlns:svgmap")
+      end
+
+      def svg_xrefs(svg, svgmap, suffix)
+        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>"
+        end
+      end
+
+      def make_anchor(elem, anchor)
+        elem.at(ns("./localityStack | ./locality")) and return
+        elem.text.strip.empty? and elem << anchor
+        elem <<
+          "<localityStack><locality type='anchor'><referenceFrom>" \
+            "#{anchor}</referenceFrom></locality></localityStack>"
+      end
+
+      def xref_to_internal_eref(section, xml, key)
+        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|
+          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"])
+        end.keys
+      end
+
+      def xref_to_internal_eref_prep(section, xml)
+        bibitems = Util::gather_bibitems(section)
+        indirect_bibitems = Util::gather_bibitems(xml)
+          .select { |_, v| indirect_bib?(v) }
+        [bibitems, indirect_bibitems]
+      end
+
+      def xref_to_internal_eref_anchor(xref, key, bibitems, document_suffix)
+        t = xref["target"]
+        if d = bibitems[t]&.at(ns("./docidentifier[@type = 'repository']"))
+          m = %r{^([^/]+)}.match(d.text) and
+            t.sub!(%r(#{m[0]}_), "")
+        end
+        key and t.sub!(%r{^#{key}_}, "")
+        make_anchor(xref, t.sub(%r(_#{document_suffix}$), ""))
+        xref.delete("target")
+        xref.name = "eref"
+      end
+
+      def xref_prefix_key(xref, key, indirect)
+        if b = indirect[xref["target"]]
+          t = b.at(ns("./docidentifier[@type = 'repository']"))
+          xref["type"] = t.text.sub(%r{/.*$}, "")
+        elsif key
+          xref["target"] = "#{key}_#{xref['target']}"
+          xref["type"] = key
+        end
+      end
+
+      def eref_to_internal_eref(section, xml, key)
+        bibitems, indirect, bibids = eref_to_internal_eref_prep(section, xml)
+        eref_to_internal_eref_select(section, xml, bibitems)
+          .each_with_object([]) do |x, m|
+            url = bibitems[x]&.at(ns("./uri[@type = 'citation']"))&.text
+            bibids[x]&.each do |e|
+              e.at(ns("./localityStack | ./locality")) and next
+              id = eref_to_internal_eref1(e, key, url, indirect) and m << id
+            end
+          end
+      end
+
+      def eref_to_internal_eref_prep(section, xml)
+        bibitems = Util::gather_bibitems(xml)
+          .delete_if { |_, v| internal_bib?(v) }
+        indirect = Util::gather_bibitems(xml)
+          .select { |_, v| indirect_bib?(v) }
+        bibitemids = Util::gather_bibitemids(section)
+        [bibitems, indirect, bibitemids]
+      end
+
+      def eref_to_internal_eref1(elem, key, url, indirect)
+        if url
+          elem.name = "link"
+          elem["target"] = url
+          nil
+        elsif !indirect[elem["bibitemid"]]
+          nil
+        else
+          eref_to_internal_eref1_internal(elem, key, indirect)
+        end
+      end
+
+      def eref_to_internal_eref1_internal(elem, key, indirect)
+        t = elem["bibitemid"]
+        if key
+          t = "#{key}_#{t}"
+          elem["type"] = key
+        elsif d = indirect[t]&.at(ns("./docidentifier[@type = 'repository']"))
+          m = %r{^([^/]+)}.match(d.text) and
+            t.sub!(%r(#{m[0]}_), "")
+        end
+        make_anchor(elem, t)
+        elem["bibitemid"]
+      end
+
+      def eref_to_internal_eref_select(section, _xml, bibitems)
+        refs = Util::gather_bibitemids(section).keys
+        refs.uniq.reject do |x|
+          b = bibitems[x] and (indirect_bib?(b) || internal_bib?(b))
+        end
+      end
+
+      def internal_bib?(bibitem)
+        bibitem["type"] == "internal" ||
+          bibitem.at(ns("./docidentifier[@type = 'repository']"))
+      end
+
+      def indirect_bib?(bibitem)
+        a = bibitem.at(ns("./docidentifier[@type = 'repository']")) or
+          return false
+        %r{^current-metanorma-collection/}.match?(a.text) and return false
+        a.text.include?("/")
+      end
+
+      # from standoc
+      def new_hidden_ref(xmldoc)
+        ins = xmldoc.at("bibliography") or
+          xmldoc.root << "<bibliography/>" and ins = xmldoc.at("bibliography")
+        ins.add_child("<references hidden='true' normative='false'/>").first
+      end
+
+      def copy_repo_items_biblio(ins, section, xml)
+        bibitems = Util::gather_bibitems(section)
+        xml.xpath(ns("//references/bibitem[docidentifier/@type = 'repository']"))
+          .each_with_object([]) do |b, m|
+            bibitems[b["id"]] or next
+            # section.at("//*[@bibitemid = '#{b['id']}']") or next
+            ins << b.dup
+            m << b["id"]
+          end
+      end
+
+      def insert_indirect_biblio(ins, refs, key, xml)
+        refs.empty? and return
+        internal_bibitems, external_bibitems = insert_indirect_biblio_prep(xml)
+        refs.compact.reject do |x|
+          # external_bibitems[x.sub(/^#{key}_/, "")]
+        end.each do |x|
+          ins << if b = internal_bibitems[x.sub(/^#{key}_/, "")]
+                   b.dup.tap { |m| m["id"] = x }
+                 else new_indirect_bibitem(x, key)
+                 end
+        end
+      end
+
+      def insert_indirect_biblio_prep(xml)
+        bibitems = Util::gather_bibitems(xml)
+        internal_bibitems = bibitems.select { |_, v| internal_bib?(v) }
+        external_bibitems = bibitems.reject { |_, v| internal_bib?(v) }
+        [internal_bibitems, external_bibitems]
+      end
+
+      def new_indirect_bibitem(ident, prefix)
+        <<~BIBENTRY
+          <bibitem id="#{ident}" type="internal">
+          <docidentifier type="repository">#{ident.sub(/^#{prefix}_/, "#{prefix}/")}</docidentifier>
+          </bibitem>
+        BIBENTRY
+      end
+    end
+  end
+end

data/lib/metanorma/compile_validate.rb

@@ -35,7 +35,7 @@ module Metanorma
 
     private
 
-    STDTYPE2FLAVOR = { plateau: "jis" }.freeze
+    STDTYPE2FLAVOR = { }.freeze
 
     def stdtype2flavor(stdtype)
       flavor = STDTYPE2FLAVOR[stdtype] || stdtype

data/lib/metanorma/files_lookup.rb

@@ -33,7 +33,7 @@ module Metanorma
     def read_file(docref)
       ident = docref.at(ns("./identifier"))
       i = key(@isodoc.docid_prefix(ident["type"], ident.children.to_xml))
-      entry = file_entry(docref, ident.children.to_xml)
+      entry = file_entry(docref, ident.children.to_xml) or return
       bibdata_process(entry, i)
       bibitem_process(entry)
       @files[i] = entry
@@ -64,11 +64,12 @@ module Metanorma
     # the working directory (../../...) truncated
     # identifier is the id with only spaces, no nbsp
     def file_entry(ref, identifier)
+      ref["fileref"] or return
       out = ref["attachment"] ? ref["fileref"] : File.basename(ref["fileref"])
       out1 = @disambig.source2dest_filename(out)
       ret = if ref["fileref"]
               { type: "fileref", ref: @documents[Util::key identifier].file,
-                rel_path: ref["fileref"],
+                rel_path: ref["fileref"], url: ref["url"],
                 out_path: out1 } # @disambig.source2dest_filename(out) }
             else { type: "id", ref: ref["id"] }
             end
@@ -77,7 +78,7 @@ module Metanorma
     end
 
     def file_entry_copy(ref, ret)
-      %w(attachment sectionsplit index presentation-xml
+      %w(attachment sectionsplit index presentation-xml url
          bare-after-first).each do |s|
         ret[s.gsub("-", "").to_sym] = ref[s] if ref[s]
       end
@@ -102,6 +103,21 @@ module Metanorma
       end
     end
 
+    # return citation url for file
+    # @param doc [Boolean] I am a Metanorma document,
+    # so my URL should end with html or pdf or whatever
+    def url(ident, options)
+      data = get(ident)
+      data[:url] || targetfile(data, options)[1]
+    end
+
+    # are references to the file to be linked to a file in the collection,
+    # or externally? Determines whether file suffix anchors are to be used
+    def url?(ident)
+      data = get(ident) or return false
+      data[:url]
+    end
+
     # return file contents + output filename for each file in the collection,
     # given a docref entry
     # @param data [Hash] docref entry

data/lib/metanorma/sectionsplit.rb

@@ -1,6 +1,6 @@
 require "yaml"
 require_relative "util"
-require_relative "sectionsplit_links"
+require_relative "collection_xref_process"
 
 module Metanorma
   class Sectionsplit
@@ -68,7 +68,7 @@ module Metanorma
     # def sectionsplit(filename, basename, dir, compile_options, fileslookup = nil, ident = nil)
     def sectionsplit
       xml = sectionsplit_prep(File.read(@input_filename), @base, @dir)
-      @key = xref_preprocess(xml, @fileslookup, @ident)
+      @key = Metanorma::XrefProcess::xref_preprocess(xml, @isodoc)
       SPLITSECTIONS.each_with_object([]) do |n, ret|
         conflate_floatingtitles(xml.xpath(ns(n[0]))).each do |s|
           ret << sectionfile(xml, emptydoc(xml), "#{@base}.#{ret.size}", s,
@@ -151,7 +151,7 @@ module Metanorma
     def create_sectionfile(xml, out, file, chunks, parentnode)
       ins = out.at(ns("//metanorma-extension")) || out.at(ns("//bibdata"))
       sectionfile_insert(ins, chunks, parentnode)
-      xref_process(out, xml, @key)
+      Metanorma::XrefProcess::xref_process(out, xml, @key, @ident, @isodoc)
       outname = "#{file}.xml"
       File.open(File.join(@splitdir, outname), "w:UTF-8") do |f|
         f.write(out)

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "1.7.6".freeze
+  VERSION = "1.7.7".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 1.7.6
+  version: 1.7.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-22 00:00:00.000000000 Z
+date: 2024-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -265,7 +265,6 @@ files:
 - CHANGELOG.adoc
 - CODE_OF_CONDUCT.md
 - Gemfile
-- Gemfile.devel
 - LICENSE.txt
 - README.adoc
 - lib/metanorma.rb
@@ -278,6 +277,7 @@ files:
 - lib/metanorma/collection_render_utils.rb
 - lib/metanorma/collection_render_word.rb
 - lib/metanorma/collection_renderer.rb
+- lib/metanorma/collection_xref_process.rb
 - lib/metanorma/compile.rb
 - lib/metanorma/compile_options.rb
 - lib/metanorma/compile_validate.rb
@@ -293,7 +293,6 @@ files:
 - lib/metanorma/processor.rb
 - lib/metanorma/registry.rb
 - lib/metanorma/sectionsplit.rb
-- lib/metanorma/sectionsplit_links.rb
 - lib/metanorma/util.rb
 - lib/metanorma/version.rb
 - lib/metanorma/worker_pool.rb
@@ -317,7 +316,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.3.27
 signing_key: 
 specification_version: 4
 summary: Metanorma is the standard of standards; the metanorma gem allows you to create

data/Gemfile.devel

@@ -1,2 +0,0 @@
-gem "metanorma-cli"
-gem "isodoc", git: "https://github.com/metanorma/isodoc", branch: "main"

data/lib/metanorma/sectionsplit_links.rb

@@ -1,189 +0,0 @@
-module Metanorma
-  class Sectionsplit
-    def xref_preprocess(xml, _fileslookup, _identifier)
-      key = (0...8).map { rand(65..90).chr }.join # random string
-      xml.root["type"] = key # to force recognition of internal refs
-      # bookmarks etc as new id elements introduced in Presentation XML:
-      # add doc suffix
-      Metanorma::Utils::anchor_attributes.each do |(tag_name, attribute_name)|
-        Util::add_suffix_to_attributes(xml, xml.root["document_suffix"],
-                                       tag_name, attribute_name, @isodoc)
-      end
-      key
-    end
-
-    def xref_process(section, xml, key)
-      svg_preprocess(section, Metanorma::Utils::to_ncname(@ident))
-      refs = eref_to_internal_eref(section, xml, key)
-      refs += xref_to_internal_eref(section, xml, key)
-      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)
-      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)
-      end
-      xml
-    end
-
-    def svgmap_wrap(svg)
-      ret = svg.at("./ancestor::xmlns:svgmap") and return ret
-      ret = svg.at("./ancestor::xmlns:figure")
-      ret.wrap("<svgmap/>")
-      svg.at("./ancestor::xmlns:svgmap")
-    end
-
-    def svg_xrefs(svg, svgmap, suffix)
-      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>"
-      end
-    end
-
-    def make_anchor(anchor)
-      "<localityStack><locality type='anchor'><referenceFrom>" \
-        "#{anchor}</referenceFrom></locality></localityStack>"
-    end
-
-    def xref_to_internal_eref(section, xml, key)
-      bibitems, indirect = xref_to_internal_eref_prep(section, xml)
-      section.xpath(ns("//xref")).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"])
-      end.keys
-    end
-
-    def xref_to_internal_eref_prep(section, xml)
-      bibitems = Util::gather_bibitems(section)
-      indirect_bibitems = Util::gather_bibitems(xml)
-        .select { |_, v| indirect_bib?(v) }
-      [bibitems, indirect_bibitems]
-    end
-
-    def xref_to_internal_eref_anchor(xref, key, bibitems, document_suffix)
-      t = xref["target"]
-      if d = bibitems[t]&.at(ns("./docidentifier[@type = 'repository']"))
-        m = %r{^([^/]+)}.match(d.text) and
-          t.sub!(%r(#{m[0]}_), "")
-      end
-      t.sub!(%r{^#{key}_}, "")
-      xref << make_anchor(t.sub(%r(_#{document_suffix}$), ""))
-      xref.delete("target")
-      xref.name = "eref"
-    end
-
-    def xref_prefix_key(xref, key, indirect)
-      if b = indirect[xref["target"]]
-        t = b.at(ns("./docidentifier[@type = 'repository']"))
-        xref["type"] = t.text.sub(%r{/.*$}, "")
-      else
-        xref["target"] = "#{key}_#{xref['target']}"
-        xref["type"] = key
-      end
-    end
-
-    def eref_to_internal_eref(section, xml, key)
-      bibitems, bibitemids = eref_to_internal_eref_prep(section, xml)
-      eref_to_internal_eref_select(section, xml, bibitems)
-        .each_with_object([]) do |x, m|
-          url = bibitems[x]&.at(ns("./uri[@type = 'citation']"))
-          bibitemids[x]&.each do |e|
-            id = eref_to_internal_eref1(e, key, url) and m << id
-          end
-        end
-    end
-
-    def eref_to_internal_eref_prep(section, xml)
-      bibitems = Util::gather_bibitems(xml)
-        .delete_if { |_, v| internal_bib?(v) }
-      bibitemids = Util::gather_bibitemids(section)
-      [bibitems, bibitemids]
-    end
-
-    def eref_to_internal_eref1(elem, key, url)
-      if url
-        elem.name = "link"
-        elem["target"] = url
-        nil
-      else
-        elem["bibitemid"] = "#{key}_#{elem['bibitemid']}"
-        elem << make_anchor(elem["bibitemid"])
-        elem["type"] = key
-        elem["bibitemid"]
-      end
-    end
-
-    def eref_to_internal_eref_select(section, _xml, bibitems)
-      refs = Util::gather_bibitemids(section).keys
-      refs.uniq.reject do |x|
-        b = bibitems[x] and ( indirect_bib?(b) || internal_bib?(b) )
-      end
-    end
-
-    def internal_bib?(bibitem)
-      bibitem["type"] == "internal" ||
-        bibitem.at(ns("./docidentifier[@type = 'repository']"))
-    end
-
-    def indirect_bib?(bibitem)
-      a = bibitem.at(ns("./docidentifier[@type = 'repository']")) or
-        return false
-      %r{^current-metanorma-collection/}.match?(a.text) and return false
-      a.text.include?("/")
-    end
-
-    # from standoc
-    def new_hidden_ref(xmldoc)
-      ins = xmldoc.at("bibliography") or
-        xmldoc.root << "<bibliography/>" and ins = xmldoc.at("bibliography")
-      ins.add_child("<references hidden='true' normative='false'/>").first
-    end
-
-    def copy_repo_items_biblio(ins, section, xml)
-      bibitems = Util::gather_bibitems(section)
-      xml.xpath(ns("//references/bibitem[docidentifier/@type = 'repository']"))
-        .each_with_object([]) do |b, m|
-          bibitems[b["id"]] or next
-          # section.at("//*[@bibitemid = '#{b['id']}']") or next
-          ins << b.dup
-          m << b["id"]
-        end
-    end
-
-    def insert_indirect_biblio(ins, refs, key, xml)
-      refs.empty? and return
-      internal_bibitems, external_bibitems = insert_indirect_biblio_prep(xml)
-      refs.compact.reject do |x|
-        #external_bibitems[x.sub(/^#{key}_/, "")]
-      end.each do |x|
-        ins << if b = internal_bibitems[x.sub(/^#{key}_/, "")]
-                 b.dup.tap { |m| m["id"] = x }
-               else new_indirect_bibitem(x, key)
-               end
-      end
-    end
-
-    def insert_indirect_biblio_prep(xml)
-      bibitems = Util::gather_bibitems(xml)
-      internal_bibitems = bibitems.select { |_, v| internal_bib?(v) }
-      external_bibitems = bibitems.reject { |_, v| internal_bib?(v) }
-      [internal_bibitems, external_bibitems]
-    end
-
-    def new_indirect_bibitem(ident, prefix)
-      <<~BIBENTRY
-        <bibitem id="#{ident}" type="internal">
-        <docidentifier type="repository">#{ident.sub(/^#{prefix}_/, "#{prefix}/")}</docidentifier>
-        </bibitem>
-      BIBENTRY
-    end
-  end
-end