metanorma 1.3.12 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e0318ba6a8281b9d412916b46fa57cc2de00a2738dd7703425c3f3736d92ae8
-  data.tar.gz: 03d43c3e079517e202ba7e6d48f67ba792741db08ad026392169d19ffdc5a5d5
+  metadata.gz: cebdc5e3a04db33d1bf3c0042d914f03a1e7c36ae67d625138fb1499679abdcf
+  data.tar.gz: 82f7a4b816cea046181cfd05da94ca21a52f1c12ac02d9f6f2e89ae1b07e6f60
 SHA512:
-  metadata.gz: 3cc705935cee37831ad02b8ca85f556f9d2ec8cec8c341a045f34d96621b20e79455533a22262004b363d6f10a1523505cea14bc489fa1d47d9406870e1acc7f
-  data.tar.gz: a9d55375a16afb0ed0ee9e392dc2cc134f9a0e424fbadbb8f7b9f5fe940d944867c9d5e32e39f79fcf6d594381a7f2c90a9d70502b5108668c181e628e32f83e
+  metadata.gz: cfa8565f3b0a55f12f0d0e8971d82c8bf619390cfc76860514dda7b1801267d7e04719161048ff7d9b16a71e238df2e24e145198229b5b5930233ae9110933ec
+  data.tar.gz: 81764ee18d5c1b36f3aacf19c0a4cf4b02cd4fb0a8979fe9d0a6733a93f4f05ddc845be35b25ec38be31d595fd04a019ae6aaf6ca33a97664519550e1abe280b

data/lib/metanorma/collection_renderer.rb

@@ -104,13 +104,15 @@ module Metanorma
 
     class PdfOptionsNode
       def initialize(doctype, options)
-        doc_proc = Metanorma::Registry.instance.find_processor(doctype)
-        @font_locations = FontistUtils.fontist_font_locations(doc_proc, options)
+        docproc = Metanorma::Registry.instance.find_processor(doctype)
+        if FontistUtils.has_fonts_manifest?(docproc, options)
+          @fonts_manifest = FontistUtils.location_manifest(docproc)
+        end
       end
 
       def attr(key)
-        if key == "mn2pdf-font-manifest-file" && @font_locations
-          @font_locations.path
+        if key == "fonts-manifest" && @font_locations
+          @fonts_manifest
         end
       end
     end

data/lib/metanorma/compile.rb

@@ -214,9 +214,11 @@ module Metanorma
         elsif ext == :html && options[:sectionsplit]
           sectionsplit_convert(xml_name, isodoc, outfilename, isodoc_options)
         else
-          if ext == :pdf
-            floc = FontistUtils.fontist_font_locations(@processor, options)
-            isodoc_options[:mn2pdf] = { font_manifest_file: floc.path } if floc
+          if ext == :pdf && FontistUtils.has_fonts_manifest?(@processor,
+                                                             options)
+            isodoc_options[:mn2pdf] = {
+              font_manifest: FontistUtils.location_manifest(@processor),
+            }
           end
           begin
             if @processor.use_presentation_xml(ext)

data/lib/metanorma/fontist_utils.rb

@@ -16,9 +16,9 @@ module Metanorma
           Util.log("[fontist] Skip font installation because" \
                    " --no-install-fonts argument passed", :debug)
           return false
-        elsif missing_fontist_manifest?(processor)
+        elsif !has_fonts_manifest?(processor)
           Util.log("[fontist] Skip font installation because "\
-                   "font_manifest is missing", :debug)
+                   "fonts_manifest is missing", :debug)
           return false
         end
         true
@@ -27,26 +27,42 @@ module Metanorma
       def install_fonts_safe(manifest, agree, continue, no_progress)
         fontist_install(manifest, agree, no_progress)
       rescue Fontist::Errors::LicensingError
