metanorma 1.3.9.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a9807dfd686937050274493eff01bd863f032f237dad7baff1c027a0fa75561
-  data.tar.gz: 901710c9e8e1ac28c417d859ded7bc930da149ff01220319053583eb518751d1
+  metadata.gz: cebdc5e3a04db33d1bf3c0042d914f03a1e7c36ae67d625138fb1499679abdcf
+  data.tar.gz: 82f7a4b816cea046181cfd05da94ca21a52f1c12ac02d9f6f2e89ae1b07e6f60
 SHA512:
-  metadata.gz: afe50ca043b69ba258442f8061011492cd53b272c42cd1b386da20781df61348dca788147debac44d4477d3381725f44e956881417d38c8a60cfcec7835de756
-  data.tar.gz: 0e1696dab391b92724517eadfc307d7cd1392ad533906c23e427bafc31cf88232dd8fc31a47c2d179d8057de42165da285bfc8a990631a58d4b989fb7dda22d9
+  metadata.gz: cfa8565f3b0a55f12f0d0e8971d82c8bf619390cfc76860514dda7b1801267d7e04719161048ff7d9b16a71e238df2e24e145198229b5b5930233ae9110933ec
+  data.tar.gz: 81764ee18d5c1b36f3aacf19c0a4cf4b02cd4fb0a8979fe9d0a6733a93f4f05ddc845be35b25ec38be31d595fd04a019ae6aaf6ca33a97664519550e1abe280b

data/lib/metanorma/collection_fileparse.rb

@@ -44,7 +44,7 @@ module Metanorma
       newbib = dup_bibitem(docid, bib)
       bib.replace(newbib)
       _file, url = targetfile(@files[docid], relative: true, read: false,
-                              doc: !@files[docid][:attachment])
+                                             doc: !@files[docid][:attachment])
       uri_node = Nokogiri::XML::Node.new "uri", newbib
       uri_node[:type] = "citation"
       uri_node.content = url
@@ -53,7 +53,7 @@ module Metanorma
 
     def fail_update_bibitem(docid, identifier)
       error = "[metanorma] Cannot find crossreference to document #{docid} "\
-        "in document #{identifier}."
+              "in document #{identifier}."
       @log.add("Cross-References", nil, error)
       Util.log(error, :warning)
     end
@@ -78,6 +78,7 @@ module Metanorma
     # @return [String] XML content
     def update_xrefs(file, identifier, internal_refs)
       docxml = Nokogiri::XML(file) { |config| config.huge }
+      supply_repo_ids(docxml)
       update_indirect_refs_to_docs(docxml, internal_refs)
       add_document_suffix(identifier, docxml)
       update_direct_refs_to_docs(docxml, identifier)
@@ -89,6 +90,18 @@ module Metanorma
       docxml.to_xml
     end
 
+    def supply_repo_ids(docxml)
+      docxml.xpath(ns("//bibitem[not(ancestor::bibitem)]")).each do |b|
+        next if b&.at(ns("./docidentifier[@type = 'repository']"))
+
+        b.xpath(ns("./docidentifier")).each do |d|
+          next unless @files[d.text]
+
+          d.next = "<docidentifier type='repository'>current-metanorma-collection/#{d.text}"
+        end
+      end
+    end
+
     def datauri_encode(docxml)
       docxml.xpath(ns("//image")).each do |i|
         i["src"] = Metanorma::Utils::datauri(i["src"])
@@ -161,7 +174,7 @@ module Metanorma
         if @files[docid] then update_anchor_loc(bib, e, docid)
         else
           e << "<strong>** Unresolved reference to document #{docid} "\
-            "from eref</strong>"
+               "from eref</strong>"
         end
       end
     end
@@ -188,7 +201,7 @@ module Metanorma
       ref = ins&.at(ns("./locality/referenceFrom"))&.text
       anchor = @files[docid][:anchors].dig(type, ref) or return
       ins << "<locality type='anchor'><referenceFrom>#{anchor.sub(/^_/, '')}"\
-        "</referenceFrom></locality>"
+             "</referenceFrom></locality>"
     end
 
     # gather internal bibitem references

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,6 +214,12 @@ module Metanorma
         elsif ext == :html && options[:sectionsplit]
           sectionsplit_convert(xml_name, isodoc, outfilename, isodoc_options)
         else
+          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)
               @processor.output(nil, presentationxml_name, outfilename, ext,
@@ -245,13 +251,10 @@ module Metanorma
       isodoc_options = @processor.extract_options(file)
       isodoc_options[:datauriimage] = true if options[:datauriimage]
       isodoc_options[:sourcefilename] = options[:filename]
-      %i(bare sectionsplit no_install_fonts).each do |x|
+      %i(bare sectionsplit no_install_fonts baseassetpath aligncrosselements)
+        .each do |x|
         isodoc_options[x] ||= options[x]
       end
-      if ext == :pdf
-        floc = FontistUtils.fontist_font_locations(@processor, options) and
-          isodoc_options[:mn2pdf] = { font_manifest_file: floc.path }
-      end
       isodoc_options
     end
 

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

@@ -49,7 +49,7 @@ module Metanorma
           extensions: defined?(extensions) ? extensions : nil,
           relaton: defined?(relaton) ? relaton : nil,
           asciimath: asciimath,
-        }.reject { |_, val| val.nil? }
+        }.compact
       end
 
       def empty_attr(attr, name)
@@ -60,9 +60,9 @@ module Metanorma
                         scripts-override scripts-pdf wordstylesheet i18nyaml
                         standardstylesheet header wordcoverpage wordintropage
                         ulstyle olstyle htmlstylesheet-override bare
-                        htmltoclevels doctoclevels sectionsplit
+                        htmltoclevels doctoclevels sectionsplit base-asset-path
                         body-font header-font monospace-font title-font
-                        wordstylesheet-override).freeze
+                        align-cross-elements wordstylesheet-override).freeze
 
       def extract_options(file)
         header = file.sub(/\n\n.*$/m, "\n")
@@ -75,6 +75,7 @@ module Metanorma
         /\n:(?<hier_assets>hierarchical-assets:[^\n]*)\n/ =~ header
         /\n:(?<use_xinclude>use-xinclude:[^\n]*)\n/ =~ header
         /\n:(?<break_up>break-up-urls-in-tables:[^\n]*)\n/ =~ header
+        /\n:suppress-asciimath-dup: (?<suppress_asciimath_dup>[^\n]+)\n/ =~ header
 
         defined?(hier_assets) and
           hier_assets = empty_attr(hier_assets, "hierarchical-assets")
@@ -83,11 +84,12 @@ 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,
           break_up_urls_in_tables: defined?(break_up) ? break_up : nil,
-        ).reject { |_, val| val.nil? }
+        ).compact
       end
     end
   end

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "1.3.9.1".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.9.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-16 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