metanorma 1.6.3 → 1.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca433d59b111534c114a96b7ce386ccf0267a70cedcbfbe61ef11cf2f42737d3
-  data.tar.gz: c1a73eb056acb7910d255c8348273dd9abf79dd06ef4826ac3ab3d5474543242
+  metadata.gz: e4bbd3fdfd37664da0a7f9e91cbecfcb0f7cdd49c004cf75eaa122c366ea6fba
+  data.tar.gz: 6b61241e1010ed465995c23447b4828503495d8f4fb2366e64babe0ae6d0726e
 SHA512:
-  metadata.gz: 2e57292cdc5217cb985be7beb617035ee8edcfb0c9ee3c38cd2c6dc49e71c63468c05d3e6c3000985e93e94a4313f7cf77b24a24c4affe80778f3727c3c7a5b8
-  data.tar.gz: b1a33f6b99669f384af4426cf75e3052f480c0878ec9f1d5716661bc5340e228273f6993930aacba3b1bfe6da7f166791718b0c02c0c71440f83d8642e019355
+  metadata.gz: dc05aa1c9d8aec0e6d45b537e10a130f88e715116f0dd92820e73588ff5a6542a7f2f92099e504654d2ed21e4e95c4bd84c0b260e24f923720b38ae298455f33
+  data.tar.gz: 870e182c05914d484180fd19360bfe1010cb9b57ed926926d76ba6cde3d9f2adbf2cb98e5d7e44702f2024cd51b52347524b9fb0ac28c0463d01b3d1dfc9d7b6

data/lib/metanorma/collection_fileparse.rb

@@ -58,10 +58,10 @@ module Metanorma
       update_indirect_refs_to_docs(docxml, internal_refs)
       ids = @files.get(identifier, :ids)
       @files.add_document_suffix(identifier, docxml)
-      svgmap_resolve(datauri_encode(docxml), ids)
       update_direct_refs_to_docs(docxml, identifier)
       hide_refs(docxml)
       @files.get(identifier, :sectionsplit_output) and eref2link(docxml)
+      svgmap_resolve(datauri_encode(docxml), ids)
       docxml.to_xml
     end
 
@@ -98,12 +98,12 @@ module Metanorma
         svgmap_resolve1(e, isodoc, docxml, ids)
       end
       Metanorma::Utils::svgmap_rewrite(docxml, "")
+      docxml.xpath(ns("//svgmap")).each { |s| isodoc.svgmap_extract(s) }
     end
 
     def svgmap_resolve1(eref, isodoc, _docxml, ids)
-      href = isodoc.eref_target(eref)
+      href = isodoc.eref_target(eref) or return
       return if href == "##{eref['bibitemid']}" ||
