metanorma 2.2.9 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f949939db63522ce80839447f7a4a2c860f2b6c1a8a8bef299bb12e5a375f23c
-  data.tar.gz: cd92ed471004f16de40d4c0e02bc457a7a2492a4b0a92729a1b36d312eef2672
+  metadata.gz: f0b38bef2506229ec98ad17d482c5b1fff15bf21d159833393a54dc19842a501
+  data.tar.gz: 8e6b6a5f689f5b37379bf80d2d987ac2d2cfe28d2b5a678069b90fbf79628ff2
 SHA512:
-  metadata.gz: f85234d7dea81dda16e4c66d1f883666bd1f9b7382ab6bd20770e75f3dc04ad940d78a54a49c2df7dfc25859f1434f5559233ce8c2eb585761397b7fcb0d22af
-  data.tar.gz: 4bddae518329cebca7cf762666c0d769243524a40c595f3ea7e94db33fad26fc3daaf26598c73a85b3ab12d13cd974a5a89ce7a1548ef679bec00156de8e6608
+  metadata.gz: e98a37c21f6741a3d59c765947a6f589938b44e11120a066ebac4fa1919aa00fb32fdb4f812a6bed66a1db88207df673c2361ac4b32889bd0ca25d106b0904e4
+  data.tar.gz: ee81239a3a28c45650b5a2770609a029e31be0f36cba332b9e5d2cacd5845149a8fa986e2aee8d8461e8d61e5f4ce2aec50b4715dae1fab23ef989128e49d40d

data/lib/metanorma/collection/collection.rb

@@ -160,6 +160,7 @@ module Metanorma
           b.attachment Vectory::Utils::datauri(doc.file)
         else
           doc.to_xml b
+          b.parent.children.first["flavor"] = flavor
         end
       end
     end

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

@@ -49,7 +49,7 @@ module Metanorma
         private
 
         def mn2relaton_parser(tag)
-          case tag.sub(/-standard/, "")
+          case tag
           when "bipm" then ::RelatonBipm::XMLParser
           when "bsi" then ::RelatonBsi::XMLParser
           when "ietf" then ::RelatonIetf::XMLParser
@@ -67,7 +67,7 @@ module Metanorma
         # @return [RelatonBib::BibliographicItem,RelatonIso::IsoBibliographicItem]
         def from_xml(xml)
           b = xml.at("//xmlns:bibitem|//xmlns:bibdata")
-          r = mn2relaton_parser(xml.root.name)
+          r = mn2relaton_parser(xml.root["flavor"])
           # Relaton doesn't understand Pres XML tags
           b.xpath("//xmlns:fmt-identifier").each(&:remove)
           r.from_xml(b.to_xml)
@@ -127,7 +127,7 @@ module Metanorma
         if @raw
           builder.parent.add_child(@bibitem.root)
         else
-          builder.send("#{type}-standard") do |b|
+          builder.send("metanorma") do |b|
             b << @bibitem.to_xml(bibdata: true)
           end
         end

data/lib/metanorma/compile/compile.rb

@@ -200,11 +200,11 @@ module Metanorma
     # need to update options, for any content added;
     # e.g. new attributes from Metanorma taste
     def update_options_after_preprocessing(file, options)
-      new_options = {}
+      new_options = { extension_keys: options[:extension_keys] }
       Tempfile.open(["tmp", ".adoc"], encoding: "UTF-8") do |f|
         f.write(file)
         f.close
-        new_options = extract_options(f, {})
+        new_options = extract_options(f, new_options)
       end
       new_options.compact!
       new_options.delete(:filename)

data/lib/metanorma/compile/compile_options.rb

@@ -21,8 +21,7 @@ module Metanorma
         o = options_in_file(filename)
         extract_flavor_options(options, o)
         extract_dir_options(options, o, filename)
