metanorma 2.0.6 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f27c1f604a729b827832e208b2ca5db54b8db3f5b3f69fe905e0f0ae87a08f53
-  data.tar.gz: 781c8396a4c325a34c456ba935e40aba94d4062b283b475cf1bc381aa4ead712
+  metadata.gz: 6cf068df8203ed463672bcbef38ca1f5f1483ac2e08c9c37ee2236777dc86fad
+  data.tar.gz: 67c17ad923912cdf66f69b539691525a60751725e8f3d918fca5030d858661c7
 SHA512:
-  metadata.gz: 8305b0f43fec6a78fc64b2d79fde688d829bacb3e4ce772d14a6c68ceaa71141a6948c4d7c1d6a358f21c4e86e601f44c4e6411a0e5c7c2522a0a8fed71856f1
-  data.tar.gz: 6d9418c471d3966f00796dd0840cf33400188e93e61585b0b777cc31db70d020b92cd7f89f00754734a5331db29600ec4955b2b52bc86d62da3c11c98f71b45d
+  metadata.gz: b33588bb9dbd2f0e63c7438bf3739e3c46698be76566d4430658f12284c8221bd0c2532ae86318dcae0a4b1df90e7e270b12405e120bdd076ee18e4f85933820
+  data.tar.gz: 186204d57aa31ab72ea3454ea5e20b9d7b3506bcbe501c6e0c44312e22d26e83cfd1fd7b355ac3358b15cba24d234c55cbd2af369343974a34ac7cfef262c3a6

data/lib/metanorma/collection/collection.rb

@@ -28,16 +28,20 @@ module Metanorma
     def initialize(**args)
       @file = args[:file]
       @dirname = File.expand_path(File.dirname(@file)) # feeds @manifest
-      @documents = args[:documents] || {} # feeds initialize_directives
+      @documents = args[:documents] || {} # feeds initialize_directives, initialize_docs
       @bibdatas = args[:documents] || {}
       initialize_vars
       initialize_config(args[:config])
       initialize_directives
+      initialize_docs
+      validate_flavor(flavor)
+    end
+
+    def initialize_docs
       @documents.merge! @manifest.documents
       @bibdatas.merge! @manifest.documents
       @documents.transform_keys { |k| Util::key(k) }
       @bibdatas.transform_keys { |k| Util::key(k) }
-      validate_flavor(flavor)
     end
 
     def initialize_vars
@@ -54,6 +58,8 @@ module Metanorma
       @final = config.final_content
       @manifest = ::Metanorma::Collection::Manifest
         .new(config.manifest, self, @dirname) # feeds initialize_directives
+      @format = config.format.map(&:to_sym)
+      @format&.empty? and @format = nil
     end
 
     def initialize_directives
@@ -88,7 +94,9 @@ module Metanorma
     end
 
     def render(opts)
-      opts[:format].nil? || opts[:format].empty? and opts[:format] = [:html]
+      if opts[:format].nil? || opts[:format].empty?
+        opts[:format] = @format || [:html]
+      end
       opts[:log] = @log
       opts[:flavor] = @flavor
       ::Metanorma::Collection::Renderer.render self, opts

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

@@ -44,7 +44,7 @@ module Metanorma
 
         xml do
           root "entry"
-          map_attribute "id", to: :id
+          map_attribute "target", to: :id
           map_attribute "attachment", to: :attachment
           map_attribute "sectionsplit", to: :sectionsplit
           map_attribute "index", to: :index
@@ -55,7 +55,7 @@ module Metanorma
           map_element "title", to: :title
           map_element "bibdata", using: { from: :bibdata_from_xml,
                                           to: :bibdata_to_xml }
-          map_element "entry", to: :entry # using: { from: :entry_from_xml, to: :entry_to_xml }
+          map_element "entry", to: :entry
         end
 
         def entry_from_xml(model, node)

data/lib/metanorma/collection/filelookup/filelookup.rb

@@ -62,12 +62,24 @@ module Metanorma
           file, _filename = targetfile(entry, read: true)
           xml = Nokogiri::XML(file, &:huge)
           add_document_suffix(ident, xml)
-          entry.merge!(anchors: read_anchors(xml), ids: read_ids(xml),
-                       bibdata: xml.at(ns("//bibdata")),
-                       document_suffix: xml.root["document_suffix"])
+          entry.merge!(bibdata_extract(xml))
         end
       end
 
+      def anchors_lookup(anchors)
+        anchors.values.each_with_object({}) do |v, m|
+          v.each_value { |v1| m[v1] = true }
+        end
+      end
+
+      def bibdata_extract(xml)
+        anchors = read_anchors(xml)
+        { anchors: anchors, anchors_lookup: anchors_lookup(anchors),
+          ids: read_ids(xml),
+          bibdata: xml.at(ns("//bibdata")),
+          document_suffix: xml.root["document_suffix"] }
+      end
+
       def bibitem_process(entry)
         entry[:bibitem] = entry[:bibdata].dup
         entry[:bibitem].name = "bibitem"
@@ -76,7 +88,7 @@ module Metanorma
       end
 
       # ref is the absolute source file address
-      # rel_path is the relative source file address, relative to the YAML locaton
+      # rel_path is the relative source file address, relative to the YAML location
       # out_path is the destination file address, with any references outside
       # the working directory (../../...) truncated, and based on relative path
       # identifier is the id with only spaces, no nbsp

data/lib/metanorma/collection/filelookup/filelookup_sectionsplit.rb

@@ -1,4 +1,5 @@
 require_relative "../sectionsplit/sectionsplit"
+# require "concurrent-ruby"
 
 module Metanorma
   class Collection
@@ -16,13 +17,25 @@ module Metanorma
 
       def process_section_split_instance(key, manifest)
         s, sectionsplit_manifest = sectionsplit(key)
+        # section_split_instance_threads(s, manifest, key)
         s.each_with_index do |f1, i|
           add_section_split_instance(f1, manifest, key, i)
         end
         a = add_section_split_attachments(sectionsplit_manifest, key) and
           manifest["#{key}:attachments"] = a
-        manifest["#{key}:index.html"] =
-          add_section_split_cover(sectionsplit_manifest, key)
+        add_section_split_cover(manifest, sectionsplit_manifest, key)
+      end
+
+      def section_split_instance_threads(s, manifest, key)
+        @mutex = Mutex.new
+        pool = Concurrent::FixedThreadPool.new(4)
+        s.each_with_index do |f1, i|
+          pool.post do
+            add_section_split_instance(f1, manifest, key, i)
+          end
+        end
+        pool.shutdown
+        pool.wait_for_termination
       end
 
       def cleanup_section_split_instance(key, manifest)
@@ -31,24 +44,34 @@ module Metanorma
         @files[key][:indirect_key] = @sectionsplit.key
       end
 
-      def add_section_split_cover(manifest, ident)
+      def add_section_split_cover(manifest, sectionsplit_manifest, ident)
         cover = @sectionsplit
-          .section_split_cover(manifest, @parent.dir_name_cleanse(ident),
+          .section_split_cover(sectionsplit_manifest,
+                               @parent.dir_name_cleanse(ident),
                                one_doc_collection?)
         @files[ident][:out_path] = cover
-        { attachment: true, index: false, out_path: cover,
-          ref: File.join(File.dirname(manifest.file), cover) }
+        src = File.join(File.dirname(sectionsplit_manifest.file), cover)
+        m = { attachment: true, index: false, out_path: cover, ref: src }
+        manifest["#{ident}:index.html"] = m
+        one_doc_collection? and
+          add_cover_one_doc_coll(manifest, sectionsplit_manifest, ident, m)
+      end
+
+      def add_cover_one_doc_coll(manifest, sectionsplit_manifest, key, entry)
+        idx = File.join(File.dirname(sectionsplit_manifest.file), "index.html")
+        FileUtils.cp entry[:ref], idx
+        manifest["#{key}:index1.html"] =
+          entry.merge(out_path: "index.html", ref: idx)
       end
 
       def one_doc_collection?
-        return false
         docs = 0
         @files.each_value do |v|
           v[:attachment] and next
           v[:presentationxml] and next
           docs += 1
         end
-        docs > 1
+        docs <= 1
       end
 
       def add_section_split_attachments(manifest, ident)
@@ -62,15 +85,16 @@ module Metanorma
 
       def add_section_split_instance(file, manifest, key, idx)
         presfile, newkey, xml = add_section_split_instance_prep(file, key)
-        manifest[newkey] =
-          { parentid: key, presentationxml: true, type: "fileref",
-            rel_path: file[:url], out_path: File.basename(file[:url]),
-            anchors: read_anchors(xml), ids: read_ids(xml),
-            sectionsplit_output: true,
-            bibdata: @files[key][:bibdata], ref: presfile }
+        anchors = read_anchors(xml)
+        m = { parentid: key, presentationxml: true, type: "fileref",
+              rel_path: file[:url], out_path: File.basename(file[:url]),
+              anchors: anchors, anchors_lookup: anchors_lookup(anchors),
+              ids: read_ids(xml),
+              sectionsplit_output: true, indirect_key: @sectionsplit.key,
+              bibdata: @files[key][:bibdata], ref: presfile }
+        m[:bare] = true unless idx.zero?
+        manifest[newkey] = m
         @files_to_delete << file[:url]
-        manifest[newkey][:indirect_key] = @sectionsplit.key
-        manifest[newkey][:bare] = true unless idx.zero?
       end
 
       def add_section_split_instance_prep(file, key)

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

@@ -19,6 +19,7 @@ module Metanorma
         @nested || sso or
           Metanorma::Collection::XrefProcess::xref_process(xml, xml, nil, docid,
                                                            @isodoc)
+        @ncnames = {}
         @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)
@@ -49,9 +50,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,12 +62,6 @@ module Metanorma
         doclist
       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
 
@@ -79,64 +76,37 @@ module Metanorma
         end
       end
 
-      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)
-        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)
-        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)
-        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.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)
+        erefs, erefs_no_anchor, anchors, erefs1 =
+          update_direct_refs_to_docs_prep(docxml)
         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
 
+      # Hash(docid) of arrays
       def update_direct_refs_to_docs_prep(docxml)
-        @ncnames = {}
-        [Util::gather_citeases(docxml), Util::gather_bibitemids(docxml)]
+        erefs = Util::gather_citeases(docxml)
+        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
+        [erefs, no_anchor, anchors, Util::gather_bibitemids(docxml)]
       end
 
       # strip erefs if they are repository erefs, but do not point to a document
@@ -155,56 +125,78 @@ 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)
+        bib, erefs, doc_suffix, doc_type, f = update_indirect_refs_prep(docxml)
         internal_refs.each do |schema, ids|
-          s = "#{schema}_"
+          add_suffix = doc_suffix && doc_type && doc_type != schema
           ids.each do |id, file|
-            k = indirect_ref_key(s, 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)
         @updated_anchors = {}
-        [Util::gather_bibitems(docxml), Util::gather_bibitemids(docxml)]
+        @indirect_keys = {}
+        [Util::gather_bibitems(docxml), Util::gather_bibitemids(docxml),
+         docxml.root["document_suffix"], docxml.root["type"], {}]
+      end
+
+      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}"
+        doc_suffix && doc_type && doc_type != schema and
+          ret = "#{ret}_#{doc_suffix}"
+        @indirect_keys[key] = ret
+        ret
       end
 
-      def indirect_ref_key(schema_, schema, id, docxml)
-        /^#{schema_}/.match?(id) and return id
-        ret = schema_ + id
-        suffix = docxml.root["document_suffix"] or return ret
-        (k = docxml.root["type"]) && k != schema or return ret
-        "#{ret}_#{suffix}"
+      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
 
-      #OLD
-      def indirect_ref_key1(schema, id, docxml)
+      def indirect_ref_keyx(schema, id, doc_suffix, doc_type)
         /^#{schema}_/.match?(id) and return id
         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}"
         ret
       end
 
