metanorma 1.5.12 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90e1529fc811c113969832dbfd36a70a77d8458259e775ad4967475a95bfdaac
-  data.tar.gz: 488a0f5e809991464ee2fa0fe9a6bc4cae50795fac9ca0ea7db76139b0dc84ec
+  metadata.gz: 284943566222cba73b11d131aaa2ce1da77851a8ed5acd60bd11675f78c99eb3
+  data.tar.gz: 6cd2ed331a36e1168169e495183cf92205076b7305fa8e1383424b844f5c114e
 SHA512:
-  metadata.gz: 911e73b153257019ad46635218dd5d90f0f1ef85cab5e0a3229603727d3ff7c79b88c8c140b24ad5254b94b97622e5ce9cc4e48b8d15e1442330c3c6c05165b6
-  data.tar.gz: 7c93266f48b1ad6f4bf11a715d9ddcdffdc4b98f910da8ca8c99f55fef412741c40eb2d303e5be92bbfde7b58560b1694f342e1f7026ecac3b1f752e0379ba86
+  metadata.gz: 7a8d401ebdbe17ab843c6ed40113bc4a4b29f5fb78fc7ac0adfb5fb3f1e91056f892efcfb5fc5e26cf74676f0f93e23d3c5933ed88422a7b34f8bef80466ba16
+  data.tar.gz: 1a37a1b0598b2b20dfbbfabed2762d2e5671949f47eb7a830931ba8660edd7a4cf28b551ca42951762edaa21e1bdf5160aff3162163cdca02f3c221e1a3705a3

data/lib/metanorma/collection_fileparse.rb

@@ -1,6 +1,7 @@
 module Metanorma
   # XML collection renderer
   class CollectionRenderer
+=begin
     # map locality type and label (e.g. "clause" "1") to id = anchor for
     # a document
     # Note: will only key clauses, which have unambiguous reference label in
@@ -35,6 +36,7 @@ module Metanorma
       filename = "#{id}.html"
       [file, filename]
     end
+=end
 
     # @param bib [Nokogiri::XML::Element]
     # @param identifier [String]
@@ -42,8 +44,8 @@ module Metanorma
       docid = get_bibitem_docid(bib, identifier) or return
       newbib = dup_bibitem(docid, bib)
       bib.replace(newbib)
-      _file, url = targetfile(@files[docid], relative: true, read: false,
-                                             doc: !@files[docid][:attachment])
+      #_file, url = targetfile(@files[docid], relative: true, read: false, doc: !@files[docid][:attachment])
+      _file, url = @files.targetfile_id(docid, relative: true, read: false, doc: !@files.get(docid,:attachment))
       uri_node = Nokogiri::XML::Node.new "uri", newbib.document
       uri_node[:type] = "citation"
       uri_node.content = url
@@ -55,9 +57,11 @@ module Metanorma
       docid = bib.at(ns("./docidentifier[not(@type)]")) ||
         bib.at(ns("./docidentifier"))
       docid &&= @c.decode(@isodoc
-          .docid_prefix(docid["type"], docid.children.to_xml))
-      if @files[docid] then docid
+          .docid_prefix(docid["type"], docid.children.to_xml)).gsub(/\s/, " ")
+      #if @files[docid] then docid
+      if @files.get(docid) || @files.get("X #{docid}") then docid
       else
+        #require "debug"; binding.b
         fail_update_bibitem(docid, identifier)
         nil
       end
@@ -71,7 +75,8 @@ module Metanorma
     end
 
     def dup_bibitem(docid, bib)
-      newbib = @files[docid][:bibdata].dup
+      #newbib = @files[docid][:bibdata].dup
+      newbib = @files.get(docid,:bibdata).dup
       newbib.name = "bibitem"
       newbib["hidden"] = "true"
       newbib&.at("./*[local-name() = 'ext']")&.remove
