metanorma 1.4.6 → 1.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b300675f26c29369f59151fc665c176cd639b324ae7b3f9f9a25d2202740d45c
-  data.tar.gz: b1ddfe077b756b1d53093c1304099fbab5df7808220e0ce20c2b5d025dc1e011
+  metadata.gz: ed20add5b0be427c6da63cb6eb9725e2b8bc630248756a3f5a508546ec39d8c0
+  data.tar.gz: 7da47c02499a77d1284b3b5f5ea3edc90e7292d36db89181e7e3eff59eaa6346
 SHA512:
-  metadata.gz: 988cf0f24e900c751533ecf973ba0cc73b686640bdaf5933e0078a0cfd45c6f5165f4fe7ddf438519cec42b2082e73f0b8c0d1905ff4a28d310e952ab8e68b13
-  data.tar.gz: af28119205eac475051ff399537f9b4d7a4d9f2d7c5954cac11f1360c1d0d612d3faf2a76283edac0088cf717ed0c5dfa9a0bec9da66d330375f5c9170950514
+  metadata.gz: be96d8c7ba4bf588e5f3df380c79234dfde2efd60809d736ace1d9e4fd3f4e30a557d26a6a871c8e60d0b594efac57c1f5ee1e30539cbe74872b09c860deb648
+  data.tar.gz: 9b5ef259facad85743f855644b703f11cac05123eaa6a94d3a7239bc300cf915eae21971acf79f57e8dbb8ea1594a6ac3c776fd951dfb1531291f2481152e1b6

data/lib/metanorma/collection.rb

@@ -56,7 +56,7 @@ module Metanorma
     # @return [String] XML
     def to_xml
       b = Nokogiri::XML::Builder.new do |xml|
-        xml.send("metanorma-collection",
+        xml.send(:"metanorma-collection",
                  "xmlns" => "http://metanorma.org") do |mc|
           collection_body(mc)
         end
@@ -183,7 +183,7 @@ module Metanorma
 
     def doccontainer1(builder, doc, idx)
       id = format("doc%<index>09d", index: idx)
-      builder.send("doc-container", id: id) do |b|
+      builder.send(:"doc-container", id: id) do |b|
         if doc.attachment
           doc.bibitem and b << doc.bibitem.root.to_xml
           b.attachment Metanorma::Utils::datauri(doc.file)

data/lib/metanorma/collection_fileprocess.rb

@@ -69,8 +69,8 @@ module Metanorma
     end
 
     def add_section_split_instance(file, manifest, key, idx, files)
-      dir = File.dirname(files[key][:ref])
-      presfile = File.join(dir, File.basename(file[:url]))
+      presfile = File.join(File.dirname(files[key][:ref]),
+                           File.basename(file[:url]))
       manifest["#{key} #{file[:title]}"] =
         { parentid: key, presentationxml: true, type: "fileref",
           rel_path: file[:url], out_path: File.basename(file[:url]),

data/lib/metanorma/collection_renderer.rb

@@ -85,22 +85,25 @@ module Metanorma
         next unless %i(presentation xml).include?(e)
 
         ext = e == :presentation ? "presentation.xml" : e.to_s
-        out = col.clone
-        out.directives << "documents-inline"
-        out.documents.each_key do |id|
-          next if @files[id][:attachment] || @files[id][:outputs].nil?
-
-          filename = @files[id][:outputs][e]
-          out.documents[id] = Metanorma::Document.raw_file(filename)
-        end
         File.open(File.join(@outdir, "collection.#{ext}"), "w:UTF-8") do |f|
-          f.write(out.to_xml)
+          f.write(concatenate1(col.clone, e).to_xml)
         end
       end
       options[:format].include?(:pdf) and
         pdfconv.convert(File.join(@outdir, "collection.presentation.xml"))
     end
 
+    def concatenate1(out, ext)
+      out.directives << "documents-inline"
+      out.documents.each_key do |id|
+        next if @files[id][:attachment] || @files[id][:outputs].nil?
+
+        out.documents[id] =
+          Metanorma::Document.raw_file(@files[id][:outputs][ext])
+      end
+      out
+    end
+
     def pdfconv
       doctype = @doctype.to_sym
       x = Asciidoctor.load nil, backend: doctype
@@ -152,9 +155,9 @@ module Metanorma
 
     # infer the flavour from the first document identifier; relaton does that
     def doctype
-      if (docid = @xml&.at(ns("//bibdata/docidentifier/@type"))&.text)
+      if (docid = @xml.at(ns("//bibdata/docidentifier/@type"))&.text)
         dt = docid.downcase
-      elsif (docid = @xml&.at(ns("//bibdata/docidentifier"))&.text)
+      elsif (docid = @xml.at(ns("//bibdata/docidentifier"))&.text)
         dt = docid.sub(/\s.*$/, "").lowercase
       else return "standoc"
       end
@@ -179,8 +182,8 @@ module Metanorma
     # @param elm [Nokogiri::XML::Element]
     # @return [String]
     def indexfile_title(elm)
-      lvl = elm&.at(ns("./level"))&.text&.capitalize
-      lbl = elm&.at(ns("./title"))&.text
+      lvl = elm.at(ns("./level"))&.text&.capitalize
+      lbl = elm.at(ns("./title"))&.text
       "#{lvl}#{lvl && lbl ? ': ' : ''}#{lbl}"
     end
 

data/lib/metanorma/compile.rb

@@ -5,6 +5,7 @@ require "yaml"
 require "fontist"
 require "fontist/manifest/install"
 require_relative "compile_validate"
+require_relative "compile_options"
 require_relative "fontist_utils"
 require_relative "util"
 require_relative "sectionsplit"
@@ -32,61 +33,10 @@ module Metanorma
       (file, isodoc = process_input(filename, options)) or return nil
       relaton_export(isodoc, options)
       extract(isodoc, options[:extract], options[:extract_type])
-      FontistUtils.install_fonts(@processor, options) unless @fontist_installed
-      @fontist_installed = true
+      font_install(options)
       process_exts(filename, extensions, file, isodoc, options)
     end
 
-    def require_libraries(options)
-      options&.dig(:require)&.each { |r| require r }
-    end
-
-    def xml_options_extract(file)
-      xml = Nokogiri::XML(file) { |config| config.huge }
-      if xml.root
-        @registry.root_tags.each do |k, v|
-          return { type: k } if v == xml.root.name
-        end
-      end
-      {}
-    end
-
-    def options_extract(filename, options)
-      content = read_file(filename)
-      o = Metanorma::Input::Asciidoc.new.extract_metanorma_options(content)
-        .merge(xml_options_extract(content))
-      options[:type] ||= o[:type]&.to_sym
-      t = @registry.alias(options[:type]) and options[:type] = t
-      dir = filename.sub(%r(/[^/]+$), "/")
-      options[:relaton] ||= "#{dir}/#{o[:relaton]}" if o[:relaton]
-      options[:sourcecode] ||= "#{dir}/#{o[:sourcecode]}" if o[:sourcecode]
-      options[:extension_keys] ||= o[:extensions]&.split(/, */)&.map(&:to_sym)
-      options[:extension_keys] = nil if options[:extension_keys] == [:all]
-      options[:format] ||= :asciidoc
-      options[:filename] = filename
-      options
-    end
-
-    def get_extensions(options)
-      options[:extension_keys] ||=
-        @processor.output_formats.reduce([]) { |memo, (k, _)| memo << k }
-      extensions = options[:extension_keys].reduce([]) do |memo, e|
-        if @processor.output_formats[e] then memo << e
-        else
-          message = "[metanorma] Error: #{e} format is not supported for this standard."
-          @errors << message
-          Util.log(message, :error)
-          memo
-        end
-      end
-      if !extensions.include?(:presentation) && extensions.any? do |e|
-        @processor.use_presentation_xml(e)
-      end
-        extensions << :presentation
-      end
-      extensions
-    end
-
     def process_input(filename, options)
       case extname = File.extname(filename)
       when ".adoc" then process_input_adoc(filename, options)
@@ -174,7 +124,7 @@ module Metanorma
       if ext == :rxl
         relaton_export(isodoc, options.merge(relaton: fnames[:out]))
       elsif options[:passthrough_presentation_xml] && ext == :presentation
-        f = File.exists?(fnames[:f]) ? fnames[:f] : fnames[:orig_filename]
+        f = File.exist?(fnames[:f]) ? fnames[:f] : fnames[:orig_filename]
         FileUtils.cp f, fnames[:presentationxml]
       elsif ext == :html && options[:sectionsplit]
         sectionsplit_convert(fnames[:xml], isodoc, fnames[:out],
@@ -222,19 +172,6 @@ module Metanorma
       end
     end
 
-    def get_isodoc_options(file, options, ext)
-      ret = @processor.extract_options(file)
-      ret[:datauriimage] = true if options[:datauriimage]
-      ret[:sourcefilename] = options[:filename]
-      %i(bare sectionsplit no_install_fonts baseassetpath aligncrosselements
-         tocfigures toctables tocrecommendations)
-        .each { |x| ret[x] ||= options[x] }
-      ext == :pdf && FontistUtils.has_fonts_manifest?(@processor, options) and
-        ret[:mn2pdf] =
-          { font_manifest: FontistUtils.location_manifest(@processor) }
-      ret
-    end
-
     # @param options [Hash]
     # @return [String]
     def change_output_dir(options)

data/lib/metanorma/compile_options.rb

@@ -0,0 +1,83 @@
+require "csv"
+
+module Metanorma
+  class Compile
+    def require_libraries(options)
+      options&.dig(:require)&.each { |r| require r }
+    end
+
+    def xml_options_extract(file)
+      xml = Nokogiri::XML(file) { |config| config.huge }
+      if xml.root
+        @registry.root_tags.each do |k, v|
+          return { type: k } if v == xml.root.name
+        end
+      end
+      {}
+    end
+
+    def options_extract(filename, options)
+      content = read_file(filename)
+      o = Metanorma::Input::Asciidoc.new.extract_metanorma_options(content)
+        .merge(xml_options_extract(content))
+      options[:type] ||= o[:type]&.to_sym
+      t = @registry.alias(options[:type]) and options[:type] = t
+      dir = filename.sub(%r(/[^/]+$), "/")
+      options[:relaton] ||= File.join(dir, o[:relaton]) if o[:relaton]
+      options[:sourcecode] ||= File.join(dir, o[:sourcecode]) if o[:sourcecode]
+      options[:extension_keys] ||= o[:extensions]&.split(/, */)&.map(&:to_sym)
+      options[:extension_keys] = nil if options[:extension_keys] == [:all]
+      options[:format] ||= :asciidoc
+      options[:filename] = filename
+      options[:fontlicenseagreement] ||= "no-install-fonts"
+      options
+    end
+
+    def get_extensions(options)
+      options[:extension_keys] ||=
+        @processor.output_formats.reduce([]) { |memo, (k, _)| memo << k }
+      extensions = options[:extension_keys].reduce([]) do |memo, e|
+        if @processor.output_formats[e] then memo << e
+        else
+          message = "[metanorma] Error: #{e} format is not supported for this standard."
+          @errors << message
+          Util.log(message, :error)
+          memo
+        end
+      end
+      if !extensions.include?(:presentation) && extensions.any? do |e|
+        @processor.use_presentation_xml(e)
+      end
+        extensions << :presentation
+      end
+      extensions
+    end
+
+    def font_install(opt)
+      FontistUtils.install_fonts(@processor, opt) unless @fontist_installed
+      @fontist_installed = true
+      return if !opt[:fonts] ||
+        opt[:fontlicenseagreement] == "continue-without-fonts"
+
+      confirm = opt[:fontlicenseagreement] == "no-install-fonts" ? "no" : "yes"
+      CSV.parse_line(opt[:fonts], col_sep: ";").map(&:strip).each do |f|
+        Fontist::Font.install(f, confirmation: confirm)
+      end
+    end
+
+    private
+
+    def get_isodoc_options(file, options, ext)
+      ret = @processor.extract_options(file)
+      ret[:datauriimage] = true if options[:datauriimage]
+      ret[:sourcefilename] = options[:filename]
+      %i(bare sectionsplit no_install_fonts baseassetpath aligncrosselements
+         tocfigures toctables tocrecommendations)
+        .each { |x| ret[x] ||= options[x] }
+      ext == :pdf && FontistUtils.has_fonts_manifest?(@processor, options) and
+        ret[:mn2pdf] =
+          { font_manifest: FontistUtils.location_manifest(@processor) }
+      ret
+    end
+  end
+end

data/lib/metanorma/input/asciidoc.rb

@@ -68,8 +68,9 @@ module Metanorma
            pdf-owner-password pdf-allow-copy-content pdf-allow-edit-content
            pdf-allow-assemble-document pdf-allow-edit-annotations
            pdf-allow-print pdf-allow-print-hq pdf-allow-fill-in-forms
-           toc-figures toc-tables toc-recommendations
-           pdf-allow-access-content pdf-encrypt-metadata).freeze
+           toc-figures toc-tables toc-recommendations fonts
+           font-license-agreement pdf-allow-access-content
+           pdf-encrypt-metadata).freeze
 
       def extract_options(file)
         header = file.sub(/\n\n.*$/m, "\n")

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "1.4.6".freeze
+  VERSION = "1.4.7".freeze
 end

data/metanorma.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 2.5.0"
 
   spec.add_runtime_dependency "asciidoctor"
-  spec.add_runtime_dependency "fontist", "~> 1.11"
+  spec.add_runtime_dependency "fontist"
   spec.add_runtime_dependency "htmlentities"
   spec.add_runtime_dependency "metanorma-utils", "~> 1.2.0"
   spec.add_runtime_dependency "mn2pdf", "~> 1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 1.4.6
+  version: 1.4.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-07 00:00:00.000000000 Z
+date: 2022-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -28,16 +28,16 @@ dependencies:
   name: fontist
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
@@ -271,6 +271,7 @@ files:
 - lib/metanorma/collection_manifest.rb
 - lib/metanorma/collection_renderer.rb
 - lib/metanorma/compile.rb
+- lib/metanorma/compile_options.rb
 - lib/metanorma/compile_validate.rb
 - lib/metanorma/config.rb
 - lib/metanorma/document.rb
@@ -305,7 +306,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.9
 signing_key:
 specification_version: 4
 summary: Metanorma is the standard of standards; the metanorma gem allows you to create