metanorma 1.5.10 → 1.5.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92a5d64c829606a032547fcdff9d91c0da5961e245174e23d986d1e4d7b66829
-  data.tar.gz: 439aed18b6d51d07e96d929cfa3794374ce0002209ef9f0a7556c6e4393dd433
+  metadata.gz: 56452832fb95047d0221a3720fba58e82b0d9766c5d29e3b1bacf42e703976ab
+  data.tar.gz: 162cf563a95b6a6ae6f096fcecf4734025a88d5fc50f4b18de8dae693fc986e0
 SHA512:
-  metadata.gz: 9b480de019e1ff4356f103cb6ac76f3f185a497901aa5b6a71701c99ae76f598c39bbfba04d9d9c42327ab3433536fa9b3913727d8060073718fb11b9fbc5747
-  data.tar.gz: 6265a0c25f8d727d9489a8a9d7bdadda0c265f724679dbc41ac3d2bd739bd89474b14bd3f32056d7cc4eb3e1f47c89a4352d906bd740a4a787b70377d0de0dfd
+  metadata.gz: c3276a5f4445b2776f86bb46beaf4c98d53155f44e2dfa2357b629a879aa36f3d1a621a7789136fac109a76729ca22e0520863d4ad4e5a05f8b3515633dc72ff
+  data.tar.gz: d42e2bbd2ecd3d79fcc7960664f1bfdee03661e78e65109a565e0b21adf9e5613be78eee0859e09b202ed2ce53a820901319150c4255516e2bc73554343d47fc

data/lib/metanorma/compile.rb

@@ -33,7 +33,6 @@ module Metanorma
       (file, isodoc = process_input(filename, options)) or return nil
       relaton_export(isodoc, options)
       extract(isodoc, options[:extract], options[:extract_type])
-      font_install(options)
       process_exts(filename, extensions, file, isodoc, options)
     end
 
@@ -103,10 +102,22 @@ module Metanorma
                  presentationxml: f.sub(/\.[^.]+$/, ".presentation.xml") }
       @queue = ::Metanorma::WorkersPool
         .new(ENV["METANORMA_PARALLEL"]&.to_i || 3)
+      gather_and_install_fonts(file, options.dup, extensions)
+      process_exts_run(fnames, file, isodoc, extensions, options)
+      @queue.shutdown
+    end
+
+    def process_exts_run(fnames, file, isodoc, extensions, options)
       Util.sort_extensions_execution(extensions).each do |ext|
         process_ext(ext, file, isodoc, fnames, options)
       end
-      @queue.shutdown
+    end
+
+    def gather_and_install_fonts(file, options, extensions)
+      Util.sort_extensions_execution(extensions).each do |ext|
+        isodoc_options = get_isodoc_options(file, options, ext)
+        font_install(isodoc_options.merge(options))
+      end
     end
 
     def process_ext(ext, file, isodoc, fnames, options)

data/lib/metanorma/compile_options.rb

@@ -59,9 +59,16 @@ module Metanorma
       return if !opt[:fonts] ||
         opt[:fontlicenseagreement] == "continue-without-fonts"
 
+      @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
 

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "1.5.10".freeze
+  VERSION = "1.5.11".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 1.5.10
+  version: 1.5.11
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-22 00:00:00.000000000 Z
+date: 2023-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor