metanorma 1.6.6 → 1.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c329757741717214253fd1ca5cf31cfaa1859c2c35647b5586970cb36595f1a3
-  data.tar.gz: c02920016d7294a37d9459e26d9d4e5c4291bc75a94181c1d139ad7f3a2e5215
+  metadata.gz: 62515490978dfce5108f674bf4dbee7efde188185fc16b081270dd3ea1d288cc
+  data.tar.gz: 6b72aac716ff0aa8faf39aed01b59b75fd068f866096aef735f89767ce6f92ea
 SHA512:
-  metadata.gz: d8fb74a61e67a308fb0523e4512bc4d2e0067d5dadb8cc736114e47781e9b638066a0e438cadeca16a1d210f785eeb544abd526a91483dfd81f6580b9fa051ff
-  data.tar.gz: de5e33cc1cfd207c6ad912759a5fc9e8cda3f576eaabd3e2c897662d299d298d37d9db052589990f5aa9f18a9ccd675d870212f0a07b987128d42eec198e5007
+  metadata.gz: 7e9b1a354d205379931f34f89c3af5cb869671c4d124ef15f09a7ccc1aaca3603c2d832ec57fb1be99a074905642a03b0d5820847285ff01d80cf92daa438350
+  data.tar.gz: cfbec2def4806aaad3ab088086928e042b3e55278871710b1b1be4cd4223ee6cc0693d0557117d82686afe1cbfa46dca209f112fba602d356e0dc106e4091420

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/collection_render_utils.rb

@@ -110,8 +110,8 @@ module Metanorma
     class PdfOptionsNode
       def initialize(doctype, options)
         docproc = Metanorma::Registry.instance.find_processor(doctype)
-        if FontistUtils.has_fonts_manifest?(docproc, options)
-          @fonts_manifest = FontistUtils.location_manifest(docproc)
+        if FontistUtils.has_custom_fonts?(docproc, options, {})
+          @fonts_manifest = FontistUtils.location_manifest(docproc, options)
         end
       end
 

data/lib/metanorma/compile_options.rb

@@ -61,34 +61,33 @@ module Metanorma
     def font_install(opt)
       FontistUtils.install_fonts(@processor, opt) unless @fontist_installed
       @fontist_installed = true
-      !opt[:fonts] ||
-        opt[:fontlicenseagreement] == "continue-without-fonts" and return
-      @font_overrides ||= []
-      font_install_override(opt)
-    end
-
-    def font_install_override(opt)
-      confirm = opt[:fontlicenseagreement] == "no-install-fonts" ? "no" : "yes"
-      CSV.parse_line(opt[:fonts], col_sep: ";").map(&:strip).each do |f|
-        @font_overrides.include?(f) and next
-        Fontist::Font.install(f, confirmation: confirm)
-        @font_overrides << f
-      end
     end
 
     private
 
     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] }
-      ext == :pdf && FontistUtils.has_fonts_manifest?(@processor, options) and
-        ret[:mn2pdf] =
-          { font_manifest: FontistUtils.location_manifest(@processor) }
-      ret
+    end
+
+    def font_manifest_mn2pdf(options, ret, ext)
+      custom_fonts = FontistUtils.has_custom_fonts?(@processor, options, ret)
+      ext == :pdf && custom_fonts and
+        ret[:mn2pdf] = { font_manifest: FontistUtils
+          .location_manifest(@processor, ret) }
     end
   end
 end

data/lib/metanorma/fontist_utils.rb

@@ -16,7 +16,7 @@ module Metanorma
           Util.log("[fontist] Skip font installation because" \
                    " --no-install-fonts argument passed", :debug)
           return false
-        elsif !has_fonts_manifest?(processor)
+        elsif !has_custom_fonts?(processor, options, options)
           Util.log("[fontist] Skip font installation because "\
                    "fonts_manifest is missing", :debug)
           return false
@@ -89,7 +89,8 @@ module Metanorma
       return unless validate_install_fonts(processor, options)
 
       @@updated_formulas_repo = false
-      manifest = processor.fonts_manifest
+      manifest = processor.fonts_manifest.dup
+      append_source_fonts(manifest, options)
       agree_to_terms, can_without_fonts, no_progress = validate_options(options)
 
       install_fonts_safe(
@@ -100,14 +101,22 @@ module Metanorma
       )
     end
 
-    def self.has_fonts_manifest?(processor, options = {})
+    def self.has_custom_fonts?(processor, options, source_attributes)
       !options[:no_install_fonts] \
         && processor.respond_to?(:fonts_manifest) \
-        && !processor.fonts_manifest.nil?
+        && !processor.fonts_manifest.nil? \
+        || source_attributes[:fonts]
     end
 
-    def self.location_manifest(processor)
-      Fontist::Manifest::Locations.from_hash(processor.fonts_manifest)
+    def self.location_manifest(processor, source_attributes)
+      Fontist::Manifest::Locations.from_hash(
+        append_source_fonts(processor.fonts_manifest.dup, source_attributes),
+      )
+    end
+
+    def self.append_source_fonts(manifest, source_attributes)
+      source_attributes[:fonts]&.split(";")&.each { |f| manifest[f] = nil }
+      manifest
     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.6".freeze
+  VERSION = "1.6.8".freeze
 end

metadata

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