metanorma 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aecd92b31139e0a3f76ff7485f3bde8e5b6d89be735eafadc0215962b8b1aec1
-  data.tar.gz: 4c00ec06b3d9a632bbdbc810aa46635fef4c85f88382c6e014a8238261987f7e
+  metadata.gz: f6bdfc7913fb212cb141c23550aacaf2dd5c4261feea33946760a4b22af68298
+  data.tar.gz: 2a2fc2ae5c8b193b21063b368b8f6cac542dc98662e0376787d946020fe1e2b7
 SHA512:
-  metadata.gz: 570efb165e57540e107f6f29acd53a373d702c825eefd1c9ee3e04fac4644432fc9347400dea3a1b48f8aa03c28ac31634bd4a3545dc86622768d2285a9cb87f
-  data.tar.gz: 554df7349b548f35d6fbf3f04d453964c3aa7a9067c496f4815eed42de07ceeaca4b93a7278f41709343744569c7c45b096916b184050366369597b22281ed46
+  metadata.gz: 939e66856ea7e3bcdba7f67771606913e8510be72d52ac09dd22643cdc155b7cc2ed41c09a2a5fed32c322470ca44c2fe975c941eb0d0581d39f5cd775aac723
+  data.tar.gz: f6cf21861fe6154831fb4e47b93b88224bb3d65f37ea2496fd2c0c868e1836d1b590b1a67376229fefed57c019b97ec9ef5adef8a7d84d8ef0f8af9b29c322c8

data/lib/metanorma/collection.rb

@@ -47,7 +47,7 @@ module Metanorma
       Nokogiri::XML::Builder.new do |xml|
         xml.send("metanorma-collection",
                  "xmlns" => "http://metanorma.org") do |mc|
-          @bibdata.to_xml mc, bibdata: true, date_format: :full
+          mc << @bibdata.to_xml(bibdata: true, date_format: :full)
           @manifest.to_xml mc
           content_to_xml "prefatory", mc
           doccontainer mc

data/lib/metanorma/collection_renderer.rb

@@ -54,7 +54,8 @@ module Metanorma
     end
 
     def concatenate(col, options)
-      options[:format].each do |e|
+      options[:format] << :presentation if options[:format].include?(:pdf)
+      options[:format].uniq.each do |e|
         next unless %i(presentation xml).include?(e)
         ext = e == :presentation ? "presentation.xml" : e.to_s
         out = col.clone
@@ -65,6 +66,13 @@ module Metanorma
         end
         File.open(File.join(@outdir, "collection.#{ext}"), "w:UTF-8") { |f| f.write(out.to_xml) }
       end
+      options[:format].include?(:pdf) and
+        pdfconv.convert(File.join(@outdir, "collection.presentation.xml"))
+    end
+
+    def pdfconv
+      x = Asciidoctor.load nil, backend: @doctype.to_sym
+      x.converter.pdf_converter(Dummy.new)
     end
 
     # Dummy class

data/lib/metanorma/document.rb

@@ -86,7 +86,7 @@ module Metanorma
       if @raw
         builder << @bibitem.root.to_xml
       else
-        builder.send(type + "-standard") { |b| @bibitem.to_xml b, bibdata: true }
+        builder.send(type + "-standard") { |b| b << @bibitem.to_xml(bibdata: true) }
       end
     end
   end

data/lib/metanorma/output/xslfo.rb

@@ -4,10 +4,10 @@ require_relative "./utils.rb"
 module Metanorma
   module Output
     class XslfoPdf < Base
-      def convert(url_path, output_path, xsl_stylesheet)
+      def convert(url_path, output_path, xsl_stylesheet, options = "")
         return if url_path.nil? || output_path.nil? || xsl_stylesheet.nil?
 
-        Mn2pdf.convert(quote(url_path), quote(output_path), quote(xsl_stylesheet))
+        Mn2pdf.convert(quote(url_path), quote(output_path), quote(xsl_stylesheet), options)
       end
 
       def quote(x)

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "1.1.6"
+  VERSION = "1.1.7"
 end

data/metanorma.gemspec

@@ -37,5 +37,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec-command", "~> 1.0"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "metanorma-iso", "~> 1.5.8"
+  spec.add_development_dependency "sassc", "~> 2.4.0"
   #spec.add_development_dependency "isodoc", "~> 1.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-26 00:00:00.000000000 Z
+date: 2020-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -150,6 +150,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.8
+- !ruby/object:Gem::Dependency
+  name: sassc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.0
 description: Library to process any Metanorma standard.
 email:
 - open.source@ribose.com