-      def update_indirect_refs_to_docs1(_docxml, key, file, bibitems, erefs)
+      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
@@ -216,55 +208,36 @@ module Metanorma
           "<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_anchor_loc(bib, eref, docid)
-        loc = eref.at(".//xmlns:locality[@type = 'anchor']") or
-          return update_anchor_create_loc(bib, eref, docid)
-        a = @files.get(docid, :anchors) or return
-        ref = loc.elements&.first or return
-        anchor = suffix_anchor(ref.text, docid)
-        a.values.detect { |x| x.value?(anchor) } or return
-        ref.content = anchor
-      end
-
-      #OLD
-      def update_anchor_loc1(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_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 suffix_anchor(ref, docid)
-        @ncnames[docid] ||= "#{Metanorma::Utils::to_ncname(docid)}_"
-        @files.url?(docid) or return ref
-        @ncnames[docid] + ref
+      def update_anchors_prep(docid)
+        @concat_anchors = {}
+        [@files.get(docid)&.key?(:anchors_lookup), @files.url?(docid),
+         Metanorma::Utils::to_ncname(docid)]
       end
 
-      #OLD
-       def suffix_anchor1(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
@@ -276,7 +249,7 @@ module Metanorma
         ref = ins.at(ns("./locality/referenceFrom"))&.text
         a = @files.get(docid, :anchors).dig(type, ref) or return
         ins << "<locality type='anchor'><referenceFrom>#{a.sub(/^_/, '')}" \
-               "</referenceFrom></locality>"
+          "</referenceFrom></locality>"
       end
     end
   end

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

@@ -8,6 +8,7 @@ require_relative "../multilingual/multilingual"
 require_relative "utils"
 require_relative "render_word"
 require_relative "navigation"
+require_relative "svg"
 
 module Metanorma
   class Collection
@@ -74,6 +75,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) }

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

@@ -0,0 +1,44 @@
+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)
+        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)
+        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)
+        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.elements&.remove
+      end
+    end
+  end
+end

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

@@ -203,6 +203,22 @@ module Metanorma
         end.doc.root.to_html
       end
 
+      def eref2link(docxml)
+        isodoc = IsoDoc::PresentationXMLConvert.new({})
+        isodoc.bibitem_lookup(docxml)
+        isodoc.eref2link(docxml)
+      end
+
+      def error_anchor(erefs, docid)
+        erefs.each do |e|
+          msg = "<strong>** Unresolved reference to document #{docid} " \
+            "from eref</strong>"
+          e << msg
+          strip_eref(e)
+          @log&.add("Cross-References", e, msg)
+        end
+      end
+
       def ns(xpath)
         @isodoc.ns(xpath)
       end

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

@@ -76,22 +76,22 @@ module Metanorma
         File.basename(ret)
       end
 
-      def section_split_cover(col, ident, _one_doc_coll)
+      def section_split_cover(col, ident, one_doc_coll)
         dir = File.dirname(col.file)
         collection_setup(nil, dir)
         r = ::Metanorma::Collection::Renderer
           .new(col, dir, output_folder: "#{ident}_collection",
-                         format: %i(html), coverpage: File.join(dir, "cover.html"))
+                         format: %i(html),
+                         coverpage: File.join(dir, "cover.html"))
         r.coverpage
-        section_split_cover1(ident, r, dir, _one_doc_coll)
+        section_split_cover1(ident, r, dir, one_doc_coll)
       end
 
       def section_split_cover1(ident, renderer, dir, _one_doc_coll)
-        # filename = one_doc_coll ? "#{ident}_index.html" : "index.html"
         filename = File.basename("#{ident}_index.html")
         # ident can be a directory with YAML indirection
-        FileUtils.mv File.join(renderer.outdir, "index.html"),
-                     File.join(dir, filename)
+        dest = File.join(dir, filename)
+        FileUtils.mv File.join(renderer.outdir, "index.html"), dest
         FileUtils.rm_rf renderer.outdir
         filename
       end

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

@@ -2,6 +2,7 @@ require "yaml"
 require_relative "../../util/util"
 require_relative "../xrefprocess/xrefprocess"
 require_relative "collection"
+require "concurrent-ruby"
 
 module Metanorma
   class Collection
@@ -35,12 +36,32 @@ module Metanorma
       def sectionsplit
         xml = sectionsplit_prep(File.read(@input_filename), @base, @dir)
         @key = Metanorma::Collection::XrefProcess::xref_preprocess(xml, @isodoc)
-        SPLITSECTIONS.each_with_object([]) do |n, ret|
+        empty = empty_doc(xml)
+        empty1 = empty_attachments(empty)
+        @mutex = Mutex.new
+        @pool = Concurrent::FixedThreadPool.new(4)
+        sectionsplit1(xml, empty, empty1, 0)
+      end
+
+      def sectionsplit1(xml, empty, empty1, idx)
+        ret = SPLITSECTIONS.each_with_object([]) do |n, m|
           conflate_floatingtitles(xml.xpath(ns(n[0]))).each do |s|
-            ret << sectionfile(xml, emptydoc(xml, ret.size),
-                               "#{@base}.#{ret.size}", s, n[1])
+            sectionsplit2(xml, idx.zero? ? empty : empty1, s, n[1],
+                          { acc: m, idx: idx })
+            idx += 1
           end
         end
+        @pool.shutdown
+        @pool.wait_for_termination
+        ret
+      end
+
+      def sectionsplit2(xml, empty, chunks, parentnode, opt)
+        @pool.post do
+          a = sectionfile(xml, empty, "#{@base}.#{opt[:idx]}", chunks,
+                          parentnode)
+          @mutex.synchronize { opt[:acc] << a }
+        end
       end
 
       def block?(node)
@@ -108,7 +129,25 @@ module Metanorma
              "//indexsect | //colophon"),
         ).each(&:remove)
         ordinal.zero? or out.xpath(ns("//metanorma-ext//attachment | " \
-                      "//semantic__metanorma-ext//semantic__attachment"))
+                                      "//semantic__metanorma-ext//semantic__attachment"))
+          .each(&:remove) # keep only one copy of attachments
+        out
+      end
+
+      def empty_doc(xml)
+        out = xml.dup
+        out.xpath(
+          ns("//preface | //sections | //annex | //bibliography/clause | " \
+             "//bibliography/references[not(@hidden = 'true')] | " \
+             "//indexsect | //colophon"),
+        ).each(&:remove)
+        out
+      end
+
+      def empty_attachments(xml)
+        out = xml.dup
+        out.xpath(ns("//metanorma-ext//attachment | " \
+                     "//semantic__metanorma-ext//semantic__attachment"))
           .each(&:remove) # keep only one copy of attachments
         out
       end
@@ -126,7 +165,9 @@ module Metanorma
                                                          @ident, @isodoc)
         truncate_semxml(out, chunks)
         outname = "#{file}.xml"
-        File.open(File.join(@splitdir, outname), "w:UTF-8") { |f| f.write(out) }
+        File.open(File.join(@splitdir, outname), "w:UTF-8") do |f|
+          f.write(out)
+        end
         outname
       end
 

data/lib/metanorma/compile/compile.rb

@@ -114,6 +114,14 @@ module Metanorma
       fnames = { xml: f.sub(/\.[^.]+$/, ".xml"), f: f,
                  orig_filename: File.expand_path(filename),
                  presentationxml: f.sub(/\.[^.]+$/, ".presentation.xml") }
+      if extensions == %i(presentation)
+        process_ext(:presentation, file, isodoc, fnames, options)
+      else
+      process_exts_queue(fnames, extensions, file, isodoc, options)
+      end
+    end
+
+    def process_exts_queue(fnames, extensions, file, isodoc, options)
       @queue = ::Metanorma::Util::WorkersPool
         .new(ENV["METANORMA_PARALLEL"]&.to_i || 3)
       gather_and_install_fonts(file, options.dup, extensions)

data/lib/metanorma/compile/extract.rb

@@ -1,8 +1,7 @@
 module Metanorma
   class Compile
     def relaton_export(isodoc, options)
-      return unless options[:relaton]
-
+      options[:relaton] or return
       xml = Nokogiri::XML(isodoc, &:huge)
       bibdata = xml.at("//bibdata") || xml.at("//xmlns:bibdata")
       # docid = bibdata&.at("./xmlns:docidentifier")&.text || options[:filename]
@@ -18,8 +17,7 @@ module Metanorma
     end
 
     def extract(isodoc, dirname, extract_types)
-      return unless dirname
-
+      dirname or return
       extract_types.nil? || extract_types.empty? and
         extract_types = %i[sourcecode image requirement]
       FileUtils.rm_rf dirname

data/lib/metanorma/input/asciidoc.rb

@@ -14,15 +14,16 @@ module Metanorma
       end
 
       def extract_metanorma_options(file)
-        headerextract = file.sub(/\n\n.*$/m, "\n")
-        /\n:mn-document-class:\s+(?<type>\S[^\n]*)\n/ =~ headerextract
-        /\n:mn-output-extensions:\s+(?<extensions>\S[^\n]*)\n/ =~ headerextract
-        /\n:mn-relaton-output-file:\s+(?<relaton>\S[^\n]*)\n/ =~ headerextract
-        /\n(?<asciimath>:mn-keep-asciimath:[^\n]*)\n/ =~ headerextract
-        /\n(?<novalid>:novalid:[^\n]*)\n/ =~ headerextract
-        asciimath = if defined?(asciimath)
-                      !asciimath.nil? && asciimath != ":mn-keep-asciimath: false"
-                    end
+        hdr = file.sub(/\n\n.*$/m, "\n")
+        /\n:(?:mn-)?(?:document-class|flavor):\s+(?<type>\S[^\n]*)\n/ =~ hdr
+        /\n:(?:mn-)?output-extensions:\s+(?<extensions>\S[^\n]*)\n/ =~ hdr
+        /\n:(?:mn-)?relaton-output-file:\s+(?<relaton>\S[^\n]*)\n/ =~ hdr
+        /\n(?<asciimath>:(?:mn-)?keep-asciimath:[^\n]*)\n/ =~ hdr
+        /\n(?<novalid>:novalid:[^\n]*)\n/ =~ hdr
+        if defined?(asciimath)
+          asciimath =
+            !asciimath.nil? && !/keep-asciimath: false/.match?(asciimath)
+        end
         asciimath = nil if asciimath == false
         {
           type: defined?(type) ? type&.strip : nil,
@@ -62,7 +63,7 @@ module Metanorma
            toc-tables toc-recommendations).freeze
 
       def attr_name_normalise(name)
-        name.gsub("-", "").sub(/override$/, "_override").sub(/pdf$/, "_pdf")
+        name.delete("-").sub(/override$/, "_override").sub(/pdf$/, "_pdf")
           .to_sym
       end
 

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "2.0.6".freeze
+  VERSION = "2.0.7".freeze
 end

data/metanorma.gemspec

@@ -24,10 +24,11 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 3.1.0"
 
   spec.add_runtime_dependency "asciidoctor"
+  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.6.3"
-  spec.add_runtime_dependency "mn2pdf", "~> 1"
+  spec.add_runtime_dependency "mn2pdf", "~> 2"
   spec.add_runtime_dependency "nokogiri"
   spec.add_runtime_dependency "shale"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-14 00:00:00.000000000 Z
+date: 2024-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fontist
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -316,6 +330,7 @@ files:
 - lib/metanorma/collection/renderer/navigation.rb
 - lib/metanorma/collection/renderer/render_word.rb
 - lib/metanorma/collection/renderer/renderer.rb
+- lib/metanorma/collection/renderer/svg.rb
 - lib/metanorma/collection/renderer/utils.rb
 - lib/metanorma/collection/sectionsplit/collection.rb
 - lib/metanorma/collection/sectionsplit/sectionsplit.rb