metanorma 1.6.7 → 1.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da01eef341e191e1e5feb7181afa5341ec66ff9b81792aace74bdcfc58a9690e
-  data.tar.gz: 36ab1f699a49b800cbeef67950e595f8306980b0406d8d0227d8570bf4581abc
+  metadata.gz: bf166190b283c36393cece711e1b6d3210d06a12a577c0f64bbfca206131d561
+  data.tar.gz: e56840a0ca18bf19dd734deeec0b9a0eae1acb167815562f334ccdb413e22400
 SHA512:
-  metadata.gz: 2c3a0595febda908e72b2e1075e8ac54955c00fbcbedb06a312f19f162c08de69f54ff0db365c76eece70743b0ffea5b68f67cce4e95e2b5c9261236b895e63a
-  data.tar.gz: a8065d8df08ade6c95ec184dd0d428c09aab5aadab74b0198280a95e9263c3794135b72139039cd7306168d26c8dc99daee8fc4ef869de4d3413b93c8929869d
+  metadata.gz: 01d4d3a2840c7c4d2034c189f934dcb888bb602e8b6ee8c2d3e6c158711db7d7fa17b59c01dd634877ee9b0c4f849819c4b69a401f6a95d0818ad41236753e5d
+  data.tar.gz: 1e05a6d9992739869bdb53ec0ddbc43bab58fb5b08f0eb2730d5317954c7a3970c8992c1443808e3abd5a82908037cebe7f942acc6aae26e6c680e1103caa59d

data/Gemfile

@@ -4,9 +4,12 @@ Encoding.default_internal = Encoding::UTF_8
 source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}" }
 
-gemspec
+group :development, :test do
+  gem "rspec"
+end
 
 if File.exist? "Gemfile.devel"
   eval File.read("Gemfile.devel"), nil, "Gemfile.devel" # rubocop:disable Security/Eval
 end
 
+gemspec

data/lib/metanorma/compile_options.rb

@@ -67,16 +67,27 @@ module Metanorma
 
     def get_isodoc_options(file, options, ext)
       ret = @processor.extract_options(file)
+      copy_isodoc_options_attrs(options, ret)
+      font_manifest_mn2pdf(options, ret, ext)
+      ret[:output_formats]&.select! do |k, _|
+        options[:extension_keys].include?(k)
+      end
+      ret
+    end
+
+    def copy_isodoc_options_attrs(options, ret)
       ret[:datauriimage] = true if options[:datauriimage]
       ret[:sourcefilename] = options[:filename]
       %i(bare sectionsplit no_install_fonts baseassetpath aligncrosselements
          tocfigures toctables tocrecommendations strict)
         .each { |x| ret[x] ||= options[x] }
+    end
+
+    def font_manifest_mn2pdf(options, ret, ext)
       custom_fonts = FontistUtils.has_custom_fonts?(@processor, options, ret)
-      ext == :pdf && custom_fonts &&
-        ret[:mn2pdf] =
-          { font_manifest: FontistUtils.location_manifest(@processor, ret) }
-      ret
+      ext == :pdf && custom_fonts and
+        ret[:mn2pdf] = { font_manifest: FontistUtils
+          .location_manifest(@processor, ret) }
     end
   end
 end

data/lib/metanorma/processor.rb

@@ -35,7 +35,7 @@ module Metanorma
     end
 
     def options_preprocess(options)
-      options[:output_formats] = output_formats
+      options[:output_formats] ||= output_formats
     end
 
     def output(isodoc_node, _inname, outname, _format, _options = {})

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "1.6.7".freeze
+  VERSION = "1.6.9".freeze
 end

metadata

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