metanorma 2.0.5 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6416bb8205d8f155d6affc6566e882a0cc161b16e6753e0df39be3818fb369b
-  data.tar.gz: ecfc71eb0cecda61acd433a6a2a1512415375f69a38a9bb2c4f5f779d7ca38f4
+  metadata.gz: 6cf068df8203ed463672bcbef38ca1f5f1483ac2e08c9c37ee2236777dc86fad
+  data.tar.gz: 67c17ad923912cdf66f69b539691525a60751725e8f3d918fca5030d858661c7
 SHA512:
-  metadata.gz: '0989d2e8fe2373f3e10733fca8e562839e6e264e3e45abc58782ab0d7ec5de8965fefc5a944154acab16968ed6292a42c000454791e782333b8cd47c5b51fce5'
-  data.tar.gz: 9004900c903b5cd1fe081cb4ca663a8caf0c0f2a4e016024accce10873261ccd3dacac953a1686a49d647cbe0d4f1914327304df9366ad3530a42078869cda84
+  metadata.gz: b33588bb9dbd2f0e63c7438bf3739e3c46698be76566d4430658f12284c8221bd0c2532ae86318dcae0a4b1df90e7e270b12405e120bdd076ee18e4f85933820
+  data.tar.gz: 186204d57aa31ab72ea3454ea5e20b9d7b3506bcbe501c6e0c44312e22d26e83cfd1fd7b355ac3358b15cba24d234c55cbd2af369343974a34ac7cfef262c3a6

data/lib/metanorma/collection/collection.rb

@@ -28,11 +28,16 @@ module Metanorma
     def initialize(**args)
       @file = args[:file]
       @dirname = File.expand_path(File.dirname(@file)) # feeds @manifest
-      @documents = args[:documents] || {} # feeds initialize_directives
+      @documents = args[:documents] || {} # feeds initialize_directives, initialize_docs
       @bibdatas = args[:documents] || {}
       initialize_vars
       initialize_config(args[:config])
       initialize_directives
+      initialize_docs
+      validate_flavor(flavor)
+    end
+
+    def initialize_docs
       @documents.merge! @manifest.documents
       @bibdatas.merge! @manifest.documents
       @documents.transform_keys { |k| Util::key(k) }
@@ -53,12 +58,15 @@ module Metanorma
       @final = config.final_content
       @manifest = ::Metanorma::Collection::Manifest
         .new(config.manifest, self, @dirname) # feeds initialize_directives
+      @format = config.format.map(&:to_sym)
+      @format&.empty? and @format = nil
     end
 
     def initialize_directives
       d = @directives.each_with_object({}) { |x, m| m[x.key] = x.value }
       @coverpage = d["coverpage"]
       @coverpage_style = d["coverpage-style"]
+      @flavor = d["flavor"]
       if (@documents.any? || @manifest) && !d.key?("documents-inline") &&
           !d.key?("documents-external")
         @directives << ::Metanorma::Collection::Config::Directive
@@ -66,6 +74,10 @@ module Metanorma
       end
     end
 
+    def validate_flavor(flavor)
+      ::Metanorma::Compile.new.load_flavor(flavor)
+    end
+
     def clean_exit
       @log.write(File.join(@dirname,
                            "#{File.basename(@file, '.*')}.err.html"))
@@ -82,8 +94,12 @@ 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)
+      if opts[:format].nil? || opts[:format].empty?
+        opts[:format] = @format || [:html]
+      end
+      opts[:log] = @log
+      opts[:flavor] = @flavor
+      ::Metanorma::Collection::Renderer.render self, opts
       clean_exit
     end
 
@@ -103,7 +119,7 @@ module Metanorma
     # @param builder [Nokogiri::XML::Builder]
     def content_to_xml(elm, builder)
       (cnt = send(elm)) or return
-      @compile.load_flavor(doctype)
+      @compile.load_flavor(flavor)
       out = sections(dummy_header + cnt.strip)
       builder.send("#{elm}-content") { |b| b << out }
     end
@@ -111,13 +127,12 @@ module Metanorma
     # @param cnt [String] prefatory/final content
     # @return [String] XML
     def sections(cnt)
-      c = Asciidoctor.convert(cnt, backend: doctype.to_sym, header_footer: true)
+      c = Asciidoctor.convert(cnt, backend: flavor.to_sym, header_footer: true)
       Nokogiri::XML(c, &:huge).at("//xmlns:sections").children.to_xml
     end
 
     # @param builder [Nokogiri::XML::Builder]
     def doccontainer(builder)
-      # Array(@directives).include? "documents-inline" or return
       @directives.detect { |d| d.key == "documents-inline" } or return
       documents.each_with_index do |(_, d), i|
         doccontainer1(builder, d, i)
@@ -136,14 +151,19 @@ module Metanorma
       end
     end
 
-    def doctype
-      @doctype ||= fetch_doctype || "standoc"
+    def flavor
+      @flavor ||= fetch_flavor || "standoc"
     end
 
-    def fetch_doctype
-      docid = @bibdata.docidentifier.first
-      docid or return
-      docid.type&.downcase || docid.id&.sub(/\s.*$/, "")&.downcase
+    # TODO: retrieve flavor based on @bibdata publisher when lookup implemented
+    # Will still infer based on docid, but will validate it before proceeding
+    def fetch_flavor
+      docid = @bibdata.docidentifier.first or return
+      f = docid.type.downcase || docid.id.sub(/\s.*$/, "").downcase or return
+      require ::Metanorma::Compile.new.stdtype2flavor(f)
+      f
+    rescue LoadError
+      nil
     end
 
     class << self

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

@@ -44,7 +44,7 @@ module Metanorma
 
         xml do
           root "entry"
-          map_attribute "id", to: :id
+          map_attribute "target", to: :id
           map_attribute "attachment", to: :attachment
           map_attribute "sectionsplit", to: :sectionsplit
           map_attribute "index", to: :index
@@ -55,7 +55,7 @@ module Metanorma
           map_element "title", to: :title
           map_element "bibdata", using: { from: :bibdata_from_xml,
                                           to: :bibdata_to_xml }
-          map_element "entry", to: :entry # using: { from: :entry_from_xml, to: :entry_to_xml }
+          map_element "entry", to: :entry
         end
 
         def entry_from_xml(model, node)

data/lib/metanorma/collection/document/document.rb

@@ -1,3 +1,5 @@
+require "relaton-cli"
+
 module Metanorma
   class Collection
     class Document
@@ -48,16 +50,16 @@ module Metanorma
 
         def mn2relaton_parser(tag)
           case tag.sub(/-standard/, "")
-          when "bipm" then RelatonBipm::XMLParser
-          when "bsi" then RelatonBsi::XMLParser
-          when "ietf" then RelatonIetf::XMLParser
-          when "iho" then RelatonIho::XMLParser
-          when "itu" then RelatonItu::XMLParser
-          when "iec" then RelatonIec::XMLParser
-          when "iso" then RelatonIsoBib::XMLParser
-          when "nist" then RelatonNist::XMLParser
-          when "ogc" then RelatonOgc::XMLParser
-          else RelatonBib::XMLParser
+          when "bipm" then ::RelatonBipm::XMLParser
+          when "bsi" then ::RelatonBsi::XMLParser
+          when "ietf" then ::RelatonIetf::XMLParser
+          when "iho" then ::RelatonIho::XMLParser
+          when "itu" then ::RelatonItu::XMLParser
+          when "iec" then ::RelatonIec::XMLParser
+          when "iso" then ::RelatonIsoBib::XMLParser
+          when "nist" then ::RelatonNist::XMLParser
+          when "ogc" then ::RelatonOgc::XMLParser
+          else ::RelatonBib::XMLParser
           end
         end
 

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

@@ -62,12 +62,24 @@ module Metanorma
           file, _filename = targetfile(entry, read: true)
           xml = Nokogiri::XML(file, &:huge)
           add_document_suffix(ident, xml)
-          entry.merge!(anchors: read_anchors(xml), ids: read_ids(xml),
-                       bibdata: xml.at(ns("//bibdata")),
-                       document_suffix: xml.root["document_suffix"])
+          entry.merge!(bibdata_extract(xml))
         end
       end
 
+      def anchors_lookup(anchors)
+        anchors.values.each_with_object({}) do |v, m|
+          v.each_value { |v1| m[v1] = true }
+        end
+      end
+
+      def bibdata_extract(xml)
+        anchors = read_anchors(xml)
+        { anchors: anchors, anchors_lookup: anchors_lookup(anchors),
+          ids: read_ids(xml),
+          bibdata: xml.at(ns("//bibdata")),
+          document_suffix: xml.root["document_suffix"] }
+      end
+
       def bibitem_process(entry)
         entry[:bibitem] = entry[:bibdata].dup
         entry[:bibitem].name = "bibitem"
@@ -76,7 +88,7 @@ module Metanorma
       end
 
       # ref is the absolute source file address
-      # rel_path is the relative source file address, relative to the YAML locaton
+      # rel_path is the relative source file address, relative to the YAML location
       # out_path is the destination file address, with any references outside
       # the working directory (../../...) truncated, and based on relative path
       # identifier is the id with only spaces, no nbsp
@@ -110,9 +122,9 @@ module Metanorma
 
       def add_document_suffix(identifier, doc)
         document_suffix = Metanorma::Utils::to_ncname(identifier)
-        Metanorma::Utils::anchor_attributes.each do |(tag_name, attribute_name)|
-          Util::add_suffix_to_attributes(doc, document_suffix, tag_name,
-                                         attribute_name, @isodoc)
+        Metanorma::Utils::anchor_attributes.each do |(tag_name, attr_name)|
+          Util::add_suffix_to_attrs(doc, document_suffix, tag_name, attr_name,
+                                    @isodoc)
         end
         url_in_css_styles(doc, document_suffix)
         doc.root["document_suffix"] ||= ""

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

@@ -1,4 +1,5 @@
 require_relative "../sectionsplit/sectionsplit"
+# require "concurrent-ruby"
 
 module Metanorma
   class Collection
@@ -16,13 +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
         a = add_section_split_attachments(sectionsplit_manifest, key) and
           manifest["#{key}:attachments"] = a
-        manifest["#{key}:index.html"] =
-          add_section_split_cover(sectionsplit_manifest, key)
+        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)
@@ -31,24 +44,34 @@ 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)
@@ -61,16 +84,17 @@ module Metanorma
       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)
@@ -84,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

@@ -67,15 +67,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
 
@@ -153,7 +153,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,10 +161,8 @@ 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, install_fonts: false,
@@ -172,6 +170,13 @@ module Metanorma
         ::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

data/lib/metanorma/collection/multilingual/multilingual.rb

@@ -611,13 +611,13 @@ module Metanorma
       def initialize(options)
         options[:align_cross_elements] ||= %w(note p)
         @align_cross_elements = " #{options[:align_cross_elements].join(' ')} "
-        @doctype = options[:doctype]
+        @flavor = options[:flavor]
         @outdir = options[:outdir]
         @converter_opt = options[:converter_options]
       end
 
       def htmlconv
-        x = Asciidoctor.load nil, backend: @doctype
+        x = Asciidoctor.load nil, backend: @flavor
         x.converter.html_converter(@converter_opt)
       end