metanorma 1.2.7 → 1.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c6df255e2338335a6f670965e34d61d3d808a3d9a1a69c78ef9af1f9a2f306f
-  data.tar.gz: b5c485bdcd52c100d141b80c1ceb5a0f2a66b0eb45fa2a7efd56e3b57653596d
+  metadata.gz: 72a5ff12b5b2793f4d8b8ced7b5cdc747a7b59cb938300f1e288150787d82951
+  data.tar.gz: 2a8f1a0fda7ceed680324833c18ab595d9de381aab36f3a5848040743029dfc8
 SHA512:
-  metadata.gz: 638bede7f3dffde3a6169e51a684fa10efec05975273ab6dc1495e95f074b21b0cc7cefaf168cb6a0ebe0d8c903dcf37ebbc4c023a6c1149cc42d16f517e67fd
-  data.tar.gz: 727a3a66032ed783b5b099a035589666818d71a67e9f88366cf888fd3879c40ff5872533d39ef1e7b31dc8d15289274aea866637233b88c60e0f244b92d79f17
+  metadata.gz: d8ad8063e83a0d51494cb9d69f552676b27ac2022c9d477af6e12902bc2a9c7ceddc07d51965c594ab3ddf92839da6071d8a407836774e26c676b2fd3c9d584d
+  data.tar.gz: 18b394b6fd082a3072d543b120656ee181a68ce4c1a4cf3f0551f53719e07a96ec1b2140d61fac86e328370464e024df38872a0d85bc0b95aee588bb3e844982

data/.gitignore

@@ -20,3 +20,5 @@
 Gemfile.lock
 relaton/
 .vscode/
+
+.rubocop-https--*

data/.rubocop.yml

@@ -1,6 +1,14 @@
 # This project follows the Ribose OSS style guide.
 # https://github.com/riboseinc/oss-guides
 # All project-specific additions and overrides should be specified in this file.
-
 inherit_from:
   - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
+
+# local repo-specific modifications
+
+AllCops:
+  DisplayCopNames: false
+  StyleGuideCopsOnly: false
+  TargetRubyVersion: 2.4
+Rails:
+  Enabled: true

data/lib/metanorma/compile.rb

@@ -1,6 +1,7 @@
 require "fileutils"
 require "nokogiri"
 require "htmlentities"
+require "yaml"
 
 require "fontist"
 require "fontist/manifest/install"
@@ -251,6 +252,10 @@ module Metanorma
         isodoc_options[:datauriimage] = true if options[:datauriimage]
         file_extension = @processor.output_formats[ext]
         outfilename = f.sub(/\.[^.]+$/, ".#{file_extension}")
+        if ext == :pdf
+          font_locations = fontist_font_locations(options)
+          isodoc_options[:mn2pdf] = { font_manifest_file: font_locations.path } if font_locations
+        end
         if ext == :rxl
           options[:relaton] = outfilename
           relaton_export(isodoc, options)
@@ -264,6 +269,9 @@ module Metanorma
             puts e.backtrace.join("\n")
           end
         end
+        if ext == :pdf
+          # font_locations.unlink
+        end
         wrap_html(options, file_extension, outfilename)
       end
     end
@@ -275,7 +283,7 @@ module Metanorma
         return
       end
 
-      if !@processor.respond_to?(:fonts_manifest) || @processor.fonts_manifest.nil?
+      if missing_fontist_manifest?
         Util.log("[fontist] Skip font installation because font_manifest is missing", :debug)
         return
       end
@@ -285,17 +293,21 @@ module Metanorma
       manifest = @processor.fonts_manifest
       agree_to_terms = options[:agree_to_terms] || false
       continue_without_fonts = options[:continue_without_fonts] || false
+      no_progress = options[:no_progress] || false
 
-      install_fonts_safe(manifest, agree_to_terms, continue_without_fonts)
+      install_fonts_safe(manifest, agree_to_terms, continue_without_fonts, no_progress)
     end
 
     private
 
-    def install_fonts_safe(manifest, agree, continue)
-      fontist_install(manifest, agree)
+    def install_fonts_safe(manifest, agree, continue, no_progress)
+      fontist_install(manifest, agree, no_progress)
     rescue Fontist::Errors::LicensingError
       if continue
-        Util.log("[fontist] Processing will continue without fonts installed", :debug)
+        Util.log(
+          "[fontist] Processing will continue without fonts installed",
+          :debug
+        )
       else
         Util.log("[fontist] Aborting without proper fonts installed," \
           " make sure that you have set option --agree-to-terms", :fatal)
@@ -303,21 +315,52 @@ module Metanorma
     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-#{@processor.short}/issues" \
-        " to report this issue.", log_level)
+        "Please report this issue at github.com/metanorma/metanorma-"\
+        "#{@processor.short}/issues to report this issue.", log_level)
     rescue Fontist::Errors::FormulaIndexNotFoundError
