metanorma 2.0.0 → 2.1.2

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

@@ -1,4 +1,5 @@
 require_relative "../sectionsplit/sectionsplit"
+# require "concurrent-ruby"
 
 module Metanorma
   class Collection
@@ -16,11 +17,25 @@ module Metanorma
 
       def process_section_split_instance(key, manifest)
         s, sectionsplit_manifest = sectionsplit(key)
+        # section_split_instance_threads(s, manifest, key)
         s.each_with_index do |f1, i|
           add_section_split_instance(f1, manifest, key, i)
         end
-        manifest["#{key}:index.html"] =
-          add_section_split_cover(sectionsplit_manifest, key)
+        a = add_section_split_attachments(sectionsplit_manifest, key) and
+          manifest["#{key}:attachments"] = a
+        add_section_split_cover(manifest, sectionsplit_manifest, key)
+      end
+
+      def section_split_instance_threads(s, manifest, key)
+        @mutex = Mutex.new
+        pool = Concurrent::FixedThreadPool.new(4)
+        s.each_with_index do |f1, i|
+          pool.post do
+            add_section_split_instance(f1, manifest, key, i)
+          end
+        end
+        pool.shutdown
+        pool.wait_for_termination
       end
 
       def cleanup_section_split_instance(key, manifest)
@@ -29,37 +44,57 @@ module Metanorma
         @files[key][:indirect_key] = @sectionsplit.key
       end
 
-      def add_section_split_cover(manifest, ident)
+      def add_section_split_cover(manifest, sectionsplit_manifest, ident)
         cover = @sectionsplit
-          .section_split_cover(manifest, @parent.dir_name_cleanse(ident),
+          .section_split_cover(sectionsplit_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) }
+        src = File.join(File.dirname(sectionsplit_manifest.file), cover)
+        m = { attachment: true, index: false, out_path: cover, ref: src }
+        manifest["#{ident}:index.html"] = m
+        one_doc_collection? and
+          add_cover_one_doc_coll(manifest, sectionsplit_manifest, ident, m)
+      end
+
+      def add_cover_one_doc_coll(manifest, sectionsplit_manifest, key, entry)
+        idx = File.join(File.dirname(sectionsplit_manifest.file), "index.html")
+        FileUtils.cp entry[:ref], idx
+        manifest["#{key}:index1.html"] =
+          entry.merge(out_path: "index.html", ref: idx)
       end
 
       def one_doc_collection?
-        return false
         docs = 0
         @files.each_value do |v|
           v[:attachment] and next
           v[:presentationxml] and next
           docs += 1
         end
-        docs > 1
+        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)
-        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 }
+        presfile, newkey, xml = add_section_split_instance_prep(file, key)
+        anchors = read_anchors(xml)
+        m = { parentid: key, presentationxml: true, type: "fileref",
+              rel_path: file[:url], out_path: File.basename(file[:url]),
+              anchors: anchors, anchors_lookup: anchors_lookup(anchors),
+              ids: read_ids(xml),
+              sectionsplit_output: true, indirect_key: @sectionsplit.key,
+              bibdata: @files[key][:bibdata], ref: presfile }
+        m[:bare] = true unless idx.zero?
+        manifest[newkey] = m
         @files_to_delete << file[:url]
-        manifest[newkey][:bare] = true unless idx.zero?
       end
 
       def add_section_split_instance_prep(file, key)
@@ -73,9 +108,11 @@ module Metanorma
       def sectionsplit(ident)
         file = @files[ident][:ref]
         @sectionsplit = ::Metanorma::Collection::Sectionsplit
-          .new(input: file, base: @files[ident][:out_path], dir: File.dirname(file),
-               output: @files[ident][:out_path], compile_opts: @parent.compile_options,
-               fileslookup: self, ident: ident, isodoc: @isodoc)
+          .new(input: file, base: @files[ident][:out_path],
+               dir: File.dirname(file), output: @files[ident][:out_path],
+               compile_opts: @parent.compile_options,
+               fileslookup: self, ident: ident, isodoc: @isodoc,
+               document_suffix: @files[ident][:document_suffix])
         coll = @sectionsplit.sectionsplit.sort_by { |f| f[:order] }
         xml = Nokogiri::XML(File.read(file, encoding: "UTF-8"), &:huge)
         [coll, @sectionsplit

data/lib/metanorma/collection/manifest/manifest.rb

@@ -6,7 +6,7 @@ module Metanorma
   class Collection
     class Manifest
       # @return [Metanorma::Collection]
-      attr_reader :collection, :config
+      attr_reader :collection, :config, :lang, :script
 
       # @param level [String]
       # @param dir [String]
@@ -14,6 +14,7 @@ module Metanorma
       # @param docref [Array<Hash{String=>String}>]
       # @param manifest [Array<Metanorma::Collection::Manifest>]
       def initialize(config, collection, dir)
+        #require "debug"; binding.b
         @collection = collection
         @dir = dir
         @disambig = ::Metanorma::Collection::Util::DisambigFiles.new
@@ -21,6 +22,7 @@ module Metanorma
       end
 
       def manifest_postprocess(config)
+        #require "debug"; binding.b
         manifest_bibdata(config)
         manifest_expand_yaml(config, @dir)
         manifest_compile_adoc(config)
@@ -67,15 +69,15 @@ module Metanorma
         i = x.at("//xmlns:bibdata/xmlns:docidentifier[@primary = 'true']") ||
           x.at("//xmlns:bibdata/xmlns:docidentifier")
         i or return nil
-        @doctype ||= i["type"]&.downcase || "standoc"
+        @flavor = @collection.flavor
         load_isodoc
         Util::key(@isodoc.docid_prefix(i["type"], i.text))
       end
 
       def load_isodoc
         @isodoc and return
-        @collection.compile.load_flavor(@doctype)
-        @isodoc = Util::load_isodoc(@doctype)
+        @collection.compile.load_flavor(@flavor)
+        @isodoc = Util::load_isodoc(@flavor)
         @isodoc.i18n_init(@lang, @script, nil) # for @i18n.all_parts in docid
       end
 
@@ -94,6 +96,7 @@ module Metanorma
 
       def manifest_filexist(config)
         if config.file
+        #require "debug"; binding.b
           file = @collection.class.resolve_fileref(@dir, config.file)
           @collection.class.check_file_existence(file)
           config.file = Pathname.new(file).relative_path_from(Pathname.new(@dir))
@@ -108,6 +111,7 @@ module Metanorma
           currdir = dir
           /\.ya?ml$/.match?(e.file) and
             currdir = manifest_expand_yaml_entry(e, dir)
+          #require "debug"; binding.b
           manifest_expand_yaml(e, currdir)
         end
         config
@@ -118,8 +122,10 @@ module Metanorma
         currdir = File.dirname(f)
         @collection.class.check_file_existence(f)
         entry.file = nil
+        #require 'debug'; binding.b
         entry.entry = ::Metanorma::Collection::Config::Config.from_yaml(File.read(f)).manifest
         if currdir != dir
+          #require "debug"; binding.b
           prefix = Pathname.new(currdir).relative_path_from(Pathname.new(dir))
           update_filepaths(entry.entry, prefix.to_s)
         end
@@ -127,6 +133,7 @@ module Metanorma
       end
 
       def update_filepaths(entry, prefix)
+        #require "debug"; binding.b
         entry.file && !(Pathname.new entry.file).absolute? and
           entry.file = File.join(prefix, entry.file)
         entry.entry.each do |f|
@@ -153,7 +160,7 @@ module Metanorma
       def set_adoc2xml(fileref)
         File.join(
           File.dirname(fileref),
-          File.basename(fileref).gsub(/.adoc$/, ".xml"),
+          File.basename(fileref).gsub(/\.adoc$/, ".xml"),
         )
       end
 
@@ -161,17 +168,22 @@ module Metanorma
       # @raise [AdocFileNotFoundException]
       def compile_adoc_file(file)
         f = (Pathname.new file).absolute? ? file : File.join(@dir, file)
-        unless File.exist? f
-          raise AdocFileNotFoundException.new "#{f} not found!"
-        end
-
+        File.exist?(f) or raise AdocFileNotFoundException.new "#{f} not found!"
+        compile_adoc_file?(file) or return
         ::Metanorma::Util.log("[metanorma] Info: Compiling #{f}...", :info)
         ::Metanorma::Compile.new
-          .compile(f, agree_to_terms: true, no_install_fonts: true,
+          .compile(f, agree_to_terms: true, install_fonts: false,
                       extension_keys: [:xml])
         ::Metanorma::Util.log("[metanorma] Info: Compiling #{f}...done!", :info)
       end
 
+      def compile_adoc_file?(file)
+        @collection.directives.detect do |d|
+          d.key == "recompile-xml"
+        end and return true
+        !File.exist?(file.sub(/\.adoc$/, ".xml"))
+      end
+
       def documents(mnf = @config)
         Array(mnf.entry).each_with_object({}) do |dr, m|
           if dr.file