metanorma 1.6.4 → 1.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abbc191b2e898bbeeea46f7867bb9d25d44cfd7f9a0dd2c690fcbdb8383136fd
-  data.tar.gz: a9e184662fcf25a575c278d604440b8215fd7b54b76f980a4cf4bfd5f8a1f543
+  metadata.gz: e4bbd3fdfd37664da0a7f9e91cbecfcb0f7cdd49c004cf75eaa122c366ea6fba
+  data.tar.gz: 6b61241e1010ed465995c23447b4828503495d8f4fb2366e64babe0ae6d0726e
 SHA512:
-  metadata.gz: bfc28efd7f7f48f0bfd7dfa630bf88f1186006022dc6d5f82f188a3749304bc73837c9e96dd9246655de67f2b1ee29d9525f49c2ba568e2116d4329bf3689bda
-  data.tar.gz: 40bc185f4dbe9b4570349e22a15334a2e3fb089dfe3002ab43cb4a8ffa4afe4f2a3ae8357f80e61d585a57ab3b64e24dd5fb2700241dd6f1b958693214afdbc6
+  metadata.gz: dc05aa1c9d8aec0e6d45b537e10a130f88e715116f0dd92820e73588ff5a6542a7f2f92099e504654d2ed21e4e95c4bd84c0b260e24f923720b38ae298455f33
+  data.tar.gz: 870e182c05914d484180fd19360bfe1010cb9b57ed926926d76ba6cde3d9f2adbf2cb98e5d7e44702f2024cd51b52347524b9fb0ac28c0463d01b3d1dfc9d7b6

data/lib/metanorma/collection_fileparse.rb

@@ -102,7 +102,7 @@ module Metanorma
     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 =~ /^#/ && !ids[href.sub(/^#/, "")])
 
@@ -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

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

@@ -26,6 +26,7 @@ module Metanorma
     end
 
     def read_files
+      @disambig = Util::DisambigFiles.new
       @xml.xpath(ns("//docref")).each { |d| read_file(d) }
     end
 
@@ -65,15 +66,22 @@ module Metanorma
     # 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

@@ -4,7 +4,7 @@ module Metanorma
     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, 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]
@@ -54,10 +54,10 @@ module Metanorma
       [presfile, newkey, xml]
     end
 
-    def sectionsplit(file, ident)
+    def sectionsplit(file, outfile, ident)
       @sectionsplit = Sectionsplit
-        .new(input: file, base: File.basename(file), dir: File.dirname(file),
-             output: file, compile_options: @parent.compile_options,
+        .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)

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/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.4".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.4
+  version: 1.6.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-09 00:00:00.000000000 Z
+date: 2023-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor