metanorma 1.6.3 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca433d59b111534c114a96b7ce386ccf0267a70cedcbfbe61ef11cf2f42737d3
-  data.tar.gz: c1a73eb056acb7910d255c8348273dd9abf79dd06ef4826ac3ab3d5474543242
+  metadata.gz: abbc191b2e898bbeeea46f7867bb9d25d44cfd7f9a0dd2c690fcbdb8383136fd
+  data.tar.gz: a9e184662fcf25a575c278d604440b8215fd7b54b76f980a4cf4bfd5f8a1f543
 SHA512:
-  metadata.gz: 2e57292cdc5217cb985be7beb617035ee8edcfb0c9ee3c38cd2c6dc49e71c63468c05d3e6c3000985e93e94a4313f7cf77b24a24c4affe80778f3727c3c7a5b8
-  data.tar.gz: b1a33f6b99669f384af4426cf75e3052f480c0878ec9f1d5716661bc5340e228273f6993930aacba3b1bfe6da7f166791718b0c02c0c71440f83d8642e019355
+  metadata.gz: bfc28efd7f7f48f0bfd7dfa630bf88f1186006022dc6d5f82f188a3749304bc73837c9e96dd9246655de67f2b1ee29d9525f49c2ba568e2116d4329bf3689bda
+  data.tar.gz: 40bc185f4dbe9b4570349e22a15334a2e3fb089dfe3002ab43cb4a8ffa4afe4f2a3ae8357f80e61d585a57ab3b64e24dd5fb2700241dd6f1b958693214afdbc6

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)
       return if href == "##{eref['bibitemid']}" ||
-        # (href =~ /^#/ && !docxml.at("//*[@id = '#{href.sub(/^#/, '')}']"))
         (href =~ /^#/ && !ids[href.sub(/^#/, "")])
 
       eref["target"] = href.strip
@@ -157,7 +157,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 +171,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/files_lookup.rb

@@ -1,6 +1,7 @@
 require "isodoc"
 require "htmlentities"
 require "metanorma-utils"
+require_relative "files_lookup_sectionsplit"
 
 module Metanorma
   # XML collection renderer
@@ -58,64 +59,6 @@ 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

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], 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, 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] }
+      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/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/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "1.6.3".freeze
+  VERSION = "1.6.4".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.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-25 00:00:00.000000000 Z
+date: 2023-10-09 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