metanorma 2.1.5 → 2.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6fcf07578e0bbbcd55d7ea1cbdafbe588333b5060ad10b1bb4e0851b33e4036
-  data.tar.gz: 7a91ca6650c240fe06eb68fc5986617662cdd6958160ecea1dafeeb09dd644e6
+  metadata.gz: e5610f75a03c358a9dbcc8fcc08e67a40c69f7375bc33c06014658da3682d716
+  data.tar.gz: 8a567c76df2967c2fab2d5a26e9652555b10b74070a2d1cd94b688eee922101b
 SHA512:
-  metadata.gz: 34989eb8241876f89038ecc1dd1353c09f9c54961b74b50048eddd330eb0a24eca628ad0e8a893108042ad4b89b57b8de8e9ff32166b7eb2e3098f0ef4340bb2
-  data.tar.gz: 2f9d6d4f182481d8b02b46082bafd6d75fb8d6b1a72c42987a161c60fb3a00fb4d8c5cc53674a9d001996f64bc8cea9b9e854b9d544af5126db1070c30413ac5
+  metadata.gz: e320a80eeccbd8cff86f87c82a6e3efc63d1411669338189b19dc99caf80f4435a1ae488dd17e572139967fb97a9613b54a471c838ecb312b9767f84c4102c56
+  data.tar.gz: a5019b0c731f53c78b92a5b6ce8c3675fa82dc79ec507f35520d0e2b3faca14f93e149fa5aadfb21bc3df41454520a0b4f5e2c46620bfa2d5db8560adef47b07

data/lib/metanorma/collection/collection.rb

@@ -92,15 +92,22 @@ module Metanorma
     end
 
     def render(opts)
-      if opts[:format].nil? || opts[:format].empty?
+      opts[:format].nil? || opts[:format].empty? and
         opts[:format] = @format || [:html]
-      end
       opts[:log] = @log
       opts[:flavor] = @flavor
+      output_folder(opts)
       ::Metanorma::Collection::Renderer.render self, opts
       clean_exit
     end
 
+    def output_folder(opts)
+      opts[:output_folder] ||= config.output_folder
+      opts[:output_folder] && !Pathname.new(opts[:output_folder]).absolute? and
+        opts[:output_folder] = File.join(@dirname, opts[:output_folder])
+      warn opts[:output_folder]
+    end
+
     # @return [String, nil]
     attr_reader :prefatory, :final
 
@@ -216,7 +223,6 @@ module Metanorma
       def resolve_fileref(ref_folder, fileref)
         warn ref_folder
         warn fileref
-        #require "debug"; binding.b
         unless @fileref_resolver
           (Pathname.new fileref).absolute? or
             fileref = File.join(ref_folder, fileref)

data/lib/metanorma/collection/config/manifest.rb

@@ -13,7 +13,7 @@ module Metanorma
 
       class Manifest < ::Lutaml::Model::Serializable
         attribute :identifier, :string,
-          default: -> { UUIDTools::UUID.random_create.to_s }
+                  default: -> { UUIDTools::UUID.random_create.to_s }
         attribute :id, :string
         attribute :bibdata, Bibdata
         attribute :type, :string
@@ -25,6 +25,7 @@ module Metanorma
         attribute :index, :boolean, default: -> { true }
         attribute :entry, Manifest, collection: true
         attribute :file, :string
+        attribute :format, :string, collection: true
 
         yaml do
           map "identifier", to: :identifier
@@ -46,6 +47,7 @@ module Metanorma
                           with: { from: :docref_from_yaml, to: :nop_to_yaml }
           map "bibdata", to: :bibdata, with: { from: :bibdata_from_yaml,
                                                to: :bibdata_to_yaml }
+          map "format", to: :format, render_default: true
         end
 
         xml do
@@ -59,6 +61,7 @@ module Metanorma
           map_element "identifier", to: :identifier, render_default: true
           map_element "type", to: :type
           map_element "title", to: :title
+          map_element "format", to: :format
           map_element "bibdata", to: :bibdata, with: { from: :bibdata_from_xml,
                                                        to: :bibdata_to_xml }
           map_element "entry", to: :entry

data/lib/metanorma/collection/filelookup/filelookup.rb

@@ -24,16 +24,24 @@ module Metanorma
         @files_to_delete = []
         @disambig = Util::DisambigFiles.new
         @manifest = parent.manifest
-        read_files(@manifest.entry)
+        read_files(@manifest.entry, parent.manifest)
+        #warn pp @files
       end
 
-      def read_files(entries)
+      def read_files(entries, parent)
         Array(entries).each do |e|
+          derive_format(e, parent)
           e.file and read_file(e)
-          read_files(e.entry)
+          read_files(e.entry, e)
         end
       end
 
+      def derive_format(entry, parent)
+        entry.attachment and return
+        entry.format ||= parent.format || %w(xml presentation html)
+        entry.format |= ["xml", "presentation"]
+      end
+
       def read_file(manifest)
         i, k = read_file_idents(manifest)
         entry = file_entry(manifest, k) or return
@@ -97,7 +105,8 @@ module Metanorma
         abs = @documents[Util::key identifier].file
         ret = if ref.file
                 { type: "fileref", ref: abs, rel_path: ref.file, url: ref.url,
-                  out_path: output_file_path(ref) }
+                  out_path: output_file_path(ref),
+                  format: ref.format&.map(&:to_sym) }.compact
               else { type: "id", ref: ref.id }
               end
         file_entry_copy(ref, ret)

data/lib/metanorma/collection/filelookup/filelookup_sectionsplit.rb

@@ -89,7 +89,7 @@ module Metanorma
         m = { parentid: key, presentationxml: true, type: "fileref",
               rel_path: file[:url], out_path: File.basename(file[:url]),
               anchors: anchors, anchors_lookup: anchors_lookup(anchors),
-              ids: read_ids(xml),
+              ids: read_ids(xml), format: @files[key][:format],
               sectionsplit_output: true, indirect_key: @sectionsplit.key,
               bibdata: @files[key][:bibdata], ref: presfile }
         m[:bare] = true unless idx.zero?

data/lib/metanorma/collection/manifest/manifest.rb

@@ -96,7 +96,6 @@ module Metanorma
 
       def manifest_filexist(config)
         if config.file
-        #require "debug"; binding.b
           file = @collection.class.resolve_fileref(@dir, config.file)
           @collection.class.check_file_existence(file)
           config.file = Pathname.new(file).relative_path_from(Pathname.new(@dir))
@@ -111,7 +110,6 @@ module Metanorma
           currdir = dir
           /\.ya?ml$/.match?(e.file) and
             currdir = manifest_expand_yaml_entry(e, dir)
-          #require "debug"; binding.b
           manifest_expand_yaml(e, currdir)
         end
         config
@@ -122,10 +120,8 @@ module Metanorma
         currdir = File.dirname(f)
         @collection.class.check_file_existence(f)
         entry.file = nil
-        #require 'debug'; binding.b
         entry.entry = ::Metanorma::Collection::Config::Config.from_yaml(File.read(f)).manifest
         if currdir != dir
-          #require "debug"; binding.b
           prefix = Pathname.new(currdir).relative_path_from(Pathname.new(dir))
           update_filepaths(entry.entry, prefix.to_s)
         end
@@ -133,7 +129,6 @@ module Metanorma
       end
 
       def update_filepaths(entry, prefix)
-        #require "debug"; binding.b
         entry.file && !(Pathname.new entry.file).absolute? and
           entry.file = File.join(prefix, entry.file)
         entry&.entry&.each do |f|

data/lib/metanorma/collection/renderer/fileprocess.rb

@@ -11,15 +11,16 @@ module Metanorma
       # warn "metanorma compile -x html #{f.path}"
       def file_compile(file, filename, identifier)
         @files.get(identifier, :sectionsplit) and return
+        #require "debug"; binding.b
         opts = {
           format: :asciidoc,
-          extension_keys: @format,
+          extension_keys: @files.get(identifier, :format),
           output_dir: @outdir,
           type: @flavor,
         }.merge(compile_options_update(identifier))
         @compile.compile file, opts
         @files.set(identifier, :outputs, {})
-        file_compile_formats(filename, identifier)
+        file_compile_formats(filename, identifier, opts)
       end
 
       def compile_options_update(identifier)
@@ -34,19 +35,34 @@ module Metanorma
         ret
       end
 
-      def file_compile_formats(filename, identifier)
+=begin        
+      def allowed_extension_keys
+        ret = @format.dup
+        @directives.detect { |d| d.key == "individual-pdf" } or
+          ret.delete(:pdf)
+        @directives.detect { |d| d.key == "individual-doc" } or
+          ret.delete(:doc)
+        ret
+      end
+=end        
+
+      def file_compile_formats(filename, identifier, opts)
         f = @files.get(identifier, :outputs)
-        concatenate_presentation?({ format: @format }) and
-          @format << :presentation
-        @format.each do |e|
-          ext = @compile.processor.output_formats[e]
-          fn = File.basename(filename).sub(/(?<=\.)[^.]+$/, ext.to_s)
-          (/html$/.match?(ext) && @files.get(identifier, :sectionsplit)) or
-            f[e] = File.join(@outdir, fn)
+        format = opts[:extension_keys]
+        concatenate_presentation?({ format: format }) and format << :presentation
+        format.each do |e|
+          file_compile_format(filename, identifier, e, f)
         end
         @files.set(identifier, :outputs, f)
       end
 
+      def file_compile_format(filename, identifier, format, output_formats)
+        ext = @compile.processor.output_formats[format]
+        fn = File.basename(filename).sub(/(?<=\.)[^.]+$/, ext.to_s)
+        (/html$/.match?(ext) && @files.get(identifier, :sectionsplit)) or
+          output_formats[format] = File.join(@outdir, fn)
+      end
+
       def copy_file_to_dest(identifier)
         out = Pathname.new(@files.get(identifier, :out_path)).cleanpath
         out.absolute? and

data/lib/metanorma/collection/renderer/renderer.rb

@@ -91,12 +91,22 @@ module Metanorma
         warn "\n\n\n\n\nRender Init: #{DateTime.now.strftime('%H:%M:%S')}"
         cr = new(col, File.dirname(col.file), options)
         cr.files
+        cr.rxl(options)
         cr.concatenate(col, options)
         options[:format]&.include?(:html) and cr.coverpage
         cr.flush_files
         cr
       end
 
+      def rxl(options)
+        @bibdata or return
+        options[:site_generate] and options[:format] << :xml
+        options[:format].include?(:rxl) or return
+        File.open(File.join(@outdir, "collection.rxl"), "w:UTF-8") do |f|
+          f.write(@bibdata.to_xml)
+        end
+      end
+
       def concatenate(col, options)
         warn "\n\n\n\n\nConcatenate: #{DateTime.now.strftime('%H:%M:%S')}"
         concatenate_presentation?(options) and
@@ -112,6 +122,7 @@ module Metanorma
       end
 
       def concatenate_prep(col, options)
+        warn options[:format]
         %i(xml presentation).each do |e|
           options[:format].include?(e) or next
           ext = e == :presentation ? "presentation.xml" : e.to_s

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "2.1.5".freeze
+  VERSION = "2.1.6".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.1.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-17 00:00:00.000000000 Z
+date: 2025-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor