metanorma 1.3.11 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f054752f3bb51d3e1cfe983beaca06c817275d214d5652503a42325d93403a42
-  data.tar.gz: 212a35305289d4286539dcdb008bf799fac028e87a84aab0a33b8137c73d84d5
+  metadata.gz: 539ee4d965aaed56cda517046d0a920d4ddebeba3844bac78107269c2cf5413e
+  data.tar.gz: 86dcc77ca4ced164f69bab210e004f02a3d4d23cecb9803c8a3d341deaf1964d
 SHA512:
-  metadata.gz: c23014599c6a03a04b0dfa4fe93c6b300b0311ff55e552a5f1bd79a2d55220789c94916a9c6b694a044cd9247dcd95d1ab6dde05e0e7d949a29bcaedb07d8807
-  data.tar.gz: 98da695a8d3cd9b93f244161b8e0874b7851bb6426fd686cabcafe493f8088b0af2923a216b2741d34a2532b8f76adc3ac377af1caa8a639fdd27ba4c1866ef7
+  metadata.gz: ac4a4d6372d7c76fa7013443d45e7ef21d503147ce16592041d041ce7015351a88af7fa28dd1b9e5db315ddf5d684389026f8a90d51ece750fc8e232b46c1d8c
+  data.tar.gz: 7a090eea1ff61230a291fe434f4a41ac882c51a51045404ab03010903799f8f666c7fab678b86e8fda062cfb0699a0c0f667dbad632f0682f4361b5b4acfd586

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_fileprocess.rb

@@ -164,10 +164,15 @@ module Metanorma
     def file_compile(file, filename, identifier)
       return if @files[identifier][:sectionsplit] == "true"
 
-      @compile.compile file.path, { format: :asciidoc, extension_keys: @format }
-        .merge(compile_options(identifier))
+      opts = {
+        format: :asciidoc,
+        extension_keys: @format,
+        output_dir: @outdir,
+      }.merge(compile_options(identifier))
+
+      @compile.compile file, opts
       @files[identifier][:outputs] = {}
-      file_compile_formats(file, filename, identifier)
+      file_compile_formats(filename, identifier)
     end
 
     def compile_options(identifier)
@@ -182,29 +187,17 @@ module Metanorma
       ret
     end
 
-    def file_compile_formats(file, filename, identifier)
+    def file_compile_formats(filename, identifier)
+      file_id = @files[identifier]
       @format.each do |e|
         ext = @compile.processor.output_formats[e]
         fn = File.basename(filename).sub(/(?<=\.)[^.]+$/, ext.to_s)
-        if /html$/.match?(ext) && @files[identifier][:sectionsplit]
-          # file_sectionsplit_copy(file, fn, identifier, ext, e)
-        else
-          FileUtils.cp file.path.sub(/\.xml$/, ".#{ext}"),
-                       File.join(@outdir, fn)
-          @files[identifier][:outputs][e] = File.join(@outdir, fn)
+        unless /html$/.match?(ext) && file_id[:sectionsplit]
+          file_id[:outputs][e] = File.join(@outdir, fn)
         end
       end
     end
 
-    def file_sectionsplit_copy(file, base, identifier, ext, format)
-      dir = file.path.sub(/\.xml$/, ".#{ext}_collection")
-      files = Dir.glob("#{dir}/*.#{ext}")
-      FileUtils.cp files, @outdir
-      cover = File.join(@outdir, base.sub(/\.html$/, ".index.html"))
-      FileUtils.cp File.join(dir, "index.html"), cover
-      @files[identifier][:outputs][format] = cover
-    end
-
     def copy_file_to_dest(fileref)
       dest = File.join(@outdir, fileref[:out_path])
       FileUtils.mkdir_p(File.dirname(dest))
@@ -223,12 +216,13 @@ module Metanorma
         else
           file, filename = targetfile(x, read: true)
           warn "\n\n\n\n\nProcess #{filename}: #{DateTime.now.strftime('%H:%M:%S')}"
-          file = update_xrefs(file, identifier, internal_refs)
-          Tempfile.open(["collection", ".xml"], encoding: "utf-8") do |f|
-            f.write(file)
-            f.close
-            file_compile(f, filename, identifier)
-          end
+          collection_xml = update_xrefs(file, identifier, internal_refs)
+          collection_filename = File.basename(filename, File.extname(filename))
+          collection_xml_path = File.join(Dir.tmpdir,
+                                          "#{collection_filename}.xml")
+          File.write collection_xml_path, collection_xml, encoding: "UTF-8"
+          file_compile(collection_xml_path, filename, identifier)
+          FileUtils.rm(collection_xml_path)
         end
       end
     end

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

@@ -32,7 +32,7 @@ module Metanorma
       extract(isodoc, options[:extract], options[:extract_type])
       FontistUtils.install_fonts(@processor, options) unless @fontist_installed
       @fontist_installed = true
-      process_extensions(extensions, file, isodoc, options)
+      process_extensions(filename, extensions, file, isodoc, options)
     end
 
     def require_libraries(options)
@@ -199,7 +199,7 @@ module Metanorma
     end
 
     # isodoc is Raw Metanorma XML
-    def process_extensions(extensions, file, isodoc, options)
+    def process_extensions(filename, extensions, file, isodoc, options)
       f = change_output_dir options
       xml_name = f.sub(/\.[^.]+$/, ".xml")
       presentationxml_name = f.sub(/\.[^.]+$/, ".presentation.xml")
@@ -210,10 +210,16 @@ module Metanorma
         if ext == :rxl
           relaton_export(isodoc, options.merge(relaton: outfilename))
         elsif options[:passthrough_presentation_xml] && ext == :presentation
-          FileUtils.cp f, presentationxml_name
+          FileUtils.cp filename, presentationxml_name
         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 baseassetpath).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)
@@ -62,7 +62,7 @@ module Metanorma
                         ulstyle olstyle htmlstylesheet-override bare
                         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")
@@ -84,12 +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.11".freeze
+  VERSION = "1.4.2".freeze
 end

data/metanorma.gemspec

@@ -34,13 +34,13 @@ Gem::Specification.new do |spec|
   # spec.add_dependency "relaton-cli"
   # spec.add_dependency "metanorma-standoc"
 
-  spec.add_development_dependency "byebug", "~> 10.0"
+  spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "metanorma-iso", "~> 1.9.0"
+  spec.add_development_dependency "mnconvert"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rspec-command", "~> 1.0"
   spec.add_development_dependency "rubocop", "~> 1.5.2"
   spec.add_development_dependency "sassc", "~> 2.4.0"
-  spec.add_development_dependency "mnconvert"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 1.3.11
+  version: 1.4.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-27 00:00:00.000000000 Z
+date: 2021-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -109,19 +109,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: debug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +150,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.9.0
+- !ruby/object:Gem::Dependency
+  name: mnconvert
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -220,20 +234,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.4.0
-- !ruby/object:Gem::Dependency
-  name: mnconvert
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Library to process any Metanorma standard.
 email:
 - open.source@ribose.com
@@ -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