metanorma 1.3.5 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4ccf8d6a09fd9345faa44ae7201b4f7ee8816a6f36245c26b2482abd3f7afa9
-  data.tar.gz: 7997e0bea6b752e07f7db96f19b6d136b7a9740c046a0850022b477a2223a85b
+  metadata.gz: 1858cecb1db05debaa3cb36f970a2bcb76b403508067ea2fa8569720fd294a98
+  data.tar.gz: 90f6e4bca7bd431a9d40a989c77837e6cfa47a12e436e0934624592bac0707f0
 SHA512:
-  metadata.gz: 162c6e5e79ff9f7f4f41b17444c68ec23168ee593173b72c251c8623f9a16916f6ae557bc581f39d220c2c6d68d6350c2e4f4de7c000a87e90f39bed7e825609
-  data.tar.gz: a92a8a6ddd41e404cb6a1e00e0a0aaa2ecd645723486769b8656bb09e10f9e595a9df81231713224f6f9781d17c1c6943135d978b5865d0c02842b5e0ccbb84c
+  metadata.gz: 8aec70e8a44751d4ab8557b793718c0bd02be3d90715a0048864257a8faf4bf23a5f4b60b780cf6d24658179eb2ecb572bf8b870ca9313b5d6f70839d2df03a5
+  data.tar.gz: 58814116504a8ec8c80961e836adf50b7e50bc049d2a259031e7dc92b9a8f8909ddd8bbc26219197057a6e4a9dfec4ee05cb16144f1b69fdfdc66d46d9408e9b

data/.github/workflows/rake.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '3.0', '2.7', '2.6', '2.5', '2.4' ]
+        ruby: [ '3.0', '2.7', '2.6', '2.5' ]
         os: [ ubuntu-latest, windows-latest, macos-latest ]
         experimental: [ false ]
     steps:

data/Gemfile

@@ -6,6 +6,6 @@ git_source(:github) { |repo| "https://github.com/#{repo}" }
 
 gemspec
 
-if File.exist? 'Gemfile.devel'
-  eval File.read('Gemfile.devel'), nil, 'Gemfile.devel' # rubocop:disable Security/Eval
+if File.exist? "Gemfile.devel"
+  eval File.read("Gemfile.devel"), nil, "Gemfile.devel" # rubocop:disable Security/Eval
 end

data/lib/metanorma/collection.rb

@@ -91,7 +91,9 @@ module Metanorma
       private
 
       def parse_xml(file)
-        xml = Nokogiri::XML File.read(file, encoding: "UTF-8")
+        xml = Nokogiri::XML File.read(file, encoding: "UTF-8") do |config|
+          config.huge
+        end
         if (b = xml.at("/xmlns:metanorma-collection/xmlns:bibdata"))
           bd = Relaton::Cli.parse_xml b
         end

data/lib/metanorma/collection_fileparse.rb

@@ -11,17 +11,21 @@ module Metanorma
       xrefs = @isodoc.xref_init(@lang, @script, @isodoc, @isodoc.i18n, {})
       xrefs.parse xml
       xrefs.get.each_with_object({}) do |(k, v), ret|
-        v[:type] ||= "clause"
-        ret[v[:type]] ||= {}
-        index = if v[:container] || v[:label].nil? || v[:label].empty?
-                  UUIDTools::UUID.random_create.to_s
-                else v[:label]
-                end
-        ret[v[:type]][index] = k
-        ret[v[:type]][v[:value]] = k if v[:value]
+        read_anchors1(k, v, ret)
       end
     end
 
+    def read_anchors1(key, val, ret)
+      val[:type] ||= "clause"
+      ret[val[:type]] ||= {}
+      index = if val[:container] || val[:label].nil? || val[:label].empty?
+                UUIDTools::UUID.random_create.to_s
+              else val[:label]
+              end
+      ret[val[:type]][index] = key
+      ret[val[:type]][val[:value]] = key if val[:value]
+    end
+
     # @param id [String]
     # @param read [Boolean]
     # @return [Array<String, nil>]
@@ -33,30 +37,36 @@ module Metanorma
 
     # @param bib [Nokogiri::XML::Element]
     # @param identifier [String]
-    def update_bibitem(bib, identifier) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+    def update_bibitem(bib, identifier) # rubocop:disable Metrics/AbcSize
       docid = bib&.at(ns("./docidentifier"))&.children&.to_xml
-      unless @files[docid]
-        error = "[metanorma] Cannot find crossreference to document #{docid} "\
-          "in document #{identifier}."
-        @log.add("Cross-References", nil, error)
-        Util.log(error, :warning)
-        return
-      end
-      id = bib["id"]
-      newbib = @files[docid][:bibdata].dup
-      newbib.name = "bibitem"
-      newbib["id"] = id
-      newbib["hidden"] = "true"
-      newbib&.at("./*[local-name() = 'ext']")&.remove
+      return fail_update_bibitem(docid, identifier) unless @files[docid]
+
+      newbib = dup_bibitem(docid, bib)
       bib.replace(newbib)
       _file, url = targetfile(@files[docid], relative: true, read: false,
-                                             doc: !@files[docid][:attachment])
+                              doc: !@files[docid][:attachment])
       uri_node = Nokogiri::XML::Node.new "uri", newbib
       uri_node[:type] = "citation"
       uri_node.content = url
       newbib.at(ns("./docidentifier")).previous = uri_node
     end
 
+    def fail_update_bibitem(docid, identifier)
+      error = "[metanorma] Cannot find crossreference to document #{docid} "\
+        "in document #{identifier}."
+      @log.add("Cross-References", nil, error)
+      Util.log(error, :warning)
+    end
+
+    def dup_bibitem(docid, bib)
+      newbib = @files[docid][:bibdata].dup
+      newbib.name = "bibitem"
+      newbib["hidden"] = "true"
+      newbib&.at("./*[local-name() = 'ext']")&.remove
+      newbib["id"] = bib["id"]
+      newbib
+    end
+
     # Resolves direct links to other files in collection
     # (repo(current-metanorma-collection/x),
     # and indirect links to other files in collection
@@ -67,7 +77,7 @@ module Metanorma
     # @param internal_refs [Hash{String=>Hash{String=>String}] schema name to anchor to filename
     # @return [String] XML content
     def update_xrefs(file, identifier, internal_refs)
-      docxml = Nokogiri::XML(file)
+      docxml = Nokogiri::XML(file) { |config| config.huge }
       update_indirect_refs_to_docs(docxml, internal_refs)
       add_document_suffix(identifier, docxml)
       update_direct_refs_to_docs(docxml, identifier)
@@ -106,12 +116,18 @@ module Metanorma
     # Preferably with anchor, and is a job to realise dynamic lookup
     # of localities.
     def update_direct_refs_to_docs(docxml, identifier)
+      erefs = docxml.xpath(ns("//eref"))
+        .each_with_object({ citeas: {}, bibitemid: {} }) do |i, m|
+        m[:citeas][i["citeas"]] = true
+        m[:bibitemid][i["bibitemid"]] = true
+      end
       docxml.xpath(ns("//bibitem[not(ancestor::bibitem)]")).each do |b|
         docid = b&.at(ns("./docidentifier[@type = 'repository']"))&.text
         next unless docid && %r{^current-metanorma-collection/}.match(docid)
 
         update_bibitem(b, identifier)
-        update_anchors(b, docxml, docid)
+        docid = b&.at(ns("./docidentifier"))&.children&.to_xml or next
+        erefs[:citeas][docid] and update_anchors(b, docxml, docid)
       end
     end
 
@@ -128,6 +144,9 @@ module Metanorma
     def update_indirect_refs_to_docs1(docxml, schema, id, file)
       docxml.xpath(ns("//eref[@bibitemid = '#{schema}_#{id}']")).each do |e|
         e["citeas"] = file
+        if a = e.at(ns(".//locality[@type = 'anchor']/referenceFrom"))
+          a.children = "#{a.text}_#{Metanorma::Utils::to_ncname(file)}"
+        end
       end
       docid = docxml.at(ns("//bibitem[@id = '#{schema}_#{id}']/"\
                            "docidentifier[@type = 'repository']")) or return
@@ -137,21 +156,19 @@ module Metanorma
 
     # update crossrefences to other documents, to include
     # disambiguating document suffix on id
-    def update_anchors(bib, docxml, _id) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
-      docid = bib&.at(ns("./docidentifier"))&.children.to_xml
+    def update_anchors(bib, docxml, docid) # rubocop:disable Metrics/AbcSize
       docxml.xpath("//xmlns:eref[@citeas = '#{docid}']").each do |e|
-        if @files[docid]
-          update_anchor_loc(bib, e, docid)
+        if @files[docid] then update_anchor_loc(bib, e, docid)
         else
-          e << "<strong>** Unresolved reference to document #{docid}, "\
-            "id #{e['bibitemid']}</strong>"
+          e << "<strong>** Unresolved reference to document #{docid} "\
+            "from eref</strong>"
         end
       end
     end
 
-    def update_anchor_loc(bib, e, docid)
-      loc = e.at(ns(".//locality[@type = 'anchor']")) or
-        return update_anchor_create_loc(bib, e, docid)
+    def update_anchor_loc(bib, eref, docid)
+      loc = eref.at(ns(".//locality[@type = 'anchor']")) or
+        return update_anchor_create_loc(bib, eref, docid)
       document_suffix = Metanorma::Utils::to_ncname(docid)
       ref = loc.at(ns("./referenceFrom")) || return
       anchor = "#{ref.text}_#{document_suffix}"
@@ -164,18 +181,14 @@ module Metanorma
 
     # if there is a crossref to another document, with no anchor, retrieve the
     # anchor given the locality, and insert it into the crossref
-    def update_anchor_create_loc(bib, eref, docid)
+    def update_anchor_create_loc(_bib, eref, docid)
       ins = eref.at(ns("./localityStack")) or return
       type = ins&.at(ns("./locality/@type"))&.text
       type = "clause" if type == "annex"
       ref = ins&.at(ns("./locality/referenceFrom"))&.text
       anchor = @files[docid][:anchors].dig(type, ref) or return
-      ref_from = Nokogiri::XML::Node.new "referenceFrom", bib
-      ref_from.content = anchor.sub(/^_/, "")
-      locality = Nokogiri::XML::Node.new "locality", bib
-      locality[:type] = "anchor"
-      locality.add_child ref_from
-      ins << locality
+      ins << "<locality type='anchor'><referenceFrom>#{anchor.sub(/^_/, '')}"\
+        "</referenceFrom></locality>"
     end
 
     # gather internal bibitem references
@@ -186,7 +199,7 @@ module Metanorma
         file, = targetfile(x, read: true)
         Nokogiri::XML(file)
           .xpath(ns("//bibitem[@type = 'internal']/"\
-        "docidentifier[@type = 'repository']")).each do |d|
+                    "docidentifier[@type = 'repository']")).each do |d|
           a = d.text.split(%r{/}, 2)
           a.size > 1 or next
           refs[a[0]] ||= {}
@@ -211,10 +224,11 @@ module Metanorma
 
     def locate_internal_refs1(refs, identifier, filedesc)
       file, _filename = targetfile(filedesc, read: true)
-      docxml = Nokogiri::XML(file)
+      xml = Nokogiri::XML(file) { |config| config.huge }
+      t = xml.xpath("//*/@id").each_with_object({}) { |i, x| x[i.text] = true }
       refs.each do |schema, ids|
-        ids.each_key do |id|
-          n = docxml.at("//*[@id = '#{id}']") and
+        ids.keys.select { |id| t[id] }.each do |id|
+          n = xml.at("//*[@id = '#{id}']") and
             n.at("./ancestor-or-self::*[@type = '#{schema}']") and
             refs[schema][id] = identifier
         end

data/lib/metanorma/collection_fileprocess.rb

@@ -27,8 +27,41 @@ module Metanorma
           files[identifier][:anchors] = read_anchors(xml)
           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
       end
-      files
+      add_section_split(files)
+    end
+
+    def add_section_split(files)
+      files.keys.each_with_object({}) do |k, m|
+        if files[k][:sectionsplit] == "true" && !files[k]["attachment"]
+          sectionsplit(files[k][:rel_path]).each_with_index do |f1, i|
+            m[k + f1[:title]] =
+              { parentid: k, presentationxml: true, type: "fileref",
+                rel_path: f1[:url], out_path: File.basename(f1[:url]),
+                anchors: read_anchors(Nokogiri::XML(File.read(f1[:url]))),
+                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
+      end
+    end
+
+    def sectionsplit(file)
+      Compile.new.compile(
+        file, { format: :asciidoc, extension_keys: [:presentation] }
+        .merge(@compile_options)
+      )
+      r = file.sub(/\.xml$/, ".presentation.xml")
+      @isodoc.sectionsplit(
+        Nokogiri::XML(File.read(r)), File.basename(r), File.dirname(r)
+      ).sort_by { |f| f[:order] }
     end
 
     # rel_path is the source file address, determined relative to the YAML.
@@ -44,6 +77,9 @@ module Metanorma
               { type: "id", ref: ref["id"] }
             end
       ret[:attachment] = ref["attachment"] if ref["attachment"]
+      ret[:sectionsplit] = ref["sectionsplit"] if ref["sectionsplit"]
+      ret[:presentationxml] = ref["presentation-xml"] if ref["presentation-xml"]
+      ret[:bareafterfirst] = ref["bare-after-first"] if ref["bare-after-first"]
       ret
     end
 
@@ -95,22 +131,50 @@ module Metanorma
     end
 
     # compile and output individual file in collection
+    # warn "metanorma compile -x html #{f.path}"
     def file_compile(file, filename, identifier)
-      # warn "metanorma compile -x html #{f.path}"
-      Array(@directives).include?("presentation-xml") and
-        @compile_options.merge!(passthrough_presentation_xml: true)
       c = Compile.new
-      c.compile file.path, { format: :asciidoc,
-                             extension_keys: @format }.merge(@compile_options)
+      c.compile file.path, { format: :asciidoc, extension_keys: @format }
+        .merge(compile_options(identifier))
       @files[identifier][:outputs] = {}
+      file_compile_formats(file, filename, identifier, c)
+    end
+
+    def compile_options(identifier)
+      ret = @compile_options.dup
+      Array(@directives).include?("presentation-xml") ||
+        @files[identifier][:presentationxml] and
+        ret.merge!(passthrough_presentation_xml: true)
+      @files[identifier][:sectionsplit] == "true" and
+        ret.merge!(sectionsplit: "true")
+      @files[identifier][:bare] == true and
+        ret.merge!(bare: true)
+      ret
+    end
+
+    def file_compile_formats(file, filename, identifier, compile)
       @format.each do |e|
-        ext = c.processor.output_formats[e]
-        fn = File.basename(filename).sub(/(?<=\.)[^\.]+$/, ext.to_s)
-        FileUtils.cp file.path.sub(/\.xml$/, ".#{ext}"), File.join(@outdir, fn)
-        @files[identifier][:outputs][e] = File.join(@outdir, fn)
+        ext = compile.processor.output_formats[e]
+        fn = File.basename(filename).sub(/(?<=\.)[^.]+$/, ext.to_s)
+        if /html$/.match?(ext) && @files[identifier][:sectionsplit]
+          # 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)
+        end
       end
     end
 
+    def file_sectionsplit_copy(file, base, identifier, ext, format)
+      dir = file.path.sub(/\.xml$/, ".#{ext}_collection")
+      files = Dir.glob("#{dir}/*.#{ext}")
+      FileUtils.cp files, @outdir
+      cover = File.join(@outdir, base.sub(/\.html$/, ".index.html"))
+      FileUtils.cp File.join(dir, "index.html"), cover
+      @files[identifier][:outputs][format] = cover
+    end
+
     def copy_file_to_dest(fileref)
       dest = File.join(@outdir, fileref[:out_path])
       FileUtils.mkdir_p(File.dirname(dest))

data/lib/metanorma/collection_manifest.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "util"
 
 module Metanorma
@@ -48,6 +49,8 @@ module Metanorma
           h = { "identifier" => dr.at("identifier").children.to_xml }
           dr[:fileref] and h["fileref"] = dr[:fileref]
           h["attachment"] = dr[:attachment] if dr[:attachment]
+          h["sectionsplit"] = dr[:sectionsplit] if dr[:sectionsplit]
+          h["presentation-xml"] = dr[:presentationxml] if dr[:presentationxml]
           h
         end
       end
@@ -59,7 +62,7 @@ module Metanorma
       @manifest.each { |mnf| mnf.collection = col }
     end
 
-    # @param dir [String] path to coolection
+    # @param dir [String] path to collection
     # @return [Hash<String, Metanorma::Document>]
     def documents(dir = "")
       docs = @docref.each_with_object({}) do |dr, m|
@@ -116,6 +119,9 @@ module Metanorma
     def docref_to_xml_attrs(elem, docref)
       elem[:fileref] = @disambig.source2dest_filename(docref["fileref"])
       elem[:attachment] = docref["attachment"] if docref["attachment"]
+      elem[:sectionsplit] = docref["sectionsplit"] if docref["sectionsplit"]
+      elem[:presentationxml] = "true" if docref["presentation-xml"] &&
+        docref["presentation-xml"] == "true" || docref["presentation-xml"] == true
       if collection.directives.include?("documents-inline")
         id = collection.documents.find_index do |k, _|
           k == docref["identifier"]

data/lib/metanorma/collection_renderer.rb

@@ -35,7 +35,7 @@ module Metanorma
 
       @outdir = options[:output_folder]
       @coverpage = options[:coverpage]
-      @format = options[:format]
+      @format = Util.sort_extensions_execution(options[:format])
       @compile_options = options[:compile] || {}
       @log = options[:log]
       @documents = collection.documents
@@ -70,7 +70,7 @@ module Metanorma
         ext = e == :presentation ? "presentation.xml" : e.to_s
         out = col.clone
         out.directives << "documents-inline"
-        out.documents.keys.each do |id|
+        out.documents.each_key do |id|
           next if @files[id][:attachment]
 
           filename = @files[id][:outputs][e]
@@ -216,6 +216,14 @@ module Metanorma
 
     private
 
+    def format_sort(formats)
+      ret = []
+      formats.include?(:xml) and ret << :xml
+      formats.include?(:presentation) and ret << :presentation
+      a = %i(presentation xml)
+      ret + formats.reject { |i| a.include? i }
+    end
+
     # @param options [Hash]
     # @raise [ArgumentError]
     def check_options(options)

data/lib/metanorma/compile.rb

@@ -6,6 +6,7 @@ require "fontist"
 require "fontist/manifest/install"
 require_relative "compile_validate"
 require_relative "fontist_utils"
+require_relative "util"
 
 module Metanorma
   class Compile
@@ -35,7 +36,7 @@ module Metanorma
     end
 
     def xml_options_extract(file)
-      xml = Nokogiri::XML(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
@@ -111,7 +112,7 @@ module Metanorma
     def relaton_export(isodoc, options)
       return unless options[:relaton]
 
-      xml = Nokogiri::XML(isodoc)
+      xml = Nokogiri::XML(isodoc) { |config| config.huge }
       bibdata = xml.at("//bibdata") || xml.at("//xmlns:bibdata")
       # docid = bibdata&.at("./xmlns:docidentifier")&.text || options[:filename]
       # outname = docid.sub(/^\s+/, "").sub(/\s+$/, "").gsub(/\s+/, "-") + ".xml"
@@ -135,7 +136,7 @@ module Metanorma
       end
       FileUtils.rm_rf dirname
       FileUtils.mkdir_p dirname
-      xml = Nokogiri::XML(isodoc)
+      xml = Nokogiri::XML(isodoc) { |config| config.huge }
       sourcecode_export(xml, dirname) if extract_types.include? :sourcecode
       image_export(xml, dirname) if extract_types.include? :image
       requirement_export(xml, dirname) if extract_types.include? :requirement
@@ -181,17 +182,6 @@ module Metanorma
       end
     end
 
-    # dependency ordering
-    def sort_extensions_execution(ext)
-      case ext
-      when :xml then 0
-      when :rxl then 1
-      when :presentation then 2
-      else
-        99
-      end
-    end
-
     def wrap_html(options, file_extension, outfilename)
       if options[:wrapper] && /html$/.match(file_extension)
         outfilename = outfilename.sub(/\.html$/, "")
@@ -206,20 +196,10 @@ module Metanorma
       f = change_output_dir options
       xml_name = f.sub(/\.[^.]+$/, ".xml")
       presentationxml_name = f.sub(/\.[^.]+$/, ".presentation.xml")
-      extensions.sort do |a, b|
-        sort_extensions_execution(a) <=> sort_extensions_execution(b)
-      end.each do |ext|
-        isodoc_options = @processor.extract_options(file)
-        isodoc_options[:datauriimage] = true if options[:datauriimage]
-        isodoc_options[:sourcefilename] = options[:filename]
-        isodoc_options[:bare] = options[:bare]
+      Util.sort_extensions_execution(extensions).each do |ext|
         file_extension = @processor.output_formats[ext]
         outfilename = f.sub(/\.[^.]+$/, ".#{file_extension}")
-        if ext == :pdf
-          font_locations = FontistUtils.fontist_font_locations(@processor, options)
-          font_locations and
-            isodoc_options[:mn2pdf] = { font_manifest_file: font_locations.path }
-        end
+        isodoc_options = get_isodoc_options(file, options, ext)
         if ext == :rxl
           options[:relaton] = outfilename
           relaton_export(isodoc, options)
@@ -231,12 +211,7 @@ module Metanorma
               @processor.output(nil, presentationxml_name, outfilename, ext, isodoc_options) :
               @processor.output(isodoc, xml_name, outfilename, ext, isodoc_options)
           rescue StandardError => e
-            if e.message.include? "Fatal:"
-              @errors << e.message
-            else
-              puts e.message
-              puts e.backtrace.join("\n")
-            end
+            isodoc_error_process(e)
           end
         end
         wrap_html(options, file_extension, outfilename)
@@ -245,6 +220,28 @@ module Metanorma
 
     private
 
+    def isodoc_error_process(err)
+      if err.message.include? "Fatal:"
+        @errors << err.message
+      else
+        puts err.message
+        puts err.backtrace.join("\n")
+      end
+    end
+
+    def get_isodoc_options(file, options, ext)
+      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]
+      if ext == :pdf
+        floc = FontistUtils.fontist_font_locations(@processor, options) and
+          isodoc_options[:mn2pdf] = { font_manifest_file: floc.path }
+      end
+      isodoc_options
+    end
+
     # @param options [Hash]
     # @return [String]
     def change_output_dir(options)

data/lib/metanorma/document.rb

@@ -30,7 +30,9 @@ module Metanorma
 
       # raw XML file, can be used to put in entire file instead of just bibitem
       def raw_file(filename)
-        doc = Nokogiri::XML(File.read(filename, encoding: "UTF-8"))
+        doc = Nokogiri::XML(File.read(filename, encoding: "UTF-8")) do |config|
+          config.huge
+        end
         new(doc, filename, raw: true)
       end
 
@@ -100,7 +102,9 @@ module Metanorma
       if @raw
         builder << @bibitem.root.to_xml
       else
-        builder.send(type + "-standard") { |b| b << @bibitem.to_xml(bibdata: true) }
+        builder.send("#{type}-standard") do |b|
+          b << @bibitem.to_xml(bibdata: true)
+        end
       end
     end
   end

data/lib/metanorma/util.rb

@@ -12,6 +12,23 @@ module Metanorma
       end
     end
 
+    # dependency ordering
+    def self.sort_extensions_execution_ord(ext)
+      case ext
+      when :xml then 0
+      when :rxl then 1
+      when :presentation then 2
+      else
+        99
+      end
+    end
+
+    def self.sort_extensions_execution(ext)
+      ext.sort do |a, b|
+        sort_extensions_execution_ord(a) <=> sort_extensions_execution_ord(b)
+      end
+    end
+
     class DisambigFiles
       def initialize
         @seen_filenames = []

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "1.3.5".freeze
+  VERSION = "1.3.6".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.8"
+  spec.add_runtime_dependency "fontist", "~> 1.9"
   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.3.5
+  version: 1.3.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-21 00:00:00.000000000 Z
+date: 2021-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement