metanorma 1.7.2 → 1.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed2498b7fc0b4cc2074f2393f839c27991e7efa26645c065b3e852eb09737107
-  data.tar.gz: a34ad968c4d6b650f8fb499b4a0713203e8d3b5a2c0093148becafa596d6918d
+  metadata.gz: d3a50d8116aadebecaf6fbdcdc1b9ffaee19cb233bf38ad6ea2f7b6b1b320fa8
+  data.tar.gz: 67283cbe9df47b100e3b6598f08bb7a00e9be1602d3a6cc7d41ff3b527673556
 SHA512:
-  metadata.gz: 331642735b2ff401ef306a3851a27f220a6177acf7ef33fdd7d4e13b78809ca192b491961b6c8433882a1b8a3c80bdd77de1f66a4234bad1658a70ee16ce9ced
-  data.tar.gz: e51adcc4e9bfd4d6a7f3f63f624d2114e4a9fcf475a16ae53ff2e23ba49fe19d2af1ebf21a5856b00b9ddd5388b74817996d03aaa8242cb2b4969a6e19a40651
+  metadata.gz: 195226d8f70127bfe659d1a032824482ec02911ca8f7f1e9d0f75f14f5b319e90912300345a50c05422b6dd87fc5b0b1674b11f66471e06c8ff79c39a4ab3db3
+  data.tar.gz: 4fbf96851ca7857e83767abbb86c13cc9a28130b289543f82b9d30841d55298703149b82d48597c6d25acc8ea7a0667ff00a49784187f471d0f685c0598a2104

data/lib/metanorma/collection_render_utils.rb

@@ -20,8 +20,9 @@ module Metanorma
     end
 
     def get_bibitem_docid(bib, identifier)
-      # IDs for repo references are untyped by default
-      docid = bib.at(ns("./docidentifier[not(@type)]")) ||
+      docid =
+        bib.at(ns("./docidentifier[@type = 'metanorma-collection']")) ||
+        bib.at(ns("./docidentifier[not(@type)]")) ||
         bib.at(ns("./docidentifier"))
       docid &&= docid_prefix(docid)
       if @files.get(docid) then docid

data/lib/metanorma/compile.rb

@@ -22,18 +22,31 @@ module Metanorma
       @errors = []
       @isodoc = IsoDoc::Convert.new({})
       @fontist_installed = false
+      @log = Metanorma::Utils::Log.new
     end
 
     def compile(filename, options = {})
-      require_libraries(options)
-      options = options_extract(filename, options)
-      validate_options(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
       relaton_export(isodoc, options)
       extract(isodoc, options[:extract], options[:extract_type])
       process_exts(filename, extensions, file, isodoc, options)
+      clean_exit(options)
+    end
+
+    def options_process(filename, options)
+      require_libraries(options)
+      options = options_extract(filename, options)
+      validate_options(options)
+      @log.save_to(filename, options[:output_dir])
+      options[:log] = @log
+    end
+
+    def clean_exit(options)
+      options[:novalid] and return
+      @log.write
     end
 
     def process_input(filename, options)

data/lib/metanorma/compile_options.rb

@@ -30,29 +30,27 @@ module Metanorma
       options[:format] ||= :asciidoc
       options[:filename] = filename
       options[:fontlicenseagreement] ||= "no-install-fonts"
+      options[:novalid] = o[:novalid] if o[:novalid]
       options
     end
 
     def get_extensions(options)
-      options[:extension_keys] ||=
-        @processor.output_formats.reduce([]) { |memo, (k, _)| memo << k }
-      extensions = extract_extensions(options)
-      if !extensions.include?(:presentation) && extensions.any? do |e|
+      ext = extract_extensions(options)
+      !ext.include?(:presentation) && ext.any? do |e|
         @processor.use_presentation_xml(e)
-      end
-        extensions << :presentation
-      end
-      extensions
+      end and ext << :presentation
+      !ext.include?(:rxl) && options[:site_generate] and
+        ext << :rxl
+      ext
     end
 
     def extract_extensions(options)
+      options[:extension_keys] ||=
+        @processor.output_formats.reduce([]) { |memo, (k, _)| memo << k }
       options[:extension_keys].reduce([]) do |memo, e|
         if @processor.output_formats[e] then memo << e
         else
-          message = "[metanorma] Error: #{e} format is not supported " \
-                    "for this standard."
-          @errors << message
-          Util.log(message, :error)
+          unsupported_format_error(e)
           memo
         end
       end
@@ -65,6 +63,13 @@ module Metanorma
 
     private
 
+    def unsupported_format_error(ext)
+      message = "[metanorma] Error: #{ext} format is not supported " \
+                "for this standard."
+      @errors << message
+      Util.log(message, :error)
+    end
+
     def get_isodoc_options(file, options, ext)
       ret = @processor.extract_options(file)
       copy_isodoc_options_attrs(options, ret)

data/lib/metanorma/files_lookup_sectionsplit.rb

@@ -38,6 +38,7 @@ module Metanorma
     end
 
     def one_doc_collection?
+      return false
       docs = 0
       @files.each_value do |v|
         v[:attachment] and next

data/lib/metanorma/input/asciidoc.rb

@@ -5,11 +5,11 @@ module Metanorma
     class Asciidoc < Base
       def process(file, filename, type, options = {})
         require "asciidoctor"
-        out_opts = {
-          to_file: false, safe: :safe, backend: type, header_footer: true,
-          attributes: ["nodoc", "stem", "docfile=#{filename}",
-                       "output_dir=#{options[:output_dir]}"]
-        }
+        out_opts = { to_file: false, safe: :safe, backend: type,
+                     header_footer: true, log: options[:log],
+                     novalid: options[:novalid],
+                     attributes: ["nodoc", "stem", "docfile=#{filename}",
+                                  "output_dir=#{options[:output_dir]}"] }
         unless asciidoctor_validate(file, filename, out_opts)
           warn "Cannot continue compiling Asciidoctor document"
           abort
@@ -24,7 +24,7 @@ module Metanorma
           $stderr = StringIO.new
           ::Asciidoctor.load(file, options)
           %r{(\n|^)asciidoctor: ERROR: ['"]?#{Regexp.escape(filename ||
-            "<empty>")}['"]?: line \d+: include file not found: }
+            '<empty>')}['"]?: line \d+: include file not found: }
             .match($stderr.string) and err = $stderr.string
         ensure
           $stderr = previous_stderr
@@ -39,15 +39,16 @@ module Metanorma
         /\n:mn-output-extensions:\s+(?<extensions>[^\n]+)\n/ =~ headerextract
         /\n:mn-relaton-output-file:\s+(?<relaton>[^\n]+)\n/ =~ headerextract
         /\n(?<asciimath>:mn-keep-asciimath:[^\n]*)\n/ =~ headerextract
+        /\n(?<novalid>:novalid:[^\n]*)\n/ =~ headerextract
         asciimath = if defined?(asciimath)
-                      (!asciimath.nil? && asciimath != ":mn-keep-asciimath: false")
+                      !asciimath.nil? && asciimath != ":mn-keep-asciimath: false"
                     end
         asciimath = nil if asciimath == false
         {
           type: defined?(type) ? type&.strip : nil,
           extensions: defined?(extensions) ? extensions&.strip : nil,
           relaton: defined?(relaton) ? relaton&.strip : nil,
-          asciimath: asciimath,
+          asciimath: asciimath, novalid: !novalid.nil? || nil
         }.compact
       end
 

data/lib/metanorma/sectionsplit.rb

@@ -206,7 +206,8 @@ module Metanorma
                              output_folder: "#{ident}_collection",
                              format: %i(html),
                              coverpage: File.join(dir, "cover.html")).coverpage
-      filename = one_doc_coll ? "#{ident}_index.html" : "index.html"
+      #filename = one_doc_coll ? "#{ident}_index.html" : "index.html"
+      filename = "#{ident}_index.html"
       FileUtils.mv "#{ident}_collection/index.html", File.join(dir, filename)
       FileUtils.rm_rf "#{ident}_collection"
       filename

data/lib/metanorma/util.rb

@@ -40,7 +40,12 @@ module Metanorma
 
     def self.gather_bibitems(xml)
       xml.xpath("//xmlns:bibitem[@id]").each_with_object({}) do |b, m|
-        m[b["id"]] = b
+        if m[b["id"]]
+          b.remove
+          next # we can't update duplicate bibitem, processing updates wrong one
+        else
+          m[b["id"]] = b
+        end
       end
     end
 

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "1.7.2".freeze
+  VERSION = "1.7.4".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.7.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-10 00:00:00.000000000 Z
+date: 2024-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor