metanorma 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40466d3eca9782461819ef5828d00dcdc4203e000cc0a6762e658ac75fab81c2
-  data.tar.gz: ff68a9e27dd193c8e1263bcb1200f76d87eaf10363ef4c4eb32b9719e9b82eee
+  metadata.gz: 92e4b253c6c10fcce6aee6e827adec6281f79cd0e72e2ee84696af2bc288d0b1
+  data.tar.gz: 6bf08b8a123331df15d3ad9fc62d61b31ce3c53208cd14252830fee11c1b8977
 SHA512:
-  metadata.gz: 77388c12e9b2067cd0e319cdacc3ea914984e5185ce130ea5b6dbc893ab4d1d851294b7f3833811235b3952b50c98ad4830614c87a472dac9a26dc644b48f031
-  data.tar.gz: 749c67ae8b9c967a0a2446847fb04fc9b045d5f42d4046a66aa79ce0abd5dc373545af2a1520559fa3fb0db4065a51aa2f043fcbe3007b84990ab89b99a286b9
+  metadata.gz: 9cda0f7b08169d3d9bb7aef6f25a372882f561310f5cf8913cae241398b83acae2c8d160be3d6ec1aa924a030e49d4058f2b42ff7f404c6ff8c4d906d8c126ec
+  data.tar.gz: 810ef3dd1033bcb57e7d097647dc5fa5f360310b15bf0e62d0056d62e67c2d290ec13c68720b0e080e1bc08ed5d13093928fb785c963ee276f9248c6473cf913

data/lib/metanorma/collection/collection.rb

@@ -82,6 +82,7 @@ module Metanorma
     end
 
     def render(opts)
+      opts[:format].nil? || opts[:format].empty? and opts[:format] = [:html]
       ::Metanorma::Collection::Renderer.render self, opts.merge(log: @log)
       clean_exit
     end

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

@@ -25,7 +25,7 @@ module Metanorma
         update_direct_refs_to_docs(xml, docid)
         hide_refs(xml)
         sso and eref2link(xml)
-        svgmap_resolve(xml, docid)
+        @nested or svgmap_resolve(xml, docid)
         xml.to_xml
       end
 
@@ -59,13 +59,6 @@ module Metanorma
         doclist
       end
 
-      def new_hidden_ref(xmldoc)
-        ins = xmldoc.at(ns("bibliography")) or
-          xmldoc.root << "<bibliography/>" and ins = xmldoc.at(ns("bibliography"))
-        ins.at(ns("./referenced[@hidden = 'true']")) or
-          ins.add_child("<references hidden='true' normative='false'/>").first
-      end
-
       def eref2link(docxml)
         isodoc = IsoDoc::PresentationXMLConvert.new({})
         isodoc.bibitem_lookup(docxml)
@@ -86,20 +79,36 @@ 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)
-        dir = File.join(@dirname, File.dirname(@files.get(docid, :rel_path)))
-        docxml = datauri_encode(docxml, dir)
+        docxml = svg_unnest(svg_datauri(docxml, docid))
         isodoc = IsoDoc::PresentationXMLConvert.new({})
         isodoc.bibitem_lookup(docxml)
         docxml.xpath(ns("//svgmap//eref")).each do |e|
-          svgmap_resolve1(e, isodoc, docxml, ids)
+          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 svgmap_resolve1(eref, isodoc, _docxml, ids)
+      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 == "##{eref['bibitemid']}" ||
           (href =~ /^#/ && !ids[href.sub(/^#/, "")]) and return
@@ -189,9 +198,8 @@ module Metanorma
         @updated_anchors[anchor] = true
       end
 
-      def update_indirect_refs_to_docs_docid(bibitem, file)
-        docid = bibitem&.at(ns("./docidentifier[@type = 'repository']")) or
-          return
+      def update_indirect_refs_to_docs_docid(bib, file)
+        docid = bib&.at(ns("./docidentifier[@type = 'repository']")) or return
         docid.children = "current-metanorma-collection/#{file}"
         docid.previous =
           "<docidentifier type='metanorma-collection'>#{file}</docidentifier>"
@@ -237,9 +245,8 @@ module Metanorma
         type = ins.at(ns("./locality/@type"))&.text
         type = "clause" if type == "annex"
         ref = ins.at(ns("./locality/referenceFrom"))&.text
-        anchor = @files.get(docid, :anchors).dig(type, ref) or return
-        ins << "<locality type='anchor'><referenceFrom>#{anchor.sub(/^_/,
-                                                                    '')}" \
+        a = @files.get(docid, :anchors).dig(type, ref) or return
+        ins << "<locality type='anchor'><referenceFrom>#{a.sub(/^_/, '')}" \
                "</referenceFrom></locality>"
       end
     end

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

@@ -51,7 +51,8 @@ module Metanorma
           out = out.relative_path_from(File.expand_path(FileUtils.pwd))
         dest = File.join(@outdir, @disambig.source2dest_filename(out.to_s))
         FileUtils.mkdir_p(File.dirname(dest))
-        FileUtils.cp @files.get(identifier, :ref), dest
+        source = @files.get(identifier, :ref)
+        source != dest and FileUtils.cp source, dest
       end
 
       # process each file in the collection

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

@@ -3,7 +3,7 @@ module Metanorma
     class Renderer
       def dir_name_cleanse(name)
         path = Pathname.new(name)
-        clean_regex = /[<>:"|?*]/
+        clean_regex = /[<>:"|?*\p{Zs}]/
         fallback_sym = "_"
         return name.gsub(clean_regex, fallback_sym) unless path.absolute?
 
@@ -40,6 +40,13 @@ module Metanorma
         end
       end
 
+      def new_hidden_ref(xmldoc)
+        ins = xmldoc.at(ns("bibliography")) or
+          xmldoc.root << "<bibliography/>" and ins = xmldoc.at(ns("bibliography"))
+        ins.at(ns("./referenced[@hidden = 'true']")) or
+          ins.add_child("<references hidden='true' normative='false'/>").first
+      end
+
       def strip_eref(eref)
         eref.xpath(ns("./locality | ./localityStack")).each(&:remove)
         eref.replace(eref.children)
@@ -119,11 +126,32 @@ module Metanorma
 
       def datauri_encode(docxml, directory)
         docxml.xpath(ns("//image")).each do |i|
+          read_in_if_svg(i, directory.sub(%r{(?<!=/)$}, "/")) and i["src"] = nil
+        end
+        docxml.xpath(ns("//image")).each do |i| # rubocop:disable Style/CombinableLoops
+          i["src"] && !i["src"].empty? or next
           i["src"] = Vectory::Utils::datauri(i["src"], directory)
         end
         docxml
       end
 
+      def read_in_if_svg(img, localdir)
+        img["src"] or return false
+        img.elements.map(&:name).include?("svg") and return true
+        path = Vectory::Utils.svgmap_rewrite0_path(img["src"], localdir)
+        svg = svg_in_path?(path) or return false
+        img.children = (Nokogiri::XML(svg).root)
+        true
+      end
+
+      def svg_in_path?(path)
+        File.file?(path) or return false
+        types = MIME::Types.type_for(path) or return false
+        types.first == "image/svg+xml" or return false
+        svg = File.read(path, encoding: "utf-8") or return false
+        svg
+      end
+
       class PdfOptionsNode
         def initialize(doctype, options)
           p = Metanorma::Registry.instance.find_processor(doctype)

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

@@ -66,7 +66,6 @@ module Metanorma
          ["//indexsect", nil], ["//colophon", nil]].freeze
 
       # Input XML is Semantic
-      # def sectionsplit(filename, basename, dir, compile_options, fileslookup = nil, ident = nil)
       def sectionsplit
         xml = sectionsplit_prep(File.read(@input_filename), @base, @dir)
         @key = Metanorma::Collection::XrefProcess::xref_preprocess(xml, @isodoc)
@@ -96,14 +95,15 @@ module Metanorma
 
       def sectionsplit_prep(file, filename, dir)
         @splitdir = dir
-        xml1filename, type = sectionsplit_preprocess_semxml(file, filename)
-        Compile.new.compile(
-          xml1filename,
-          { format: :asciidoc, extension_keys: [:presentation], type: type }
-         .merge(@compile_opts),
-        )
-        Nokogiri::XML(File.read(xml1filename.sub(/\.xml$/, ".presentation.xml"),
-                                encoding: "utf-8"), &:huge)
+        xml1, type = sectionsplit_preprocess_semxml(file, filename)
+        flags = { format: :asciidoc, extension_keys: [:presentation],
+                  type: type }.merge(@compile_opts)
+        Compile.new.compile(xml1, flags)
+        f = File.open(xml1.sub(/\.xml$/, ".presentation.xml"),
+                      encoding: "utf-8")
+        r = Nokogiri::XML(f, &:huge)
+        r.xpath("//xmlns:svgmap1").each { |x| x.name = "svgmap" }
+        r
       end
 
       def sectionsplit_preprocess_semxml(file, filename)
@@ -111,9 +111,7 @@ module Metanorma
         type = xml.root.name.sub("-standard", "").to_sym
         sectionsplit_update_xrefs(xml)
         xml1 = sectionsplit_write_semxml(filename, xml)
-        @filecache ||= []
-        @filecache << xml1
-        [xml1.path, type]
+        [xml1, type]
       end
 
       def sectionsplit_update_xrefs(xml)
@@ -122,15 +120,17 @@ module Metanorma
           c.nested = true # so unresolved erefs are not deleted
           c.update_xrefs(xml, @ident, {})
           c.nested = n
+          xml.xpath("//xmlns:svgmap").each { |x| x.name = "svgmap1" }
+          # do not process svgmap until after files are split
         end
       end
 
       def sectionsplit_write_semxml(filename, xml)
-        Tempfile.open([filename, ".xml"], encoding: "utf-8") do |f|
-          # f.write(@isodoc.to_xml(svg_preprocess(xml)))
+        outname = Pathname.new("tmp_#{filename}").sub_ext(".xml").to_s
+        File.open(outname, "w:UTF-8") do |f|
           f.write(@isodoc.to_xml(xml))
-          f
         end
+        outname
       end
 
       def emptydoc(xml)
@@ -152,7 +152,8 @@ 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)
-        Metanorma::Collection::XrefProcess::xref_process(out, xml, @key, @ident, @isodoc)
+        Metanorma::Collection::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/compile/compile.rb

@@ -149,7 +149,8 @@ module Metanorma
       if ext == :rxl
         relaton_export(isodoc, options.merge(relaton: fnames[:out]))
       elsif options[:passthrough_presentation_xml] && ext == :presentation
-        f = File.exist?(fnames[:f]) ? fnames[:f] : fnames[:orig_filename]
+        #f = File.exist?(fnames[:f]) ? fnames[:f] : fnames[:orig_filename]
+        f = File.exist?(fnames[:orig_filename]) ? fnames[:orig_filename] : fnames[:f]
         FileUtils.cp f, fnames[:presentationxml]
       elsif ext == :html && options[:sectionsplit]
         sectionsplit_convert(fnames[:xml], isodoc, fnames[:out],

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "2.0.0".freeze
+  VERSION = "2.0.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-04 00:00:00.000000000 Z
+date: 2024-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor