metanorma 2.0.3 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c79c55687d9f7906deff9b1c0e1b0ea0b34bc12bdc457ee50b8f2ae317379d5
-  data.tar.gz: 9d4cb1f6ebbff8f9fef492db09a08e3b703d6abe370281eac70be19fd0cd0a74
+  metadata.gz: e6416bb8205d8f155d6affc6566e882a0cc161b16e6753e0df39be3818fb369b
+  data.tar.gz: ecfc71eb0cecda61acd433a6a2a1512415375f69a38a9bb2c4f5f779d7ca38f4
 SHA512:
-  metadata.gz: 209ad8c6bbf50736898ad555ad681ada496848b0050aec7683ac166b9ae86d403c6454e7ac9bec805a0f90ab3f24e0c35ad59f7af9d0d1156e3f3a6465dad2c2
-  data.tar.gz: f56c230c821be5f285e5bb8919ea6314664db0ff761bd16b0aaa434725ece3c8738cf7586711481454c031186aa0b548988d687d2d1977d3c8cdd45992db7b4f
+  metadata.gz: '0989d2e8fe2373f3e10733fca8e562839e6e264e3e45abc58782ab0d7ec5de8965fefc5a944154acab16968ed6292a42c000454791e782333b8cd47c5b51fce5'
+  data.tar.gz: 9004900c903b5cd1fe081cb4ca663a8caf0c0f2a4e016024accce10873261ccd3dacac953a1686a49d647cbe0d4f1914327304df9366ad3530a42078869cda84

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

@@ -104,7 +104,7 @@ module Metanorma
         %w(attachment sectionsplit index presentation-xml url
            bare-after-first).each do |s|
           ref.respond_to?(s.to_sym) and
-            ret[s.gsub("-", "").to_sym] = ref.send(s)
+            ret[s.delete("-").to_sym] = ref.send(s)
         end
       end
 
@@ -123,7 +123,7 @@ module Metanorma
       def url_in_css_styles(doc, document_suffix)
         doc.xpath("//*[@style]").each do |s|
           s["style"] = s["style"]
-            .gsub(%r{url\(#([^)]+)\)}, "url(#\\1_#{document_suffix})")
+            .gsub(%r{url\(#([^()]+)\)}, "url(#\\1_#{document_suffix})")
         end
       end
 

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

@@ -19,6 +19,8 @@ module Metanorma
         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)
       end
@@ -49,6 +51,15 @@ module Metanorma
         docs > 1
       end
 
+      def add_section_split_attachments(manifest, ident)
+        attachments = @sectionsplit
+          .section_split_attachments(out: File.dirname(manifest.file))
+        attachments or return
+        @files[ident][:out_path] = attachments
+        { attachment: true, index: false, out_path: attachments,
+          ref: File.join(File.dirname(manifest.file), attachments) }
+      end
+
       def add_section_split_instance(file, manifest, key, idx)
         presfile, newkey, xml =
           add_section_split_instance_prep(file, key)

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

@@ -110,6 +110,7 @@ module Metanorma
 
       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

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

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

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

@@ -34,7 +34,8 @@ module Metanorma
 
       def wrapping_doc_body(doc)
         doc.xpath(ns("//annex | //preface | //bibliography")).each(&:remove)
-        s = doc.at(ns("//sections"))
+        s = doc.at(ns("//sections")) ||
+          doc.root.elements[-1].after("<sections/>").next
         repl = <<~BODY
           <sections><clause id='_collection_placeholder'><p>PLACEHOLDER</p></clause></sections>
         BODY

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

@@ -32,6 +32,7 @@ module Metanorma
           { format: %i(html), output_folder: "#{@output_filename}_collection",
             coverpage: File.join(@dir, "cover.html") }.merge(@compile_opts),
         )
+        section_split_attachments(out: "#{@output_filename}_collection")
       end
 
       def collection_manifest(filename, files, origxml, _presxml, dir)
@@ -71,8 +72,8 @@ module Metanorma
         @key = Metanorma::Collection::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,
-                               n[1])
+            ret << sectionfile(xml, emptydoc(xml, ret.size),
+                               "#{@base}.#{ret.size}", s, n[1])
           end
         end
       end
@@ -111,6 +112,7 @@ module Metanorma
         type = xml.root.name.sub("-standard", "").to_sym
         sectionsplit_update_xrefs(xml)
         xml1 = sectionsplit_write_semxml(filename, xml)
+        @tmp_filename = xml1
         [xml1, type]
       end
 
@@ -133,13 +135,15 @@ module Metanorma
         outname
       end
 
-      def emptydoc(xml)
+      def emptydoc(xml, ordinal)
         out = xml.dup
         out.xpath(
           ns("//preface | //sections | //annex | //bibliography/clause | " \
-             "//bibliography/references[not(@hidden = 'true')] | //indexsect | " \
-             "//colophon"),
+             "//bibliography/references[not(@hidden = 'true')] | " \
+             "//indexsect | //colophon"),
         ).each(&:remove)
+        ordinal.zero? or out.xpath(ns("//metanorma-ext//attachment"))
+          .each(&:remove) # keep only one copy of attachments
         out
       end
 
@@ -155,9 +159,7 @@ module Metanorma
         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)
-        end
+        File.open(File.join(@splitdir, outname), "w:UTF-8") { |f| f.write(out) }
         outname
       end
 
@@ -173,7 +175,9 @@ module Metanorma
         title = section.at(ns("./title")) or return "[Untitled]"
         t = title.dup
         t.xpath(ns(".//tab | .//br")).each { |x| x.replace(" ") }
-        t.xpath(ns(".//strong")).each { |x| x.replace(x.children) }
+        t.xpath(ns(".//bookmark")).each(&:remove)
+        t.xpath(ns(".//strong | .//span"))
+          .each { |x| x.replace(x.children) }
         t.children.to_xml
       end
 
@@ -208,10 +212,30 @@ module Metanorma
           .new(col, dir, output_folder: "#{ident}_collection",
                          format: %i(html), coverpage: File.join(dir, "cover.html"))
         r.coverpage
+        section_split_cover1(ident, r, dir, _one_doc_coll)
+      end
+
+      def att_dir(file)
+        "_#{File.basename(file, '.*')}_attachments"
+      end
+
+      def section_split_attachments(out: nil)
+        attachments = att_dir(@tmp_filename)
+        File.directory?(attachments) or return
+        dir = out || File.dirname(@input_filename)
+        ret = File.join(dir, att_dir(@output_filename))
+        FileUtils.rm_rf ret
+        FileUtils.mv attachments, ret
+        File.basename(ret)
+      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(r.outdir, "index.html"), File.join(dir, filename)
-        FileUtils.rm_rf r.outdir
+        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)
+        FileUtils.rm_rf renderer.outdir
         filename
       end
     end

data/lib/metanorma/compile/compile.rb

@@ -28,8 +28,8 @@ module Metanorma
     def compile(filename, options = {})
       options_process(filename, options)
       @processor = @registry.find_processor(options[:type].to_sym)
-      extensions = get_extensions(options) or return nil
       (file, isodoc = process_input(filename, options)) or return nil
+      extensions = get_extensions(options) or return nil
       relaton_export(isodoc, options)
       extract(isodoc, options[:extract], options[:extract_type])
       process_exts(filename, extensions, file, isodoc, options)

data/lib/metanorma/registry/registry.rb

@@ -16,8 +16,8 @@ module Metanorma
       @aliases = { csd: :cc, m3d: :m3aawg, mpfd: :mpfa, csand: :csa }
     end
 
-    def alias(x)
-      @aliases[x]
+    def alias(flavour)
+      @aliases[flavour]
     end
 
     def register(processor)

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "2.0.3".freeze
+  VERSION = "2.0.5".freeze
 end

data/metanorma.gemspec

@@ -46,4 +46,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rubocop", "~> 1.5.2"
   spec.add_development_dependency "sassc", "~> 2.4.0"
   spec.add_development_dependency "simplecov", "~> 0.15"
+  spec.add_development_dependency "xml-c14n"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-22 00:00:00.000000000 Z
+date: 2024-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -262,6 +262,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.15'
+- !ruby/object:Gem::Dependency
+  name: xml-c14n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Library to process any Metanorma standard.
 email:
 - open.source@ribose.com