metanorma 1.6.0 → 1.6.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
 - data/lib/metanorma/compile.rb +9 -7
 - data/lib/metanorma/version.rb +1 -1
 - data/metanorma.gemspec +1 -1
 - metadata +4 -4
 
    
        checksums.yaml
    CHANGED
    
    | 
         @@ -1,7 +1,7 @@ 
     | 
|
| 
       1 
1 
     | 
    
         
             
            ---
         
     | 
| 
       2 
2 
     | 
    
         
             
            SHA256:
         
     | 
| 
       3 
     | 
    
         
            -
              metadata.gz:  
     | 
| 
       4 
     | 
    
         
            -
              data.tar.gz:  
     | 
| 
      
 3 
     | 
    
         
            +
              metadata.gz: 284943566222cba73b11d131aaa2ce1da77851a8ed5acd60bd11675f78c99eb3
         
     | 
| 
      
 4 
     | 
    
         
            +
              data.tar.gz: 6cd2ed331a36e1168169e495183cf92205076b7305fa8e1383424b844f5c114e
         
     | 
| 
       5 
5 
     | 
    
         
             
            SHA512:
         
     | 
| 
       6 
     | 
    
         
            -
              metadata.gz:  
     | 
| 
       7 
     | 
    
         
            -
              data.tar.gz:  
     | 
| 
      
 6 
     | 
    
         
            +
              metadata.gz: 7a8d401ebdbe17ab843c6ed40113bc4a4b29f5fb78fc7ac0adfb5fb3f1e91056f892efcfb5fc5e26cf74676f0f93e23d3c5933ed88422a7b34f8bef80466ba16
         
     | 
| 
      
 7 
     | 
    
         
            +
              data.tar.gz: 1a37a1b0598b2b20dfbbfabed2762d2e5671949f47eb7a830931ba8660edd7a4cf28b551ca42951762edaa21e1bdf5160aff3162163cdca02f3c221e1a3705a3
         
     | 
    
        data/lib/metanorma/compile.rb
    CHANGED
    
    | 
         @@ -109,7 +109,7 @@ module Metanorma 
     | 
|
| 
       109 
109 
     | 
    
         | 
| 
       110 
110 
     | 
    
         
             
                def process_exts_run(fnames, file, isodoc, extensions, options)
         
     | 
| 
       111 
111 
     | 
    
         
             
                  Util.sort_extensions_execution(extensions).each do |ext|
         
     | 
| 
       112 
     | 
    
         
            -
                    process_ext(ext, file, isodoc, fnames, options)
         
     | 
| 
      
 112 
     | 
    
         
            +
                    process_ext(ext, file, isodoc, fnames, options) or break
         
     | 
| 
       113 
113 
     | 
    
         
             
                  end
         
     | 
| 
       114 
114 
     | 
    
         
             
                end
         
     | 
| 
       115 
115 
     | 
    
         | 
| 
         @@ -124,7 +124,7 @@ module Metanorma 
     | 
|
| 
       124 
124 
     | 
    
         
             
                  fnames[:ext] = @processor.output_formats[ext]
         
     | 
| 
       125 
125 
     | 
    
         
             
                  fnames[:out] = fnames[:f].sub(/\.[^.]+$/, ".#{fnames[:ext]}")
         
     | 
| 
       126 
126 
     | 
    
         
             
                  isodoc_options = get_isodoc_options(file, options, ext)
         
     | 
| 
       127 
     | 
    
         
            -
                  thread =  
     | 
| 
      
 127 
     | 
    
         
            +
                  thread = true
         
     | 
| 
       128 
128 
     | 
    
         
             
                  unless process_ext_simple(ext, isodoc, fnames, options,
         
     | 
| 
       129 
129 
     | 
    
         
             
                                            isodoc_options)
         
     | 
| 
       130 
130 
     | 
    
         
             
                    thread = process_exts1(ext, fnames, isodoc, options, isodoc_options)
         
     | 
| 
         @@ -162,28 +162,30 @@ module Metanorma 
     | 
|
| 
       162 
162 
     | 
    
         
             
                                    isodoc_options1)
         
     | 
| 
       163 
163 
     | 
    
         
             
                  wrap_html(options1, fnames1[:ext], fnames1[:out])
         
     | 
| 
       164 
164 
     | 
    
         
             
                rescue StandardError => e
         
     | 
| 
       165 
     | 
    
         
            -
                  strict = ext == :presentation || isodoc_options1[:strict] ==  
     | 
| 
       166 
     | 
    
         
            -
                  isodoc_error_process(e, strict)
         
     | 
| 
      
 165 
     | 
    
         
            +
                  strict = ext == :presentation || isodoc_options1[:strict] == true
         
     | 
| 
      
 166 
     | 
    
         
            +
                  isodoc_error_process(e, strict, false)
         
     | 
| 
       167 
167 
     | 
    
         
             
                end
         
     | 
| 
       168 
168 
     | 
    
         | 
| 
       169 
169 
     | 
    
         
             
                def process_output_unthreaded(ext, fnames, isodoc, isodoc_options)
         
     | 
| 
       170 
170 
     | 
    
         
             
                  @processor.output(isodoc, fnames[:xml], fnames[:out], ext,
         
     | 
| 
       171 
171 
     | 
    
         
             
                                    isodoc_options)
         
     | 
| 
       172 
     | 
    
         
            -
                   
     | 
| 
      
 172 
     | 
    
         
            +
                  true # return as Thread
         
     | 
| 
       173 
173 
     | 
    
         
             
                rescue StandardError => e
         
     | 
| 
       174 
174 
     | 
    
         
             
                  strict = ext == :presentation || isodoc_options[:strict] == "true"
         
     | 
| 
       175 
     | 
    
         
            -
                  isodoc_error_process(e, strict)
         
     | 
| 
      
 175 
     | 
    
         
            +
                  isodoc_error_process(e, strict, true)
         
     | 
| 
      
 176 
     | 
    
         
            +
                  ext != :presentation
         
     | 
| 
       176 
177 
     | 
    
         
             
                end
         
     | 
| 
       177 
178 
     | 
    
         | 
| 
       178 
179 
     | 
    
         
             
                private
         
     | 
| 
       179 
180 
     | 
    
         | 
| 
       180 
     | 
    
         
            -
                def isodoc_error_process(err, strict)
         
     | 
| 
      
 181 
     | 
    
         
            +
                def isodoc_error_process(err, strict, must_abort)
         
     | 
| 
       181 
182 
     | 
    
         
             
                  if strict || err.message.include?("Fatal:")
         
     | 
| 
       182 
183 
     | 
    
         
             
                    @errors << err.message
         
     | 
| 
       183 
184 
     | 
    
         
             
                  else
         
     | 
| 
       184 
185 
     | 
    
         
             
                    puts err.message
         
     | 
| 
       185 
186 
     | 
    
         
             
                  end
         
     | 
| 
       186 
187 
     | 
    
         
             
                  puts err.backtrace.join("\n")
         
     | 
| 
      
 188 
     | 
    
         
            +
                  must_abort and 1
         
     | 
| 
       187 
189 
     | 
    
         
             
                end
         
     | 
| 
       188 
190 
     | 
    
         | 
| 
       189 
191 
     | 
    
         
             
                # @param options [Hash]
         
     | 
    
        data/lib/metanorma/version.rb
    CHANGED
    
    
    
        data/metanorma.gemspec
    CHANGED
    
    | 
         @@ -26,7 +26,7 @@ Gem::Specification.new do |spec| 
     | 
|
| 
       26 
26 
     | 
    
         
             
              spec.add_runtime_dependency "asciidoctor"
         
     | 
| 
       27 
27 
     | 
    
         
             
              spec.add_runtime_dependency "fontist", ">= 1.14.3"
         
     | 
| 
       28 
28 
     | 
    
         
             
              spec.add_runtime_dependency "htmlentities"
         
     | 
| 
       29 
     | 
    
         
            -
              spec.add_runtime_dependency "isodoc", ">= 2.6. 
     | 
| 
      
 29 
     | 
    
         
            +
              spec.add_runtime_dependency "isodoc", ">= 2.6.1"
         
     | 
| 
       30 
30 
     | 
    
         
             
              spec.add_runtime_dependency "mn2pdf", "~> 1"
         
     | 
| 
       31 
31 
     | 
    
         
             
              spec.add_runtime_dependency "nokogiri"
         
     | 
| 
       32 
32 
     | 
    
         
             
              spec.add_runtime_dependency "pry"
         
     | 
    
        metadata
    CHANGED
    
    | 
         @@ -1,14 +1,14 @@ 
     | 
|
| 
       1 
1 
     | 
    
         
             
            --- !ruby/object:Gem::Specification
         
     | 
| 
       2 
2 
     | 
    
         
             
            name: metanorma
         
     | 
| 
       3 
3 
     | 
    
         
             
            version: !ruby/object:Gem::Version
         
     | 
| 
       4 
     | 
    
         
            -
              version: 1.6. 
     | 
| 
      
 4 
     | 
    
         
            +
              version: 1.6.1
         
     | 
| 
       5 
5 
     | 
    
         
             
            platform: ruby
         
     | 
| 
       6 
6 
     | 
    
         
             
            authors:
         
     | 
| 
       7 
7 
     | 
    
         
             
            - Ribose Inc.
         
     | 
| 
       8 
8 
     | 
    
         
             
            autorequire: 
         
     | 
| 
       9 
9 
     | 
    
         
             
            bindir: bin
         
     | 
| 
       10 
10 
     | 
    
         
             
            cert_chain: []
         
     | 
| 
       11 
     | 
    
         
            -
            date: 2023-08- 
     | 
| 
      
 11 
     | 
    
         
            +
            date: 2023-08-28 00:00:00.000000000 Z
         
     | 
| 
       12 
12 
     | 
    
         
             
            dependencies:
         
     | 
| 
       13 
13 
     | 
    
         
             
            - !ruby/object:Gem::Dependency
         
     | 
| 
       14 
14 
     | 
    
         
             
              name: asciidoctor
         
     | 
| 
         @@ -58,14 +58,14 @@ dependencies: 
     | 
|
| 
       58 
58 
     | 
    
         
             
                requirements:
         
     | 
| 
       59 
59 
     | 
    
         
             
                - - ">="
         
     | 
| 
       60 
60 
     | 
    
         
             
                  - !ruby/object:Gem::Version
         
     | 
| 
       61 
     | 
    
         
            -
                    version: 2.6. 
     | 
| 
      
 61 
     | 
    
         
            +
                    version: 2.6.1
         
     | 
| 
       62 
62 
     | 
    
         
             
              type: :runtime
         
     | 
| 
       63 
63 
     | 
    
         
             
              prerelease: false
         
     | 
| 
       64 
64 
     | 
    
         
             
              version_requirements: !ruby/object:Gem::Requirement
         
     | 
| 
       65 
65 
     | 
    
         
             
                requirements:
         
     | 
| 
       66 
66 
     | 
    
         
             
                - - ">="
         
     | 
| 
       67 
67 
     | 
    
         
             
                  - !ruby/object:Gem::Version
         
     | 
| 
       68 
     | 
    
         
            -
                    version: 2.6. 
     | 
| 
      
 68 
     | 
    
         
            +
                    version: 2.6.1
         
     | 
| 
       69 
69 
     | 
    
         
             
            - !ruby/object:Gem::Dependency
         
     | 
| 
       70 
70 
     | 
    
         
             
              name: mn2pdf
         
     | 
| 
       71 
71 
     | 
    
         
             
              requirement: !ruby/object:Gem::Requirement
         
     |