-        options[:extension_keys] ||= o[:extensions]&.split(/, */)&.map(&:to_sym)
-        options[:extension_keys] = nil if options[:extension_keys] == [:all]
+        extract_extension_options(options, o)
         options[:format] ||= :asciidoc
         options[:filename] = filename
         options[:fontlicenseagreement] ||= "no-install-fonts"
@@ -30,6 +29,15 @@ module Metanorma
         options
       end
 
+      def extract_extension_options(opt, doc_opt)
+        opt[:extension_keys] == [:all] and opt[:extension_keys] = []
+        ext = opt[:extension_keys] || []
+        doc_opt[:extensions] == "all" and doc_opt[:extensions] = ""
+        ext1 = (doc_opt[:extensions] || "").split(/, */).map(&:to_sym)
+        !ext1.empty? && ext.empty? and opt[:extension_keys] = ext1
+        opt[:extension_keys]&.empty? and opt[:extension_keys] = nil
+      end
+
       def options_in_file(filename)
         content = read_file(filename)
         Metanorma::Input::Asciidoc.new.extract_metanorma_options(content)
@@ -93,7 +101,7 @@ module Metanorma
 
       def get_isodoc_options(file, options, ext)
         ret = @processor.extract_options(file)
-        get_isodoc_i18nyaml(options, ret)
+        get_isodoc_fileparams(options, ret)
         copy_isodoc_options_attrs(options, ret)
         font_manifest_mn2pdf(options, ret, ext)
         ret[:output_formats]&.select! do |k, _|
@@ -103,11 +111,13 @@ module Metanorma
         ret
       end
 
-      def get_isodoc_i18nyaml(options, ret)
-        dir = File.dirname(options[:filename])
-        ret[:i18nyaml] or return
-        (Pathname.new ret[:i18nyaml]).absolute? or
-          ret[:i18nyaml] = File.join(dir, ret[:i18nyaml])
+      def get_isodoc_fileparams(options, ret)
+        %i(i18nyaml relatonrenderconfig).each do |k|
+          dir = File.dirname(options[:filename])
+          ret[k] or next
+          (Pathname.new ret[k]).absolute? or
+            ret[k] = File.join(dir, ret[k])
+        end
       end
 
       def copy_isodoc_options_attrs(options, ret)
@@ -124,7 +134,8 @@ module Metanorma
 
         ext == :pdf && custom_fonts and
           ret[:mn2pdf] = {
-            font_manifest: Util::FontistHelper.location_manifest(@processor, ret),
+            font_manifest: Util::FontistHelper
+              .location_manifest(@processor, ret),
           }
       end
     end

data/lib/metanorma/input/asciidoc.rb

@@ -55,7 +55,7 @@ module Metanorma
            pdf-owner-password pdf-allow-copy-content pdf-allow-edit-content
            pdf-allow-assemble-document pdf-allow-edit-annotations
            pdf-allow-print pdf-allow-print-hq pdf-allow-fill-in-forms
-           pdf-stylesheet pdf-stylesheet-override
+           pdf-stylesheet pdf-stylesheet-override relaton-render-config
            fonts font-license-agreement pdf-allow-access-content
            pdf-encrypt-metadata iso-word-template document-scheme
            localize-number iso-word-bg-strip-color modspec-identifier-base)

data/lib/metanorma/util/fontist_helper.rb

@@ -41,14 +41,13 @@ module Metanorma
         end
 
         def fontist_install(manifest, agree, no_progress)
-          if agree
-            no_license_log
+          if agree then no_license_log
           else
-            Fontist.log_level = :info
+            # Fontist.log_level = :info
+            # Shutting up Fontist 2.0's verbose logging of installation locations
+            Fontist.log_level = :fatal
           end
-
-          instance = Fontist::Manifest.from_hash(manifest)
-          instance.install(
+          Fontist::Manifest.from_hash(manifest).install(
             confirmation: agree ? "yes" : "no",
             no_progress: no_progress,
           ).to_hash

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "2.2.9".freeze
+  VERSION = "2.3.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 2.2.9
+  version: 2.3.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-17 00:00:00.000000000 Z
+date: 2025-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor