metanorma 1.3.6 → 1.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1858cecb1db05debaa3cb36f970a2bcb76b403508067ea2fa8569720fd294a98
-  data.tar.gz: 90f6e4bca7bd431a9d40a989c77837e6cfa47a12e436e0934624592bac0707f0
+  metadata.gz: 16196ab7719ac294eb22120afeb64ebceee75e83469bf0a4ae1abd2221952139
+  data.tar.gz: d1ed0d591efa82eb1e40b09f6598f98f6d7738435c85b6146e2ec7ada41a3413
 SHA512:
-  metadata.gz: 8aec70e8a44751d4ab8557b793718c0bd02be3d90715a0048864257a8faf4bf23a5f4b60b780cf6d24658179eb2ecb572bf8b870ca9313b5d6f70839d2df03a5
-  data.tar.gz: 58814116504a8ec8c80961e836adf50b7e50bc049d2a259031e7dc92b9a8f8909ddd8bbc26219197057a6e4a9dfec4ee05cb16144f1b69fdfdc66d46d9408e9b
+  metadata.gz: 4618e5ebe7f688ae9eec5680d0f17aa2795391e1485e749f975052952378742a0c29be722e46aef10c34432a658294bb06c5eac945c56a27c65c8ab7aedc944b
+  data.tar.gz: e0b3b3ac8846b3d6ecd1fb75691d525f3763c126d2c1db3469c1192c93a14f9a168ec75f2a851f92260334c514704072cc9a59c360034d8de578ca37a2bebf24

data/lib/metanorma/collection_fileprocess.rb

@@ -28,9 +28,9 @@ module Metanorma
           files[identifier][:bibdata] = xml.at(ns("//bibdata"))
         end
         files[identifier][:bibitem] = files[identifier][:bibdata].dup
-          files[identifier][:bibitem].name = "bibitem"
-          files[identifier][:bibitem]["hidden"] = "true"
-          files[identifier][:bibitem]&.at("./*[local-name() = 'ext']")&.remove
+        files[identifier][:bibitem].name = "bibitem"
+        files[identifier][:bibitem]["hidden"] = "true"
+        files[identifier][:bibitem]&.at("./*[local-name() = 'ext']")&.remove
       end
       add_section_split(files)
     end
@@ -46,10 +46,8 @@ module Metanorma
                 bibdata: files[k][:bibdata], ref: f1[:url] }
             m[k + f1[:title]][:bare] = true unless i.zero?
           end
-          m[k] = files[k]
-        else
-          m[k] = files[k]
         end
+        m[k] = files[k]
       end
     end
 
@@ -160,8 +158,8 @@ module Metanorma
           # 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)
+                       File.join(@outdir, fn)
+          @files[identifier][:outputs][e] = File.join(@outdir, fn)
         end
       end
     end

data/lib/metanorma/collection_renderer.rb

@@ -76,7 +76,9 @@ module Metanorma
           filename = @files[id][:outputs][e]
           out.documents[id] = Metanorma::Document.raw_file(filename)
         end
-        File.open(File.join(@outdir, "collection.#{ext}"), "w:UTF-8") { |f| f.write(out.to_xml) }
+        File.open(File.join(@outdir, "collection.#{ext}"), "w:UTF-8") do |f|
+          f.write(out.to_xml)
+        end
       end
       options[:format].include?(:pdf) and
         pdfconv.convert(File.join(@outdir, "collection.presentation.xml"))

data/lib/metanorma/compile.rb

@@ -233,8 +233,8 @@ module Metanorma
       isodoc_options = @processor.extract_options(file)
       isodoc_options[:datauriimage] = true if options[:datauriimage]
       isodoc_options[:sourcefilename] = options[:filename]
-      isodoc_options[:bare] = options[:bare]
-      isodoc_options[:sectionsplit] = options[:sectionsplit]
+      isodoc_options[:bare] ||= options[:bare]
+      isodoc_options[:sectionsplit] ||= options[:sectionsplit]
       if ext == :pdf
         floc = FontistUtils.fontist_font_locations(@processor, options) and
           isodoc_options[:mn2pdf] = { font_manifest_file: floc.path }

data/lib/metanorma/input/asciidoc.rb

@@ -57,9 +57,9 @@ module Metanorma
       end
 
       ADOC_OPTIONS = %w(htmlstylesheet htmlcoverpage htmlintropage scripts
-                        scripts-override scripts-pdf wordstylesheet bare i18nyaml
+                        scripts-override scripts-pdf wordstylesheet i18nyaml
                         standardstylesheet header wordcoverpage wordintropage
-                        ulstyle olstyle htmlstylesheet-override
+                        ulstyle olstyle htmlstylesheet-override bare
                         htmltoclevels doctoclevels sectionsplit
                         body-font header-font monospace-font title-font
                         wordstylesheet-override).freeze

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "1.3.6".freeze
+  VERSION = "1.3.7".freeze
 end

data/metanorma.gemspec

@@ -36,10 +36,11 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "byebug", "~> 10.0"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
-  spec.add_development_dependency "metanorma-iso", "~> 1.8.0"
+  spec.add_development_dependency "metanorma-iso", "~> 1.9.0"
   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.6
+  version: 1.3.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-05 00:00:00.000000000 Z
+date: 2021-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -220,6 +220,20 @@ 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