-        # (href =~ /^#/ && !docxml.at("//*[@id = '#{href.sub(/^#/, '')}']"))
         (href =~ /^#/ && !ids[href.sub(/^#/, "")])
 
       eref["target"] = href.strip
@@ -119,15 +119,24 @@ module Metanorma
     def update_direct_refs_to_docs(docxml, identifier)
       @ncnames = {}
       erefs = Util::gather_citeases(docxml)
+      erefs1 = Util::gather_bibitemids(docxml)
       docxml.xpath(ns("//bibitem")).each do |b|
-        docid = b.at(ns("./docidentifier[@type = 'repository']"))
-        (docid && %r{^current-metanorma-collection/}.match(docid.text)) or next
+        docid = b.at(ns("./docidentifier[@type = 'repository']")) or next
+        unless %r{^current-metanorma-collection/}.match(docid.text)
+          erefs1[b["id"]]&.each { |x| strip_eref(x) }
+          next
+        end
         update_bibitem(b, identifier)
         docid = docid_to_citeas(b) or next
         erefs[docid] and update_anchors(b, docid, erefs[docid])
       end
     end
 
+    def strip_eref(eref)
+      eref.xpath(ns("./locality | ./localityStack")).each(&:remove)
+      eref.replace(eref.children)
+    end
+
     def docid_to_citeas(bib)
       docid = bib.at(ns("./docidentifier[@primary = 'true']")) ||
         bib.at(ns("./docidentifier")) or return
@@ -157,7 +166,6 @@ module Metanorma
 
     def update_indirect_refs_to_docs1(_docxml, key, file, bibitems, erefs)
       erefs[key]&.each do |e|
-        # docxml.xpath(ns("//eref[@bibitemid = '#{key}']")).each do |e|
         e["citeas"] = file
         a = e.at(ns(".//locality[@type = 'anchor']/referenceFrom")) and
           a.children = "#{a.text}_#{Metanorma::Utils::to_ncname(file)}"
@@ -172,7 +180,6 @@ module Metanorma
     # update crossrefences to other documents, to include
     # disambiguating document suffix on id
     def update_anchors(bib, docid, erefs)
-      #docxml.xpath("//xmlns:eref[@citeas = '#{docid}']").each do |e|
       erefs.each do |e|
         if @files.get(docid) then update_anchor_loc(bib, e, docid)
         else

data/lib/metanorma/collection_manifest.rb

@@ -118,7 +118,7 @@ module Metanorma
     end
 
     def docref_to_xml_attrs(elem, docref)
-      elem[:fileref] = @disambig.source2dest_filename(docref["fileref"])
+      elem[:fileref] = @disambig.strip_root(docref["fileref"])
       %i(attachment sectionsplit).each do |i|
         elem[i] = docref[i.to_s] if docref[i.to_s]
       end

data/lib/metanorma/collection_render_utils.rb

@@ -81,25 +81,25 @@ module Metanorma
       isodoc
     end
 
+    # create the @meta class of isodoc, for populating Liquid,
+    # with "navigation" set to the index bar.
+    # extracted from the manifest
     def isodoc_populate
-      # create the @meta class of isodoc, for populating Liquid,
-      # with "navigation" set to the index bar.
-      # extracted from the manifest
-      @isodoc.meta.set(:navigation, indexfile(@xml.at(ns("//manifest"))))
-      @isodoc.meta.set(:docrefs, liquid_docrefs)
-      @isodoc.meta.set(:"prefatory-content",
-                       isodoc_builder(@isodoc,
-                                      @xml.at(ns("//prefatory-content"))))
-      @isodoc.meta.set(:"final-content",
-                       isodoc_builder(isodoc,
-                                      @xml.at(ns("//final-content"))))
       @isodoc.info(@xml, nil)
+      m = @xml.at(ns("//manifest"))
+      { navigation: indexfile(m), nav_object: index_object(m),
+        docrefs: liquid_docrefs,
+        "prefatory-content": isodoc_builder(@xml.at(ns("//prefatory-content"))),
+        "final-content": isodoc_builder(@xml.at(ns("//final-content"))),
+        doctitle: m.at(ns("../bibdata/title"))&.text,
+        docnumber: m.at(ns("../bibdata/docidentifier"))&.text
+      }.each { |k, v| v and @isodoc.meta.set(k, v) }
     end
 
-    def isodoc_builder(isodoc, node)
+    def isodoc_builder(node)
       Nokogiri::HTML::Builder.new(encoding: "UTF-8") do |b|
         b.div do |div|
-          node&.children&.each { |n| isodoc.parse(n, div) }
+          node&.children&.each { |n| @isodoc.parse(n, div) }
         end
       end.doc.root.to_html
     end

data/lib/metanorma/collection_renderer.rb

@@ -132,9 +132,7 @@ module Metanorma
     # @param elm [Nokogiri::XML::Element]
     # @return [String]
     def indexfile_title(elm)
-      lvl = elm.at(ns("./level"))&.text&.capitalize
-      lbl = elm.at(ns("./title"))&.text
-      "#{lvl}#{lvl && lbl ? ': ' : ''}#{lbl}"
+      elm.at(ns("./title"))&.text
     end
 
     # uses the identifier to label documents; other attributes (title) can be
@@ -172,10 +170,6 @@ module Metanorma
     end
 
     # single level navigation list, with hierarchical nesting
-    # if multiple lists are needed as separate HTML fragments, multiple
-    # instances of this function will be needed,
-    # and associated to different variables in the call to @isodoc.metadata_init
-    # (including possibly an array of HTML fragments)
     #
     # @param elm [Nokogiri::XML::Element]
     # @return [String] XML
@@ -191,6 +185,20 @@ module Metanorma
       end.doc.root.to_html
     end
 
+    # object to construct navigation out of in Liquid
+    def index_object(elm)
+      c = elm.xpath(ns("./manifest")).each_with_object([]) do |d, b|
+        b << index_object(d)
+      end
+      c.empty? and c = nil
+      r = Nokogiri::HTML::Builder.new do |b|
+        indexfile_docref(elm, b)
+      end
+      r &&= r.doc.root&.to_html&.gsub("\n", " ")
+      { title: indexfile_title(elm),
+        docrefs: r, children: c }.compact
+    end
+
     def liquid_docrefs
       @xml.xpath(ns("//docref[@index = 'true']")).each_with_object([]) do |d, m|
         ident = d.at(ns("./identifier")).children.to_xml

data/lib/metanorma/files_lookup.rb

@@ -1,6 +1,7 @@
 require "isodoc"
 require "htmlentities"
 require "metanorma-utils"
+require_relative "files_lookup_sectionsplit"
 
 module Metanorma
   # XML collection renderer
@@ -25,6 +26,7 @@ module Metanorma
     end
 
     def read_files
+      @disambig = Util::DisambigFiles.new
       @xml.xpath(ns("//docref")).each { |d| read_file(d) }
     end
 
@@ -58,79 +60,28 @@ module Metanorma
       entry[:bibitem].at("./*[local-name() = 'ext']")&.remove
     end
 
-    def add_section_split
-      ret = @files.keys.each_with_object({}) do |k, m|
-        if @files[k][:sectionsplit] == "true" && !@files[k]["attachment"]
-          s, manifest = sectionsplit(@files[k][:ref], k)
-          s.each_with_index { |f1, i| add_section_split_instance(f1, m, k, i) }
-          m["#{k}:index.html"] = add_section_split_cover(manifest, k)
-          @files_to_delete << m["#{k}:index.html"][:ref]
-        end
-        m[k] = @files[k]
-      end
-      @files = ret
-    end
-
-    def add_section_split_cover(manifest, ident)
-      cover = @sectionsplit.section_split_cover(manifest,
-                                                @parent.dir_name_cleanse(ident))
-      @files[ident][:out_path] = cover
-      { attachment: true, index: false, out_path: cover,
-        ref: File.join(File.dirname(manifest.file), cover) }
-    end
-
-    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 }
-      @files_to_delete << file[:url]
-      manifest[newkey][:bare] = true unless idx.zero?
-    end
-
-    def add_section_split_instance_prep(file, key)
-      presfile = File.join(File.dirname(@files[key][:ref]),
-                           File.basename(file[:url]))
-      newkey = key("#{key.strip} #{file[:title]}")
-      xml = Nokogiri::XML(File.read(presfile), &:huge)
-      [presfile, newkey, xml]
-    end
-
-    def sectionsplit(file, ident)
-      @sectionsplit =
-        Sectionsplit.new(input: file, base: File.basename(file), dir: File.dirname(file),
-                         output: file, compile_options: @parent.compile_options,
-                         fileslookup: self, ident: ident, isodoc: @isodoc)
-      coll = @sectionsplit.sectionsplit.sort_by { |f| f[:order] }
-      # s = @compile.sectionsplit(file, File.basename(file), File.dirname(file),
-      # @parent.compile_options, self, ident)
-      # .sort_by { |f| f[:order] }
-      # xml = Nokogiri::XML(File.read(file, encoding: "UTF-8")) { |x| x.huge }
-      xml = Nokogiri::XML(File.read(file, encoding: "UTF-8"), &:huge)
-      [coll, @sectionsplit
-        .collection_manifest(File.basename(file), coll, xml, nil,
-                             File.dirname(file))]
-    end
-
     # rel_path is the source file address, determined relative to the YAML.
     # out_path is the destination file address, with any references outside
     # the working directory (../../...) truncated
     # identifier is the id with only spaces, no nbsp
     def file_entry(ref, identifier)
       out = ref["attachment"] ? ref["fileref"] : File.basename(ref["fileref"])