-      Util.log("[fontist] Bug: formula index not found after 'fontist update'", :fatal) if @updated_formulas_repo
+      if @updated_formulas_repo
+        Util.log(
+          "[fontist] Bug: formula index not found after 'fontist update'",
+          :fatal
+        )
+      end
       Util.log("[fontist] Missing formula index. Fetching it...", :debug)
       Fontist::Formula.update_formulas_repo
       @updated_formulas_repo = true
-      install_fonts_safe(manifest, agree, continue)
+      install_fonts_safe(manifest, agree, continue, no_progress)
     end
 
-    def fontist_install(manifest, agree)
+    def fontist_install(manifest, agree, no_progress)
       Fontist::Manifest::Install.from_hash(
         manifest,
-        confirmation: agree ? "yes" : "no"
+        confirmation: agree ? "yes" : "no",
+        no_progress: no_progress
+      )
+    end
+
+    def fontist_font_locations(options)
+      return nil if missing_fontist_manifest? || options[:no_install_fonts]
+
+      dump_fontist_manifest_locations(@processor.fonts_manifest)
+    rescue Fontist::Errors::FormulaIndexNotFoundError
+      raise unless options[:continue_without_fonts]
+
+      nil
+    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.respond_to?(:fonts_manifest) || @processor.fonts_manifest.nil?
     end
 
     # @param options [Hash]

data/lib/metanorma/input/asciidoc.rb

@@ -70,11 +70,13 @@ module Metanorma
         /\n:title-font: (?<titlefont>[^\n]+)\n/ =~ headerextract
         /\n:i18nyaml: (?<i18nyaml>[^\n]+)\n/ =~ headerextract
         /\n:htmlstylesheet: (?<htmlstylesheet>[^\n]+)\n/ =~ headerextract
+        /\n:htmlstylesheet-override: (?<htmlstylesheet_override>[^\n]+)\n/ =~ headerextract
         /\n:htmlcoverpage: (?<htmlcoverpage>[^\n]+)\n/ =~ headerextract
         /\n:htmlintropage: (?<htmlintropage>[^\n]+)\n/ =~ headerextract
         /\n:scripts: (?<scripts>[^\n]+)\n/ =~ headerextract
         /\n:scripts-pdf: (?<scripts_pdf>[^\n]+)\n/ =~ headerextract
         /\n:wordstylesheet: (?<wordstylesheet>[^\n]+)\n/ =~ headerextract
+        /\n:wordstylesheet-override: (?<wordstylesheet_override>[^\n]+)\n/ =~ headerextract
         /\n:standardstylesheet: (?<standardstylesheet>[^\n]+)\n/ =~ headerextract
         /\n:header: (?<header>[^\n]+)\n/ =~ headerextract
         /\n:wordcoverpage: (?<wordcoverpage>[^\n]+)\n/ =~ headerextract
@@ -102,11 +104,13 @@ module Metanorma
           titlefont: defined?(titlefont) ? titlefont : nil,
           i18nyaml: defined?(i18nyaml) ? i18nyaml : nil,
           htmlstylesheet: defined?(htmlstylesheet) ? htmlstylesheet : nil,
+          htmlstylesheet_override: defined?(htmlstylesheet_override) ? htmlstylesheet_override : nil,
           htmlcoverpage: defined?(htmlcoverpage) ? htmlcoverpage : nil,
           htmlintropage: defined?(htmlintropage) ? htmlintropage : nil,
           scripts: defined?(scripts) ? scripts : nil,
           scripts_pdf: defined?(scripts_pdf) ? scripts_pdf : nil,
           wordstylesheet: defined?(wordstylesheet) ? wordstylesheet : nil,
+          wordstylesheet_override: defined?(wordstylesheet_override) ? wordstylesheet_override : nil,
           standardstylesheet: defined?(standardstylesheet) ? standardstylesheet : nil,
           header: defined?(header) ? header : nil,
           wordcoverpage: defined?(wordcoverpage) ? wordcoverpage : nil,

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "1.2.7"
+  VERSION = "1.2.8"
 end

data/metanorma.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'htmlentities'
   spec.add_runtime_dependency 'nokogiri'
   spec.add_runtime_dependency 'mn2pdf', "~> 1"
-  spec.add_runtime_dependency 'metanorma-utils', "~> 1.0.3"
+  spec.add_runtime_dependency 'metanorma-utils', "~> 1.1.0"
   spec.add_runtime_dependency 'pry'
   spec.add_runtime_dependency 'fontist', '~> 1.8'
 
@@ -42,4 +42,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "metanorma-iso", "~> 1.7.0"
   spec.add_development_dependency "sassc", "~> 2.4.0"
+  spec.add_development_dependency "rubocop", "~> 1.5.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.2.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-16 00:00:00.000000000 Z
+date: 2021-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -206,6 +206,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.4.0
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.2
 description: Library to process any Metanorma standard.
 email:
 - open.source@ribose.com