+        license_error_log(continue)
+      rescue Fontist::Errors::FontError => e
+        log_level = continue ? :warning : :fatal
+        Util.log("[fontist] '#{e.font}' font is not supported. " \
+                 "Please report this issue at github.com/metanorma/metanorma" \
+                 "/issues to report this issue.", log_level)
+      rescue Fontist::Errors::FormulaIndexNotFoundError
+        fintist_update_repo(manifest, agree, continue, no_progress)
+      end
+
+      def fontist_install(manifest, agree, no_progress)
+        Fontist::Manifest::Install.from_hash(
+          manifest,
+          confirmation: agree ? "yes" : "no",
+          no_progress: no_progress,
+        )
+      end
+
+      def license_error_log(continue)
         if continue
           Util.log(
             "[fontist] Processing will continue without fonts installed",
-            :debug
+            :debug,
           )
         else
           Util.log("[fontist] Aborting without proper fonts installed," \
                    " make sure that you have set option --agree-to-terms",
                    :fatal)
         end
-      rescue Fontist::Errors::FontError => e
-        log_level = continue ? :warning : :fatal
-        Util.log("[fontist] '#{e.font}' font is not supported. " \
-                 "Please report this issue at github.com/metanorma/metanorma" \
-                 "/issues to report this issue.", log_level)
-      rescue Fontist::Errors::FormulaIndexNotFoundError
+      end
+
+      def fintist_update_repo(manifest, agree, continue, no_progress)
         if @@updated_formulas_repo
           Util.log(
             "[fontist] Bug: formula index not found after 'fontist update'",
-            :fatal
+            :fatal,
           )
         end
         Util.log("[fontist] Missing formula index. Fetching it...", :debug)
@@ -54,28 +70,6 @@ module Metanorma
         @@updated_formulas_repo = true
         install_fonts_safe(manifest, agree, continue, no_progress)
       end
-
-      def fontist_install(manifest, agree, no_progress)
-        Fontist::Manifest::Install.from_hash(
-          manifest,
-          confirmation: agree ? "yes" : "no",
-          no_progress: no_progress
-        )
-      end
-
-      def dump_fontist_manifest_locations(manifest)
-        location_manifest = Fontist::Manifest::Locations.from_hash(
-          manifest
-        )
-        location_manifest_file = Tempfile.new(["fontist_locations", ".yml"])
-        location_manifest_file.write location_manifest.to_yaml
-        location_manifest_file.flush
-        location_manifest_file
-      end
-
-      def missing_fontist_manifest?(processor)
-        !processor.respond_to?(:fonts_manifest) || processor.fonts_manifest.nil?
-      end
     end
 
     def self.install_fonts(processor, options)
@@ -89,20 +83,18 @@ module Metanorma
         manifest,
         agree_to_terms,
         can_without_fonts,
-        no_progress
+        no_progress,
       )
     end
 
-    def self.fontist_font_locations(processor, options)
-      if missing_fontist_manifest?(processor) || options[:no_install_fonts]
-        return nil
-      end
-
-      dump_fontist_manifest_locations(processor.fonts_manifest)
-    rescue Fontist::Errors::FormulaIndexNotFoundError
-      raise unless options[:continue_without_fonts]
+    def self.has_fonts_manifest?(processor, options = {})
+      !options[:no_install_fonts] \
+        && processor.respond_to?(:fonts_manifest) \
+        && !processor.fonts_manifest.nil?
+    end
 
-      nil
+    def self.location_manifest(processor)
+      Fontist::Manifest::Locations.from_hash(processor.fonts_manifest)
     end
   end
 end

data/lib/metanorma/input/asciidoc.rb

@@ -84,7 +84,7 @@ module Metanorma
         defined?(break_up) and
           break_up = empty_attr(break_up, "break-up-urls-in-tables")
         ret.merge(
-          datauriimage: defined?(datauriimage) ? datauriimage != "false" : nil,
+          datauriimage: defined?(datauriimage) ? datauriimage != "false" : true,
           suppressasciimathdup: defined?(suppress_asciimath_dup) ? suppress_asciimath_dup != "false" : nil,
           hierarchical_assets: defined?(hier_assets) ? hier_assets : nil,
           use_xinclude: defined?(use_xinclude) ? use_xinclude : nil,

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "1.3.12".freeze
+  VERSION = "1.4.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 1.3.12
+  version: 1.4.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-07 00:00:00.000000000 Z
+date: 2021-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -303,7 +303,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Metanorma is the standard of standards; the metanorma gem allows you to create