+      out1 = @disambig.source2dest_filename(out)
       ret = if ref["fileref"]
               { type: "fileref", ref: @documents[identifier].file,
-                rel_path: ref["fileref"], out_path: out }
-            else { type: "id", ref: ref["id"] } end
+                rel_path: ref["fileref"],
+                out_path: out1 } # @disambig.source2dest_filename(out) }
+            else { type: "id", ref: ref["id"] }
+            end
+      file_entry_copy(ref, ret)
+      ret.compact
+    end
+
+    def file_entry_copy(ref, ret)
       %w(attachment sectionsplit index presentation-xml
          bare-after-first).each do |s|
         ret[s.gsub("-", "").to_sym] = ref[s] if ref[s]
       end
-      ret.compact
     end
 
     def add_suffix_to_attributes(doc, suffix, tag_name, attribute_name)

data/lib/metanorma/files_lookup_sectionsplit.rb

@@ -0,0 +1,69 @@
+module Metanorma
+  # XML collection renderer
+  class FileLookup
+    def add_section_split
+      ret = @files.keys.each_with_object({}) do |k, m|
+        if @files[k][:sectionsplit] == "true" && !@files[k]["attachment"]
+          s, manifest = sectionsplit(@files[k][:ref], @files[k][:out_path], k)
+          s.each_with_index { |f1, i| add_section_split_instance(f1, m, k, i) }
+          m["#{k}:index.html"] = add_section_split_cover(manifest, k)
+          @files_to_delete << m["#{k}:index.html"][:ref]
+        end
+        m[k] = @files[k]
+      end
+      @files = ret
+    end
+
+    def add_section_split_cover(manifest, ident)
+      cover = @sectionsplit
+        .section_split_cover(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) }
+    end
+
+    def one_doc_collection?
+      docs = 0
+      @files.each_value do |v|
+        v[:attachment] and next
+        v[:presentationxml] and next
+        docs += 1
+      end
+      docs > 1
+    end
+
+    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 }
+      @files_to_delete << file[:url]
+      manifest[newkey][:bare] = true unless idx.zero?
+    end
+
+    def add_section_split_instance_prep(file, key)
+      presfile = File.join(File.dirname(@files[key][:ref]),
+                           File.basename(file[:url]))
+      newkey = key("#{key.strip} #{file[:title]}")
+      xml = Nokogiri::XML(File.read(presfile), &:huge)
+      [presfile, newkey, xml]
+    end
+
+    def sectionsplit(file, outfile, ident)
+      @sectionsplit = Sectionsplit
+        .new(input: file, base: outfile, dir: File.dirname(file),
+             output: outfile, compile_options: @parent.compile_options,
+             fileslookup: self, ident: ident, isodoc: @isodoc)
+      coll = @sectionsplit.sectionsplit.sort_by { |f| f[:order] }
+      xml = Nokogiri::XML(File.read(file, encoding: "UTF-8"), &:huge)
+      [coll, @sectionsplit
+        .collection_manifest(File.basename(file), coll, xml, nil,
+                             File.dirname(file))]
+    end
+  end
+end

data/lib/metanorma/processor.rb

@@ -18,7 +18,8 @@ module Metanorma
     end
 
     def input_to_isodoc(file, filename, options = {})
-      Metanorma::Input::Asciidoc.new.process(file, filename, @asciidoctor_backend, options)
+      Metanorma::Input::Asciidoc.new.process(file, filename,
+                                             @asciidoctor_backend, options)
     end
 
     # def input_to_isodoc(file, filename)
@@ -33,12 +34,17 @@ module Metanorma
       end
     end
 
+    def options_preprocess(options)
+      options[:output_formats] = output_formats
+    end
+
     def output(isodoc_node, _inname, outname, _format, _options = {})
       File.open(outname, "w:UTF-8") { |f| f.write(isodoc_node) }
     end
 
     def extract_options(file)
       Metanorma::Input::Asciidoc.new.extract_options(file)
+        .merge(output_formats: output_formats)
     end
 
     def extract_metanorma_options(file)

data/lib/metanorma/sectionsplit.rb

@@ -109,7 +109,8 @@ module Metanorma
       type = xml.root.name.sub("-standard", "").to_sym
       @fileslookup&.parent&.update_xrefs(xml, @ident, {})
       xml1 = Tempfile.open([filename, ".xml"], encoding: "utf-8") do |f|
-        f.write(@isodoc.to_xml(svg_preprocess(xml)))
+        #f.write(@isodoc.to_xml(svg_preprocess(xml)))
+        f.write(@isodoc.to_xml((xml)))
         f
       end
       @filecache ||= []
@@ -184,17 +185,17 @@ module Metanorma
       Util::recursive_string_keys(ret).to_yaml
     end
 
-    def section_split_cover(col, ident)
+    def section_split_cover(col, ident, one_doc_coll)
       dir = File.dirname(col.file)
       collection_setup(nil, dir)
       CollectionRenderer.new(col, dir,
                              output_folder: "#{ident}_collection",
                              format: %i(html),
                              coverpage: File.join(dir, "cover.html")).coverpage
-      FileUtils.mv "#{ident}_collection/index.html",
-                   File.join(dir, "#{ident}_index.html")
+      filename = one_doc_coll ? "#{ident}_index.html" : "index.html"
+      FileUtils.mv "#{ident}_collection/index.html", File.join(dir, filename)
       FileUtils.rm_rf "#{ident}_collection"
-      "#{ident}_index.html"
+      filename
     end
   end
 end

data/lib/metanorma/sectionsplit_links.rb

@@ -1,12 +1,13 @@
 module Metanorma
   class Sectionsplit
-    def xref_preprocess(xml, fileslookup, identifier)
+    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
       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, key)
       ins = new_hidden_ref(section)
@@ -14,15 +15,14 @@ module Metanorma
       insert_indirect_biblio(ins, refs - copied_refs, key)
     end
 
-    def svg_preprocess(xml)
+    def svg_preprocess(xml, document_suffix)
       xml.xpath("//m:svg", "m" => "http://www.w3.org/2000/svg").each do |s|
         m = svgmap_wrap(s)
         s.xpath(".//m:a", "m" => "http://www.w3.org/2000/svg").each do |a|
-          next unless /^#/.match? a["href"]
-
+          /^#/.match? a["href"] or next
           a["href"] = a["href"].sub(/^#/, "")
           m << "<target href='#{a['href']}'>" \
-               "<xref target='#{a['href']}'/></target>"
+               "<xref target='#{a['href']}_#{document_suffix}'/></target>"
         end
       end
       xml

data/lib/metanorma/util.rb

@@ -65,8 +65,12 @@ module Metanorma
         @seen_filenames = []
       end
 
+      def strip_root(name)
+        name.sub(%r{^(\./)?(\.\./)+}, "")
+      end
+
       def source2dest_filename(name, disambig = true)
-        n = name.sub(%r{^(\./)?(\.\./)+}, "")
+        n = strip_root(name)
         dir = File.dirname(n)
         base = File.basename(n)
         if disambig && @seen_filenames.include?(base)

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "1.6.3".freeze
+  VERSION = "1.6.5".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-25 00:00:00.000000000 Z
+date: 2023-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -269,6 +269,7 @@ files:
 - lib/metanorma/document.rb
 - lib/metanorma/extract.rb
 - lib/metanorma/files_lookup.rb
+- lib/metanorma/files_lookup_sectionsplit.rb
 - lib/metanorma/fontist_utils.rb
 - lib/metanorma/input.rb
 - lib/metanorma/input/asciidoc.rb