@@ -93,7 +98,7 @@ module Metanorma
       docxml = Nokogiri::XML(file) { |config| config.huge }
       supply_repo_ids(docxml)
       update_indirect_refs_to_docs(docxml, internal_refs)
-      add_document_suffix(identifier, docxml)
+      @files.add_document_suffix(identifier, docxml)
       update_direct_refs_to_docs(docxml, identifier)
       svgmap_resolve(datauri_encode(docxml))
       hide_refs(docxml)
@@ -112,9 +117,12 @@ module Metanorma
         next if b&.at(ns("./docidentifier[@type = 'repository']"))
 
         b.xpath(ns("./docidentifier")).each do |docid|
-          id = @c.decode(@isodoc
-          .docid_prefix(docid["type"], docid.children.to_xml))
-          @files[id] or next
+          #id = @c.decode(@isodoc
+          #.docid_prefix(docid["type"], docid.children.to_xml))
+          id = @isodoc
+          .docid_prefix(docid["type"], docid.children.to_xml)
+          #@files[id] or next
+          @files.get(id) or next
           docid.next = "<docidentifier type='repository'>" \
                        "current-metanorma-collection/#{id}"
         end
@@ -205,7 +213,8 @@ module Metanorma
     # disambiguating document suffix on id
     def update_anchors(bib, docxml, docid) # rubocop:disable Metrics/AbcSize
       docxml.xpath("//xmlns:eref[@citeas = '#{docid}']").each do |e|
-        if @files[docid] then update_anchor_loc(bib, e, docid)
+        #if @files[docid] then update_anchor_loc(bib, e, docid)
+        if @files.get(docid) then update_anchor_loc(bib, e, docid)
         else
           e << "<strong>** Unresolved reference to document #{docid} " \
                "from eref</strong>"
@@ -219,7 +228,8 @@ module Metanorma
       document_suffix = Metanorma::Utils::to_ncname(docid)
       ref = loc.at(ns("./referenceFrom")) or return
       anchor = "#{ref.text}_#{document_suffix}"
-      return unless @files[docid][:anchors].inject([]) do |m, (_, x)|
+      #return unless @files[docid][:anchors].inject([]) do |m, (_, x)|
+      return unless @files.get(docid,:anchors).inject([]) do |m, (_, x)|
         m += x.values
       end.include?(anchor)
 
@@ -233,16 +243,20 @@ module Metanorma
       type = ins.at(ns("./locality/@type"))&.text
       type = "clause" if type == "annex"
       ref = ins.at(ns("./locality/referenceFrom"))&.text
-      anchor = @files[docid][:anchors].dig(type, ref) or return
+      #anchor = @files[docid][:anchors].dig(type, ref) or return
+      anchor = @files.get(docid,:anchors).dig(type, ref) or return
       ins << "<locality type='anchor'><referenceFrom>#{anchor.sub(/^_/, '')}" \
              "</referenceFrom></locality>"
     end
 
     # gather internal bibitem references
     def gather_internal_refs
-      @files.each_with_object({}) do |(_, x), refs|
-        x[:attachment] and next
-        file, = targetfile(x, read: true)
+      #@files.each.with_object({}) do |(_, x), refs|
+      @files.keys.each_with_object({}) do |i, refs|
+        #x[:attachment] and next
+        @files.get(i,:attachment) and next
+        #file, = targetfile(x, read: true)
+        file, = @files.targetfile_id(i, read: true)
         Nokogiri::XML(file)
           .xpath(ns("//bibitem[@type = 'internal']/" \
                     "docidentifier[@type = 'repository']")).each do |d|
@@ -256,10 +270,14 @@ module Metanorma
 
     # resolve file location for the target of each internal reference
     def locate_internal_refs
+      #require 'debug'; binding.b
       refs = gather_internal_refs
-      @files.keys.reject { |k| @files[k][:attachment] }.each do |identifier|
-        id = @c.decode(@isodoc.docid_prefix("", identifier.dup))
-        locate_internal_refs1(refs, identifier, @files[id])
+      #@files.keys.reject { |k| @files[k][:attachment] }.each do |identifier|
+      @files.keys.reject { |k| @files.get(k,:attachment) }.each do |identifier|
+        #id = @c.decode(@isodoc.docid_prefix("", identifier.dup))
+        #locate_internal_refs1(refs, identifier, @files[id])
+        id = @isodoc.docid_prefix("", identifier.dup)
+        locate_internal_refs1(refs, identifier, id)
       end
       refs.each do |schema, ids|
         ids.each do |id, key|
@@ -269,8 +287,10 @@ module Metanorma
       refs
     end
 
-    def locate_internal_refs1(refs, identifier, filedesc)
-      file, _filename = targetfile(filedesc, read: true)
+    #def locate_internal_refs1(refs, identifier, filedesc)
+    def locate_internal_refs1(refs, identifier, ident)
+      #file, _filename = targetfile(filedesc, read: true)
+      file, _filename = @files.targetfile_id(ident, read: true)
       xml = Nokogiri::XML(file) { |config| config.huge }
       t = xml.xpath("//*/@id").each_with_object({}) { |i, x| x[i.text] = true }
       refs.each do |schema, ids|

data/lib/metanorma/collection_fileprocess.rb

@@ -7,6 +7,7 @@ require_relative "collection_fileparse"
 module Metanorma
   # XML collection renderer
   class CollectionRenderer
+=begin
     # hash for each document in collection of document identifier to:
     # document reference (fileref or id), type of document reference,
     # and bibdata entry for that file
@@ -165,51 +166,64 @@ module Metanorma
       filename.sub!(/\.xml$/, ".html") if doc
       [file, filename]
     end
+=end
 
     # compile and output individual file in collection
     # warn "metanorma compile -x html #{f.path}"
     def file_compile(file, filename, identifier)
-      return if @files[identifier][:sectionsplit] == "true"
+      #return if @files[identifier][:sectionsplit] == "true"
+      return if @files.get(identifier,:sectionsplit) == "true"
 
       opts = {
         format: :asciidoc,
         extension_keys: @format,
         output_dir: @outdir,
-      }.merge(compile_options(identifier))
+      }.merge(compile_options_update(identifier))
 
       @compile.compile file, opts
-      @files[identifier][:outputs] = {}
+      #@files[identifier][:outputs] = {}
+      @files.set(identifier,:outputs, {})
       file_compile_formats(filename, identifier)
     end
 
-    def compile_options(identifier)
+    def compile_options_update(identifier)
       ret = @compile_options.dup
       Array(@directives).include?("presentation-xml") ||
-        @files[identifier][:presentationxml] and
+        #@files[identifier][:presentationxml] and
+        @files.get(identifier,:presentationxml) and
         ret.merge!(passthrough_presentation_xml: true)
-      @files[identifier][:sectionsplit] == "true" and
+      #@files[identifier][:sectionsplit] == "true" and
+      @files.get(identifier,:sectionsplit) == "true" and
         ret.merge!(sectionsplit: "true")
-      @files[identifier][:bare] == true and
+      #@files[identifier][:bare] == true and
+      @files.get(identifier,:bare) == true and
         ret.merge!(bare: true)
       ret
     end
 
     def file_compile_formats(filename, identifier)
-      file_id = @files[identifier]
+      #file_id = @files[identifier]
+      f = @files.get(identifier, :outputs)
       @format << :presentation if @format.include?(:pdf)
       @format.each do |e|
         ext = @compile.processor.output_formats[e]
         fn = File.basename(filename).sub(/(?<=\.)[^.]+$/, ext.to_s)
-        unless /html$/.match?(ext) && file_id[:sectionsplit]
-          file_id[:outputs][e] = File.join(@outdir, fn)
+        #unless /html$/.match?(ext) && file_id[:sectionsplit]
+        unless /html$/.match?(ext) && @files.get(identifier, :sectionsplit)
+          #file_id[:outputs][e] = File.join(@outdir, fn)
+          f[e] = File.join(@outdir, fn)
         end
       end
+      @files.set(identifier,:outputs, f)
     end
 
-    def copy_file_to_dest(fileref)
-      dest = File.join(@outdir, fileref[:out_path])
+    #def copy_file_to_dest(fileref)
+    def copy_file_to_dest(identifier)
+      dest = File.join(@outdir, @files.get(identifier,:out_path))
       FileUtils.mkdir_p(File.dirname(dest))
-      FileUtils.cp fileref[:ref], dest
+      #FileUtils.cp fileref[:ref], dest
+      #require "debug"; binding.b
+      FileUtils.cp @files.get(identifier,:ref), dest
     end
 
     # process each file in the collection
@@ -217,12 +231,15 @@ module Metanorma
     def files # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       warn "\n\n\n\n\nInternal Refs: #{DateTime.now.strftime('%H:%M:%S')}"
       internal_refs = locate_internal_refs
-      @files.each_with_index do |(identifier, x), i|
+      #@files.each_with_index do |(identifier, x), i|
+      @files.keys.each_with_index do |identifier, i|
         i.positive? && Array(@directives).include?("bare-after-first") and
           @compile_options.merge!(bare: true)
-        if x[:attachment] then copy_file_to_dest(x)
+        #if x[:attachment] then copy_file_to_dest(x)
+        if @files.get(identifier,:attachment) then copy_file_to_dest(identifier)
         else
-          file, filename = targetfile(x, read: true)
+          #file, filename = @files.targetfile(x, read: true)
+          file, filename = @files.targetfile_id(identifier, read: true)
           warn "\n\n\n\n\nProcess #{filename}: #{DateTime.now.strftime('%H:%M:%S')}"
           collection_xml = update_xrefs(file, identifier, internal_refs)
           collection_filename = File.basename(filename, File.extname(filename))

data/lib/metanorma/collection_renderer.rb

@@ -5,6 +5,7 @@ require "htmlentities"
 require_relative "collection_fileprocess"
 require_relative "fontist_utils"
 require_relative "util"
+require_relative "files_lookup"
 
 module Metanorma
   # XML collection renderer
@@ -12,6 +13,7 @@ module Metanorma
     FORMATS = %i[html xml doc pdf].freeze
 
     attr_accessor :isodoc
+    attr_reader :xml, :compile, :compile_options, :documents
 
     # This is only going to render the HTML collection
     # @param xml [Metanorma::Collection] input XML collection
@@ -49,8 +51,9 @@ module Metanorma
       @c = HTMLEntities.new
 
       # list of files in the collection
-      @files = read_files folder
-      @isodoc = isodoc_populate # output processor for flavour
+      #@files = read_files folder
+      @files = Metanorma::FileLookup.new(folder, self)
+      isodoc_populate
       create_non_existing_directory(@outdir)
     end
 
@@ -100,11 +103,14 @@ module Metanorma
     def concatenate1(out, ext)
       out.directives << "documents-inline"
       out.bibdatas.each_key do |ident|
-        id = @c.decode(@isodoc.docid_prefix(nil, ident.dup))
-        @files[id][:attachment] || @files[id][:outputs].nil? and next
+        #id = @c.decode(@isodoc.docid_prefix(nil, ident.dup))
+        #@files[id][:attachment] || @files[id][:outputs].nil? and next
+        id = @isodoc.docid_prefix(nil, ident.dup)
+        @files.get(id,:attachment) || @files.get(id,:outputs).nil? and next
 
         out.documents[id] =
-          Metanorma::Document.raw_file(@files[id][:outputs][ext])
+          #Metanorma::Document.raw_file(@files[id][:outputs][ext])
+          Metanorma::Document.raw_file(@files.get(id,:outputs)[ext])
       end
       out
     end
@@ -147,16 +153,14 @@ module Metanorma
       # create the @meta class of isodoc, for populating Liquid,
       # with "navigation" set to the index bar.
       # extracted from the manifest
-      isodoc = isodoc_create
-      isodoc.meta.set(:navigation, indexfile(@xml.at(ns("//manifest"))))
-      isodoc.meta.set(:docrefs, liquid_docrefs)
-      isodoc.meta.set(:"prefatory-content",
-                      isodoc_builder(isodoc,
+      @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.meta.set(:"final-content",
                       isodoc_builder(isodoc, @xml.at(ns("//final-content"))))
-      isodoc.info(@xml, nil)
-      isodoc
+      @isodoc.info(@xml, nil)
     end
 
     def isodoc_builder(isodoc, node)
@@ -229,7 +233,8 @@ module Metanorma
 
     def index_link(docref, ident)
       if docref["fileref"]
-        @files[ident][:out_path].sub(/\.xml$/, ".html")
+        #@files[ident][:out_path].sub(/\.xml$/, ".html")
+        @files.get(ident,:out_path).sub(/\.xml$/, ".html")
       else "#{docref['id']}.html"
       end
     end

data/lib/metanorma/compile.rb

@@ -109,7 +109,7 @@ module Metanorma
 
     def process_exts_run(fnames, file, isodoc, extensions, options)
       Util.sort_extensions_execution(extensions).each do |ext|
-        process_ext(ext, file, isodoc, fnames, options)
+        process_ext(ext, file, isodoc, fnames, options) or break
       end
     end
 
@@ -124,7 +124,7 @@ module Metanorma
       fnames[:ext] = @processor.output_formats[ext]
       fnames[:out] = fnames[:f].sub(/\.[^.]+$/, ".#{fnames[:ext]}")
       isodoc_options = get_isodoc_options(file, options, ext)
-      thread = nil
+      thread = true
       unless process_ext_simple(ext, isodoc, fnames, options,
                                 isodoc_options)
         thread = process_exts1(ext, fnames, isodoc, options, isodoc_options)
@@ -162,28 +162,30 @@ module Metanorma
                         isodoc_options1)
       wrap_html(options1, fnames1[:ext], fnames1[:out])
     rescue StandardError => e
-      strict = ext == :presentation || isodoc_options1[:strict] == "true"
-      isodoc_error_process(e, strict)
+      strict = ext == :presentation || isodoc_options1[:strict] == true
+      isodoc_error_process(e, strict, false)
     end
 
     def process_output_unthreaded(ext, fnames, isodoc, isodoc_options)
       @processor.output(isodoc, fnames[:xml], fnames[:out], ext,
                         isodoc_options)
-      nil # return as Thread
+      true # return as Thread
     rescue StandardError => e
       strict = ext == :presentation || isodoc_options[:strict] == "true"
-      isodoc_error_process(e, strict)
+      isodoc_error_process(e, strict, true)
+      ext != :presentation
     end
 
     private
 
-    def isodoc_error_process(err, strict)
+    def isodoc_error_process(err, strict, must_abort)
       if strict || err.message.include?("Fatal:")
         @errors << err.message
       else
         puts err.message
       end
       puts err.backtrace.join("\n")
+      must_abort and 1
     end
 
     # @param options [Hash]

data/lib/metanorma/files_lookup.rb

@@ -0,0 +1,255 @@
+require "isodoc"
+require "htmlentities"
+require "metanorma-utils"
+
+module Metanorma
+  # XML collection renderer
+  class FileLookup
+    # hash for each document in collection of document identifier to:
+    # document reference (fileref or id), type of document reference,
+    # and bibdata entry for that file
+    # @param path [String] path to collection
+    def initialize(path, parent)
+      @c = HTMLEntities.new
+      @files = {}
+      @parent = parent
+      @xml = parent.xml
+      @isodoc = parent.isodoc
+      @path = path
+      @compile = parent.compile
+      @documents = parent.documents
+      read_files
+    end
+
+    def read_files
+      @xml.xpath(ns("//docref")).each { |d| read_file(d) }
+      add_section_split
+    end
+
+    def read_file(docref)
+      ident = docref.at(ns("./identifier"))
+      i = key(@isodoc.docid_prefix(ident["type"], ident.children.to_xml))
+      entry = file_entry(docref, ident.children.to_xml)
+      bibdata_process(entry, i)
+      bibitem_process(entry)
+      @files[i] = entry
+    end
+
+    def bibdata_process(entry, identifier)
+      if entry[:attachment]
+        entry[:bibdata] = Metanorma::Document
+          .attachment_bibitem(identifier).root
+      else
+        file, _filename = targetfile(entry, read: true)
+        xml = Nokogiri::XML(file)
+        add_document_suffix(identifier, xml)
+        entry[:anchors] = read_anchors(xml)
+        entry[:bibdata] = xml.at(ns("//bibdata"))
+      end
+    end
+
+    def bibitem_process(entry)
+      entry[:bibitem] = entry[:bibdata].dup
+      entry[:bibitem].name = "bibitem"
+      entry[:bibitem]["hidden"] = "true"
+      entry[:bibitem].at("./*[local-name() = 'ext']")&.remove
+    end
+
+    def add_section_split
+        #require "debug"; binding.b
+      ret = @files.keys.each_with_object({}) do |k, m|
+        if @files[k][:sectionsplit] == "true" && !@files[k]["attachment"]
+          s, manifest = sectionsplit(@files[k][:ref])
+          s.each_with_index do |f1, i|
+            add_section_split_instance(f1, m, k, i)
+          end
+          m["#{k}:index.html"] = add_section_split_cover(manifest, k)
+        end
+        m[k] = @files[k]
+        #require "debug"; binding.b
+      end
+      @files = ret
+    end
+
+    def add_section_split_cover(manifest, ident)
+      cover = 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 section_split_cover(col, ident)
+      dir = File.dirname(col.file)
+      @compile.collection_setup(nil, dir)
+      #require "debug";binding.b
+      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")
+      FileUtils.rm_rf "#{ident}_collection"
+      "#{ident}_index.html"
+    end
+
+    def add_section_split_instance(file, manifest, key, idx)
+      presfile = File.join(File.dirname(@files[key][:ref]),
+                           File.basename(file[:url]))
+      newkey = key("#{key.strip} #{file[:title]}")
+      manifest[newkey] =
+        { parentid: key, presentationxml: true, type: "fileref",
+          rel_path: file[:url], out_path: File.basename(file[:url]),
+          anchors: read_anchors(Nokogiri::XML(File.read(presfile))),
+          bibdata: @files[key][:bibdata], ref: presfile }
+      manifest[newkey][:bare] = true unless idx.zero?
+    end
+
+    def sectionsplit(file)
+      #require "debug"; binding.b
+      @compile.compile(
+        file, { format: :asciidoc, extension_keys: [:presentation] }
+        .merge(@parent.compile_options)
+      )
+      r = file.sub(/\.xml$/, ".presentation.xml")
+      xml = Nokogiri::XML(File.read(r))
+      s = @compile.sectionsplit(xml, File.basename(r), File.dirname(r))
+        .sort_by { |f| f[:order] }
+      [s, @compile.collection_manifest(File.basename(r), s, xml, nil,
+                                       File.dirname(r))]
+    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"])
+      ret = if ref["fileref"]
+              { type: "fileref", ref: @documents[identifier].file,
+                rel_path: ref["fileref"], out_path: out }
+            else { type: "id", ref: ref["id"] } end
+      %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)
+      doc.xpath(ns("//#{tag_name}[@#{attribute_name}]")).each do |elem|
+        elem.attributes[attribute_name].value =
+          "#{elem.attributes[attribute_name].value}_#{suffix}"
+      end
+    end
+
+    def add_document_suffix(identifier, doc)
+      document_suffix = Metanorma::Utils::to_ncname(identifier)
+      Metanorma::Utils::anchor_attributes.each do |(tag_name, attribute_name)|
+        add_suffix_to_attributes(doc, document_suffix, tag_name, attribute_name)
+      end
+      url_in_css_styles(doc, document_suffix)
+    end
+
+    # update relative URLs, url(#...), in CSS in @style attrs (including SVG)
+    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})")
+      end
+    end
+
+    # return file contents + output filename for each file in the collection,
+    # given a docref entry
+    # @param data [Hash] docref entry
+    # @param read [Boolean] read the file in and return it
+    # @param doc [Boolean] I am a Metanorma document,
+    # so my URL should end with html or pdf or whatever
+    # @param relative [Boolean] Return output path,
+    # formed relative to YAML file, not input path, relative to calling function
+    # @return [Array<String, nil>]
+    def targetfile(data, options)
+      options = { read: false, doc: true, relative: false }.merge(options)
+      path = options[:relative] ? data[:rel_path] : data[:ref]
+      if data[:type] == "fileref"
+        ref_file path, data[:out_path], options[:read], options[:doc]
+      else
+        xml_file data[:id], options[:read]
+      end
+    end
+
+    def targetfile_id(ident, options)
+      targetfile(get(ident), options)
+    end
+
+    def ref_file(ref, out, read, doc)
+      file = File.read(ref, encoding: "utf-8") if read
+      filename = out.dup
+      filename.sub!(/\.xml$/, ".html") if doc
+      [file, filename]
+    end
+
+    def xml_file(id, read)
+      file = @xml.at(ns("//doc-container[@id = '#{id}']")).to_xml if read
+      filename = "#{id}.html"
+      [file, filename]
+    end
+
+    # map locality type and label (e.g. "clause" "1") to id = anchor for
+    # a document
+    # Note: will only key clauses, which have unambiguous reference label in
+    # locality. Notes, examples etc with containers are just plunked against
+    # UUIDs, so that their IDs can at least be registered to be tracked
+    # as existing.
+    def read_anchors(xml)
+      xrefs = @isodoc.xref_init(@lang, @script, @isodoc, @isodoc.i18n,
+                                { locale: @locale })
+      xrefs.parse xml
+      xrefs.get.each_with_object({}) do |(k, v), ret|
+        read_anchors1(k, v, ret)
+      end
+    end
+
+    def read_anchors1(key, val, ret)
+      val[:type] ||= "clause"
+      ret[val[:type]] ||= {}
+      index = if val[:container] || val[:label].nil? || val[:label].empty?
+                UUIDTools::UUID.random_create.to_s
+              else val[:label]
+              end
+      ret[val[:type]][index] = key
+      ret[val[:type]][val[:value]] = key if val[:value]
+    end
+
+    def key(ident)
+      @c.decode(ident).gsub(/(\s|[ ])+/, " ")
+    end
+
+    def keys
+      @files.keys
+    end
+
+    def get(ident, attr = nil)
+      if attr
+        @files[key(ident)][attr]
+      else
+        @files[key(ident)]
+      end
+    end
+
+    def set(ident, attr, value)
+      @files[key(ident)][attr] = value
+    end
+
+    def each
+      @files.each
+    end
+
+    def each_with_index
+      @files.each_with_index
+    end
+
+    def ns(xpath)
+      @isodoc.ns(xpath)
+    end
+  end
+end

data/lib/metanorma/sectionsplit.rb

@@ -50,7 +50,7 @@ module Metanorma
             <body>
               <h1>{{ doctitle }}</h1>
               <h2>{{ docnumber }}</h2>
-              <nav>{{ labels["navigation"] }}</nav>
+              <nav>{{ navigation }}</nav>
             </body>
         </html>
       COVER
@@ -60,7 +60,7 @@ module Metanorma
       [["//preface/*", "preface"], ["//sections/*", "sections"],
        ["//annex", nil],
        ["//bibliography/*[not(@hidden = 'true')]", "bibliography"],
-       ["//indexsect", nil]].freeze
+       ["//indexsect", nil], ["//colophon", nil]].freeze
 
     def sectionsplit(xml, filename, dir)
       @key = xref_preprocess(xml)
@@ -76,8 +76,9 @@ module Metanorma
     def emptydoc(xml)
       out = xml.dup
       out.xpath(
-        ns("//preface | //sections | //annex | //bibliography/clause | "\
-           "//bibliography/references[not(@hidden = 'true')] | //indexsect"),
+        ns("//preface | //sections | //annex | //bibliography/clause | " \
+           "//bibliography/references[not(@hidden = 'true')] | //indexsect" \
+           "//colophon"),
       ).each(&:remove)
       out
     end
@@ -123,7 +124,7 @@ module Metanorma
           next unless /^#/.match? a["href"]
 
           a["href"] = a["href"].sub(/^#/, "")
-          m << "<target href='#{a['href']}'>"\
+          m << "<target href='#{a['href']}'>" \
                "<xref target='#{a['href']}'/></target>"
         end
       end
@@ -137,7 +138,7 @@ module Metanorma
     end
 
     def make_anchor(anchor)
-      "<localityStack><locality type='anchor'><referenceFrom>"\
+      "<localityStack><locality type='anchor'><referenceFrom>" \
         "#{anchor}</referenceFrom></locality></localityStack>"
     end
 
@@ -155,7 +156,7 @@ module Metanorma
     def eref_to_internal_eref(section, xml, key)
       eref_to_internal_eref_select(section, xml).each_with_object([]) do |x, m|
         url = xml.at(ns("//bibitem[@id = '#{x}']/uri[@type = 'citation']"))
-        section.xpath(("//*[@bibitemid = '#{x}']")).each do |e|
+        section.xpath("//*[@bibitemid = '#{x}']").each do |e|
           id = eref_to_internal_eref1(e, key, url)
           id and m << id
         end
@@ -176,10 +177,10 @@ module Metanorma
     end
 
     def eref_to_internal_eref_select(section, xml)
-      refs = section.xpath(("//*/@bibitemid")).map { |x| x.text } # rubocop:disable Style/SymbolProc
+      refs = section.xpath("//*/@bibitemid").map { |x| x.text } # rubocop:disable Style/SymbolProc
       refs.uniq.reject do |x|
         xml.at(ns("//bibitem[@id = '#{x}'][@type = 'internal']")) ||
-          xml.at(ns("//bibitem[@id = '#{x}']"\
+          xml.at(ns("//bibitem[@id = '#{x}']" \
                     "[docidentifier/@type = 'repository']"))
       end
     end

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "1.5.12".freeze
+  VERSION = "1.6.1".freeze
 end

data/metanorma.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "asciidoctor"
   spec.add_runtime_dependency "fontist", ">= 1.14.3"
   spec.add_runtime_dependency "htmlentities"
-  spec.add_runtime_dependency "isodoc", ">= 2.5.4"
+  spec.add_runtime_dependency "isodoc", ">= 2.6.1"
   spec.add_runtime_dependency "mn2pdf", "~> 1"
   spec.add_runtime_dependency "nokogiri"
   spec.add_runtime_dependency "pry"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 1.5.12
+  version: 1.6.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-24 00:00:00.000000000 Z
+date: 2023-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.4
+        version: 2.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.4
+        version: 2.6.1
 - !ruby/object:Gem::Dependency
   name: mn2pdf
   requirement: !ruby/object:Gem::Requirement
@@ -267,6 +267,7 @@ files:
 - lib/metanorma/config.rb
 - lib/metanorma/document.rb
 - lib/metanorma/extract.rb
+- lib/metanorma/files_lookup.rb
 - lib/metanorma/fontist_utils.rb
 - lib/metanorma/input.rb
 - lib/metanorma/input/asciidoc.rb