metanorma 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6416bb8205d8f155d6affc6566e882a0cc161b16e6753e0df39be3818fb369b
-  data.tar.gz: ecfc71eb0cecda61acd433a6a2a1512415375f69a38a9bb2c4f5f779d7ca38f4
+  metadata.gz: f27c1f604a729b827832e208b2ca5db54b8db3f5b3f69fe905e0f0ae87a08f53
+  data.tar.gz: 781c8396a4c325a34c456ba935e40aba94d4062b283b475cf1bc381aa4ead712
 SHA512:
-  metadata.gz: '0989d2e8fe2373f3e10733fca8e562839e6e264e3e45abc58782ab0d7ec5de8965fefc5a944154acab16968ed6292a42c000454791e782333b8cd47c5b51fce5'
-  data.tar.gz: 9004900c903b5cd1fe081cb4ca663a8caf0c0f2a4e016024accce10873261ccd3dacac953a1686a49d647cbe0d4f1914327304df9366ad3530a42078869cda84
+  metadata.gz: 8305b0f43fec6a78fc64b2d79fde688d829bacb3e4ce772d14a6c68ceaa71141a6948c4d7c1d6a358f21c4e86e601f44c4e6411a0e5c7c2522a0a8fed71856f1
+  data.tar.gz: 6d9418c471d3966f00796dd0840cf33400188e93e61585b0b777cc31db70d020b92cd7f89f00754734a5331db29600ec4955b2b52bc86d62da3c11c98f71b45d

data/lib/metanorma/collection/collection.rb

@@ -37,6 +37,7 @@ module Metanorma
       @bibdatas.merge! @manifest.documents
       @documents.transform_keys { |k| Util::key(k) }
       @bibdatas.transform_keys { |k| Util::key(k) }
+      validate_flavor(flavor)
     end
 
     def initialize_vars
@@ -59,6 +60,7 @@ module Metanorma
       d = @directives.each_with_object({}) { |x, m| m[x.key] = x.value }
       @coverpage = d["coverpage"]
       @coverpage_style = d["coverpage-style"]
+      @flavor = d["flavor"]
       if (@documents.any? || @manifest) && !d.key?("documents-inline") &&
           !d.key?("documents-external")
         @directives << ::Metanorma::Collection::Config::Directive
@@ -66,6 +68,10 @@ module Metanorma
       end
     end
 
+    def validate_flavor(flavor)
+      ::Metanorma::Compile.new.load_flavor(flavor)
+    end
+
     def clean_exit
       @log.write(File.join(@dirname,
                            "#{File.basename(@file, '.*')}.err.html"))
@@ -83,7 +89,9 @@ module Metanorma
 
     def render(opts)
       opts[:format].nil? || opts[:format].empty? and opts[:format] = [:html]
-      ::Metanorma::Collection::Renderer.render self, opts.merge(log: @log)
+      opts[:log] = @log
+      opts[:flavor] = @flavor
+      ::Metanorma::Collection::Renderer.render self, opts
       clean_exit
     end
 
@@ -103,7 +111,7 @@ module Metanorma
     # @param builder [Nokogiri::XML::Builder]
     def content_to_xml(elm, builder)
       (cnt = send(elm)) or return
-      @compile.load_flavor(doctype)
+      @compile.load_flavor(flavor)
       out = sections(dummy_header + cnt.strip)
       builder.send("#{elm}-content") { |b| b << out }
     end
@@ -111,13 +119,12 @@ module Metanorma
     # @param cnt [String] prefatory/final content
     # @return [String] XML
     def sections(cnt)
-      c = Asciidoctor.convert(cnt, backend: doctype.to_sym, header_footer: true)
+      c = Asciidoctor.convert(cnt, backend: flavor.to_sym, header_footer: true)
       Nokogiri::XML(c, &:huge).at("//xmlns:sections").children.to_xml
     end
 
     # @param builder [Nokogiri::XML::Builder]
     def doccontainer(builder)
-      # Array(@directives).include? "documents-inline" or return
       @directives.detect { |d| d.key == "documents-inline" } or return
       documents.each_with_index do |(_, d), i|
         doccontainer1(builder, d, i)
@@ -136,14 +143,19 @@ module Metanorma
       end
     end
 
-    def doctype
-      @doctype ||= fetch_doctype || "standoc"
+    def flavor
+      @flavor ||= fetch_flavor || "standoc"
     end
 
-    def fetch_doctype
-      docid = @bibdata.docidentifier.first
-      docid or return
-      docid.type&.downcase || docid.id&.sub(/\s.*$/, "")&.downcase
+    # TODO: retrieve flavor based on @bibdata publisher when lookup implemented
+    # Will still infer based on docid, but will validate it before proceeding
+    def fetch_flavor
+      docid = @bibdata.docidentifier.first or return
+      f = docid.type.downcase || docid.id.sub(/\s.*$/, "").downcase or return
+      require ::Metanorma::Compile.new.stdtype2flavor(f)
+      f
+    rescue LoadError
+      nil
     end
 
     class << self

data/lib/metanorma/collection/document/document.rb

@@ -1,3 +1,5 @@
+require "relaton-cli"
+
 module Metanorma
   class Collection
     class Document
@@ -48,16 +50,16 @@ module Metanorma
 
         def mn2relaton_parser(tag)
           case tag.sub(/-standard/, "")
-          when "bipm" then RelatonBipm::XMLParser
-          when "bsi" then RelatonBsi::XMLParser
-          when "ietf" then RelatonIetf::XMLParser
-          when "iho" then RelatonIho::XMLParser
-          when "itu" then RelatonItu::XMLParser
-          when "iec" then RelatonIec::XMLParser
-          when "iso" then RelatonIsoBib::XMLParser
-          when "nist" then RelatonNist::XMLParser
-          when "ogc" then RelatonOgc::XMLParser
-          else RelatonBib::XMLParser
+          when "bipm" then ::RelatonBipm::XMLParser
+          when "bsi" then ::RelatonBsi::XMLParser
+          when "ietf" then ::RelatonIetf::XMLParser
+          when "iho" then ::RelatonIho::XMLParser
+          when "itu" then ::RelatonItu::XMLParser
+          when "iec" then ::RelatonIec::XMLParser
+          when "iso" then ::RelatonIsoBib::XMLParser
+          when "nist" then ::RelatonNist::XMLParser
+          when "ogc" then ::RelatonOgc::XMLParser
+          else ::RelatonBib::XMLParser
           end
         end
 

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

@@ -110,9 +110,9 @@ module Metanorma
 
       def add_document_suffix(identifier, doc)
         document_suffix = Metanorma::Utils::to_ncname(identifier)
-        Metanorma::Utils::anchor_attributes.each do |(tag_name, attribute_name)|
-          Util::add_suffix_to_attributes(doc, document_suffix, tag_name,
-                                         attribute_name, @isodoc)
+        Metanorma::Utils::anchor_attributes.each do |(tag_name, attr_name)|
+          Util::add_suffix_to_attrs(doc, document_suffix, tag_name, attr_name,
+                                    @isodoc)
         end
         url_in_css_styles(doc, document_suffix)
         doc.root["document_suffix"] ||= ""

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

@@ -61,8 +61,7 @@ module Metanorma
       end
 
       def add_section_split_instance(file, manifest, key, idx)
-        presfile, newkey, xml =
-          add_section_split_instance_prep(file, key)
+        presfile, newkey, xml = add_section_split_instance_prep(file, key)
         manifest[newkey] =
           { parentid: key, presentationxml: true, type: "fileref",
             rel_path: file[:url], out_path: File.basename(file[:url]),
@@ -70,6 +69,7 @@ module Metanorma
             sectionsplit_output: true,
             bibdata: @files[key][:bibdata], ref: presfile }
         @files_to_delete << file[:url]
+        manifest[newkey][:indirect_key] = @sectionsplit.key
         manifest[newkey][:bare] = true unless idx.zero?
       end
 
@@ -84,9 +84,11 @@ module Metanorma
       def sectionsplit(ident)
         file = @files[ident][:ref]
         @sectionsplit = ::Metanorma::Collection::Sectionsplit
-          .new(input: file, base: @files[ident][:out_path], dir: File.dirname(file),
-               output: @files[ident][:out_path], compile_opts: @parent.compile_options,
-               fileslookup: self, ident: ident, isodoc: @isodoc)
+          .new(input: file, base: @files[ident][:out_path],
+               dir: File.dirname(file), output: @files[ident][:out_path],
+               compile_opts: @parent.compile_options,
+               fileslookup: self, ident: ident, isodoc: @isodoc,
+               document_suffix: @files[ident][:document_suffix])
         coll = @sectionsplit.sectionsplit.sort_by { |f| f[:order] }
         xml = Nokogiri::XML(File.read(file, encoding: "UTF-8"), &:huge)
         [coll, @sectionsplit

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

@@ -67,15 +67,15 @@ module Metanorma
         i = x.at("//xmlns:bibdata/xmlns:docidentifier[@primary = 'true']") ||
           x.at("//xmlns:bibdata/xmlns:docidentifier")
         i or return nil
-        @doctype ||= i["type"]&.downcase || "standoc"
+        @flavor = @collection.flavor
         load_isodoc
         Util::key(@isodoc.docid_prefix(i["type"], i.text))
       end
 
       def load_isodoc
         @isodoc and return
-        @collection.compile.load_flavor(@doctype)
-        @isodoc = Util::load_isodoc(@doctype)
+        @collection.compile.load_flavor(@flavor)
+        @isodoc = Util::load_isodoc(@flavor)
         @isodoc.i18n_init(@lang, @script, nil) # for @i18n.all_parts in docid
       end
 
@@ -153,7 +153,7 @@ module Metanorma
       def set_adoc2xml(fileref)
         File.join(
           File.dirname(fileref),
-          File.basename(fileref).gsub(/.adoc$/, ".xml"),
+          File.basename(fileref).gsub(/\.adoc$/, ".xml"),
         )
       end
 
@@ -161,10 +161,8 @@ module Metanorma
       # @raise [AdocFileNotFoundException]
       def compile_adoc_file(file)
         f = (Pathname.new file).absolute? ? file : File.join(@dir, file)
-        unless File.exist? f
-          raise AdocFileNotFoundException.new "#{f} not found!"
-        end
-
+        File.exist?(f) or raise AdocFileNotFoundException.new "#{f} not found!"
+        compile_adoc_file?(file) or return
         ::Metanorma::Util.log("[metanorma] Info: Compiling #{f}...", :info)
         ::Metanorma::Compile.new
           .compile(f, agree_to_terms: true, install_fonts: false,
@@ -172,6 +170,13 @@ module Metanorma
         ::Metanorma::Util.log("[metanorma] Info: Compiling #{f}...done!", :info)
       end
 
+      def compile_adoc_file?(file)
+        @collection.directives.detect do |d|
+          d.key == "recompile-xml"
+        end and return true
+        !File.exist?(file.sub(/\.adoc$/, ".xml"))
+      end
+
       def documents(mnf = @config)
         Array(mnf.entry).each_with_object({}) do |dr, m|
           if dr.file

data/lib/metanorma/collection/multilingual/multilingual.rb

@@ -611,13 +611,13 @@ module Metanorma
       def initialize(options)
         options[:align_cross_elements] ||= %w(note p)
         @align_cross_elements = " #{options[:align_cross_elements].join(' ')} "
-        @doctype = options[:doctype]
+        @flavor = options[:flavor]
         @outdir = options[:outdir]
         @converter_opt = options[:converter_options]
       end
 
       def htmlconv
-        x = Asciidoctor.load nil, backend: @doctype
+        x = Asciidoctor.load nil, backend: @flavor
         x.converter.html_converter(@converter_opt)
       end
 

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

@@ -157,8 +157,9 @@ module Metanorma
       def update_indirect_refs_to_docs(docxml, _docidentifier, internal_refs)
         bibitems, erefs = update_indirect_refs_to_docs_prep(docxml)
         internal_refs.each do |schema, ids|
+          s = "#{schema}_"
           ids.each do |id, file|
-            k = indirect_ref_key(schema, id, docxml)
+            k = indirect_ref_key(s, schema, id, docxml)
             update_indirect_refs_to_docs1(docxml, k, file, bibitems, erefs)
           end
         end
@@ -169,7 +170,16 @@ module Metanorma
         [Util::gather_bibitems(docxml), Util::gather_bibitemids(docxml)]
       end
 
-      def indirect_ref_key(schema, id, docxml)
+      def indirect_ref_key(schema_, schema, id, docxml)
+        /^#{schema_}/.match?(id) and return id
+        ret = schema_ + id
+        suffix = docxml.root["document_suffix"] or return ret
+        (k = docxml.root["type"]) && k != schema or return ret
+        "#{ret}_#{suffix}"
+      end
+
+      #OLD
+      def indirect_ref_key1(schema, id, docxml)
         /^#{schema}_/.match?(id) and return id
         ret = "#{schema}_#{id}"
         suffix = docxml.root["document_suffix"]
@@ -222,6 +232,17 @@ module Metanorma
       end
 
       def update_anchor_loc(bib, eref, docid)
+        loc = eref.at(".//xmlns:locality[@type = 'anchor']") or
+          return update_anchor_create_loc(bib, eref, docid)
+        a = @files.get(docid, :anchors) or return
+        ref = loc.elements&.first or return
+        anchor = suffix_anchor(ref.text, docid)
+        a.values.detect { |x| x.value?(anchor) } or return
+        ref.content = anchor
+      end
+
+      #OLD
+      def update_anchor_loc1(bib, eref, docid)
         loc = eref.at(".//xmlns:locality[@type = 'anchor']") or
           return update_anchor_create_loc(bib, eref, docid)
         ref = loc.at("./xmlns:referenceFrom") or return
@@ -233,6 +254,13 @@ module Metanorma
       end
 
       def suffix_anchor(ref, docid)
+        @ncnames[docid] ||= "#{Metanorma::Utils::to_ncname(docid)}_"
+        @files.url?(docid) or return ref
+        @ncnames[docid] + ref
+      end
+
+      #OLD
+       def suffix_anchor1(ref, docid)
         @ncnames[docid] ||= Metanorma::Utils::to_ncname(docid)
         anchor = ref.text
         @files.url?(docid) or anchor = "#{@ncnames[docid]}_#{anchor}"

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

@@ -85,6 +85,7 @@ module Metanorma
       def gather_internal_refs
         @files.keys.each_with_object({}) do |i, refs|
           @files.get(i, :attachment) and next
+          @files.get(i, :sectionsplit) and next
           file, = @files.targetfile_id(i, read: true)
           gather_internal_refs1(file, i, refs)
         end

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

@@ -3,8 +3,8 @@ module Metanorma
     class Renderer
       def docconv
         @tempfile_cache ||= []
-        doctype = @doctype.to_sym
-        x = Asciidoctor.load nil, backend: doctype
+        flavor = @flavor.to_sym
+        x = Asciidoctor.load nil, backend: flavor
         x.converter.doc_converter(DocOptionsNode.new(@directives, @dirname))
       end
 
@@ -51,8 +51,8 @@ module Metanorma
         doc
       end
 
-      SECTION_BREAK = '<p class="MsoNormal"><br clear="all" class="section"/></p>'
-        .freeze
+      SECTION_BREAK =
+        '<p class="MsoNormal"><br clear="all" class="section"/></p>'.freeze
       DIV1 = '<div class="WordSection1">&#xa0;</div>'.freeze
       DIV2 = '<div class="WordSection2">&#xa0;</div>'.freeze
 
@@ -70,10 +70,10 @@ module Metanorma
       end
 
       def collection_coverpages(conv, docs)
-        conv.wordintropage and [DIV2, SECTION_BREAK].reverse.each do |s|
+        conv.wordintropage and [DIV2, SECTION_BREAK].reverse_each do |s|
           docs.unshift(Nokogiri::XML(s).root)
         end
-        conv.wordcoverpage and [DIV1, SECTION_BREAK].reverse.each do |s|
+        conv.wordcoverpage and [DIV1, SECTION_BREAK].reverse_each do |s|
           docs.unshift(Nokogiri::XML(s).root)
         end
         docs

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

@@ -38,9 +38,9 @@ module Metanorma
         @script = collection.bibdata.script.first || "Latn"
         @locale = @xml.at("//xmlns:bibdata/xmlns:locale")&.text
         @registry = Metanorma::Registry.instance
-        @doctype = doctype
+        @flavor = options[:flavor] || flavor
         @compile = Compile.new
-        @compile.load_flavor(@doctype)
+        @compile.load_flavor(@flavor)
 
         @isodoc = isodoc_create # output processor for flavour
         @outdir = dir_name_cleanse(options[:output_folder])
@@ -136,8 +136,8 @@ module Metanorma
         @directives.detect { |d| d.key == "bilingual" } &&
           options[:format].include?(:html) and
           Metanorma::Collection::Multilingual.new(
-            { doctype: doctype.to_sym,
-              converter_options: PdfOptionsNode.new(doctype, @compile_options),
+            { flavor: flavor.to_sym,
+              converter_options: PdfOptionsNode.new(flavor, @compile_options),
               outdir: @outdir },
           ).to_html(pres)
       end
@@ -155,14 +155,9 @@ module Metanorma
         out
       end
 
-      # infer the flavour from the first document identifier; relaton does that
-      def doctype
-        if (docid = @xml.at("//bibdata/docidentifier/@type")&.text)
-          dt = docid.downcase
-        elsif (docid = @xml.at("//bibdata/docidentifier")&.text)
-          dt = docid.sub(/\s.*$/, "").lowercase
-        else return "standoc"
-        end
+      # TODO: infer flavor from publisher when available
+      def flavor
+        dt = @xml.at("//bibdata/ext/flavor")&.text or return "standoc"
         @registry.alias(dt.to_sym)&.to_s || dt
       end
 

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

@@ -111,9 +111,9 @@ module Metanorma
       end
 
       def pdfconv
-        doctype = @doctype.to_sym
-        x = Asciidoctor.load nil, backend: doctype
-        x.converter.pdf_converter(PdfOptionsNode.new(doctype,
+        flavor = @flavor.to_sym
+        x = Asciidoctor.load nil, backend: flavor
+        x.converter.pdf_converter(PdfOptionsNode.new(flavor,
                                                      @compile_options))
       end
 
@@ -153,8 +153,8 @@ module Metanorma
       end
 
       class PdfOptionsNode
-        def initialize(doctype, options)
-          p = Metanorma::Registry.instance.find_processor(doctype)
+        def initialize(flavor, options)
+          p = Metanorma::Registry.instance.find_processor(flavor)
           if ::Metanorma::Util::FontistHelper.has_custom_fonts?(p, options, {})
             @fonts_manifest =
               ::Metanorma::Util::FontistHelper.location_manifest(p, options)
@@ -169,7 +169,7 @@ module Metanorma
       end
 
       def isodoc_create
-        isodoc = Util::load_isodoc(@doctype)
+        isodoc = Util::load_isodoc(@flavor)
         isodoc.i18n_init(@lang, @script, @locale) # read in internationalisation
         isodoc.metadata_init(@lang, @script, @locale, isodoc.i18n)
         isodoc.info(@xml, nil)

data/lib/metanorma/collection/sectionsplit/collection.rb

@@ -0,0 +1,100 @@
+module Metanorma
+  class Collection
+    class Sectionsplit
+      def build_collection
+        collection_setup(@base, @dir)
+        files = sectionsplit
+        input_xml = Nokogiri::XML(File.read(@input_filename,
+                                            encoding: "UTF-8"), &:huge)
+        collection_manifest(@base, files, input_xml, @xml, @dir).render(
+          { format: %i(html), output_folder: "#{@output_filename}_collection",
+            coverpage: File.join(@dir, "cover.html") }.merge(@compile_opts),
+        )
+        section_split_attachments(out: "#{@output_filename}_collection")
+      end
+
+      def collection_setup(filename, dir)
+        FileUtils.mkdir_p "#{filename}_collection" if filename
+        FileUtils.mkdir_p dir
+        File.open(File.join(dir, "cover.html"), "w:UTF-8") do |f|
+          f.write(coll_cover)
+        end
+      end
+
+      def coll_cover
+        <<~COVER
+          <html><head><meta charset="UTF-8"/></head><body>
+                <h1>{{ doctitle }}</h1>
+                <h2>{{ docnumber }}</h2>
+                <nav>{{ navigation }}</nav>
+              </body></html>
+        COVER
+      end
+
+      def collection_manifest(filename, files, origxml, _presxml, dir)
+        File.open(File.join(dir, "#{filename}.html.yaml"), "w:UTF-8") do |f|
+          f.write(collectionyaml(files, origxml))
+        end
+        Metanorma::Collection.parse File.join(dir, "#{filename}.html.yaml")
+      end
+
+      def collectionyaml(files, xml)
+        ret = {
+          directives: ["presentation-xml", "bare-after-first"],
+          bibdata: {
+            title: {
+              type: "title-main", language: @lang,
+              content: xml.at(ns("//bibdata/title")).text
+            },
+            type: "collection",
+            docid: {
+              type: xml.at(ns("//bibdata/docidentifier/@type")).text,
+              id: xml.at(ns("//bibdata/docidentifier")).text,
+            },
+          },
+          manifest: {
+            level: "collection", title: "Collection",
+            docref: files.sort_by { |f| f[:order] }.each.map do |f|
+              { fileref: f[:url], identifier: f[:title] }
+            end
+          },
+        }
+        ::Metanorma::Util::recursive_string_keys(ret).to_yaml
+      end
+
+      def att_dir(file)
+        "_#{File.basename(file, '.*')}_attachments"
+      end
+
+      def section_split_attachments(out: nil)
+        attachments = att_dir(@tmp_filename)
+        File.directory?(attachments) or return
+        dir = out || File.dirname(@input_filename)
+        ret = File.join(dir, att_dir(@output_filename))
+        FileUtils.rm_rf ret
+        FileUtils.mv attachments, ret
+        File.basename(ret)
+      end
+
+      def section_split_cover(col, ident, _one_doc_coll)
+        dir = File.dirname(col.file)
+        collection_setup(nil, dir)
+        r = ::Metanorma::Collection::Renderer
+          .new(col, dir, output_folder: "#{ident}_collection",
+                         format: %i(html), coverpage: File.join(dir, "cover.html"))
+        r.coverpage
+        section_split_cover1(ident, r, dir, _one_doc_coll)
+      end
+
+      def section_split_cover1(ident, renderer, dir, _one_doc_coll)
+        # filename = one_doc_coll ? "#{ident}_index.html" : "index.html"
+        filename = File.basename("#{ident}_index.html")
+        # ident can be a directory with YAML indirection
+        FileUtils.mv File.join(renderer.outdir, "index.html"),
+                     File.join(dir, filename)
+        FileUtils.rm_rf renderer.outdir
+        filename
+      end
+    end
+  end
+end

data/lib/metanorma/collection/sectionsplit/sectionsplit.rb

@@ -1,6 +1,7 @@
 require "yaml"
 require_relative "../../util/util"
 require_relative "../xrefprocess/xrefprocess"
+require_relative "collection"
 
 module Metanorma
   class Collection
@@ -17,49 +18,13 @@ module Metanorma
         @fileslookup = opts[:fileslookup]
         @ident = opts[:ident]
         @isodoc = opts[:isodoc]
+        @document_suffix = opts[:document_suffix]
       end
 
       def ns(xpath)
         @isodoc.ns(xpath)
       end
 
-      def build_collection
-        collection_setup(@base, @dir)
-        files = sectionsplit # (@input_filename, @base, @dir, @compile_opts)
-        input_xml = Nokogiri::XML(File.read(@input_filename,
-                                            encoding: "UTF-8"), &:huge)
-        collection_manifest(@base, files, input_xml, @xml, @dir).render(
-          { format: %i(html), output_folder: "#{@output_filename}_collection",
-            coverpage: File.join(@dir, "cover.html") }.merge(@compile_opts),
-        )
-        section_split_attachments(out: "#{@output_filename}_collection")
-      end
-
-      def collection_manifest(filename, files, origxml, _presxml, dir)
-        File.open(File.join(dir, "#{filename}.html.yaml"), "w:UTF-8") do |f|
-          f.write(collectionyaml(files, origxml))
-        end
-        Metanorma::Collection.parse File.join(dir, "#{filename}.html.yaml")
-      end
-
-      def collection_setup(filename, dir)
-        FileUtils.mkdir_p "#{filename}_collection" if filename
-        FileUtils.mkdir_p dir
-        File.open(File.join(dir, "cover.html"), "w:UTF-8") do |f|
-          f.write(coll_cover)
-        end
-      end
-
-      def coll_cover
-        <<~COVER
-          <html><head><meta charset="UTF-8"/></head><body>
-                <h1>{{ doctitle }}</h1>
-                <h2>{{ docnumber }}</h2>
-                <nav>{{ navigation }}</nav>
-              </body></html>
-        COVER
-      end
-
       SPLITSECTIONS =
         [["//preface/*", "preface"], ["//sections/*", "sections"],
          ["//annex", nil],
@@ -80,7 +45,7 @@ module Metanorma
 
       def block?(node)
         %w(p table formula admonition ol ul dl figure quote sourcecode example
-           pre note pagebrreak hr bookmark requirement recommendation permission
+           pre note pagebreak hr bookmark requirement recommendation permission
            svgmap inputform toc passthrough review imagemap).include?(node.name)
       end
 
@@ -142,7 +107,8 @@ module Metanorma
              "//bibliography/references[not(@hidden = 'true')] | " \
              "//indexsect | //colophon"),
         ).each(&:remove)
-        ordinal.zero? or out.xpath(ns("//metanorma-ext//attachment"))
+        ordinal.zero? or out.xpath(ns("//metanorma-ext//attachment | " \
+                      "//semantic__metanorma-ext//semantic__attachment"))
           .each(&:remove) # keep only one copy of attachments
         out
       end
@@ -158,11 +124,34 @@ module Metanorma
         sectionfile_insert(ins, chunks, parentnode)
         Metanorma::Collection::XrefProcess::xref_process(out, xml, @key,
                                                          @ident, @isodoc)
+        truncate_semxml(out, chunks)
         outname = "#{file}.xml"
         File.open(File.join(@splitdir, outname), "w:UTF-8") { |f| f.write(out) }
         outname
       end
 
+      def semantic_xml_ids_gather(out)
+        out.at(ns("//semantic__bibdata")) or return
+        SPLITSECTIONS.each_with_object({}) do |s, m|
+          out.xpath(ns(s[0].sub("//", "//semantic__"))).each do |x|
+            x["id"] or next
+            m[x["id"].sub(/^semantic__/, "")] = x
+          end
+        end
+      end
+
+      def semxml_presxml_nodes_match(nodes, chunks)
+        chunks.each do |x|
+          nodes[x["id"]] and nodes.delete(x["id"])
+        end
+      end
+
+      def truncate_semxml(out, chunks)
+        nodes = semantic_xml_ids_gather(out) or return
+        semxml_presxml_nodes_match(nodes, chunks)
+        nodes.each_value(&:remove)
+      end
+
       def sectionfile_insert(ins, chunks, parentnode)
         if parentnode
           ins.next = "<#{parentnode}/>"
@@ -180,64 +169,6 @@ module Metanorma
           .each { |x| x.replace(x.children) }
         t.children.to_xml
       end
-
-      def collectionyaml(files, xml)
-        ret = {
-          directives: ["presentation-xml", "bare-after-first"],
-          bibdata: {
-            title: {
-              type: "title-main", language: @lang,
-              content: xml.at(ns("//bibdata/title")).text
-            },
-            type: "collection",
-            docid: {
-              type: xml.at(ns("//bibdata/docidentifier/@type")).text,
-              id: xml.at(ns("//bibdata/docidentifier")).text,
-            },
-          },
-          manifest: {
-            level: "collection", title: "Collection",
-            docref: files.sort_by { |f| f[:order] }.each.map do |f|
-              { fileref: f[:url], identifier: f[:title] }
-            end
-          },
-        }
-        ::Metanorma::Util::recursive_string_keys(ret).to_yaml
-      end
-
-      def section_split_cover(col, ident, _one_doc_coll)
-        dir = File.dirname(col.file)
-        collection_setup(nil, dir)
-        r = ::Metanorma::Collection::Renderer
-          .new(col, dir, output_folder: "#{ident}_collection",
-                         format: %i(html), coverpage: File.join(dir, "cover.html"))
-        r.coverpage
-        section_split_cover1(ident, r, dir, _one_doc_coll)
-      end
-
-      def att_dir(file)
-        "_#{File.basename(file, '.*')}_attachments"
-      end
-
-      def section_split_attachments(out: nil)
-        attachments = att_dir(@tmp_filename)
-        File.directory?(attachments) or return
-        dir = out || File.dirname(@input_filename)
-        ret = File.join(dir, att_dir(@output_filename))
-        FileUtils.rm_rf ret
-        FileUtils.mv attachments, ret
-        File.basename(ret)
-      end
-
-      def section_split_cover1(ident, renderer, dir, _one_doc_coll)
-        # filename = one_doc_coll ? "#{ident}_index.html" : "index.html"
-        filename = File.basename("#{ident}_index.html")
-        # ident can be a directory with YAML indirection
-        FileUtils.mv File.join(renderer.outdir, "index.html"),
-                     File.join(dir, filename)
-        FileUtils.rm_rf renderer.outdir
-        filename
-      end
     end
   end
 end

data/lib/metanorma/collection/util/util.rb

@@ -30,8 +30,7 @@ module Metanorma
           end
         end
 
-        def add_suffix_to_attributes(doc, suffix, tag_name, attr_name,
-isodoc)
+        def add_suffix_to_attrs(doc, suffix, tag_name, attr_name, isodoc)
           (suffix.nil? || suffix.empty?) and return
           doc.xpath(isodoc.ns("//#{tag_name}[@#{attr_name}]")).each do |elem|
             a = elem.attributes[attr_name].value
@@ -62,8 +61,8 @@ isodoc)
           def attr(_key); end
         end
 
-        def load_isodoc(doctype)
-          x = Asciidoctor.load nil, backend: doctype.to_sym
+        def load_isodoc(flavor)
+          x = Asciidoctor.load nil, backend: flavor.to_sym
           x.converter.html_converter(Dummy.new) # to obtain Isodoc class
         end
       end

data/lib/metanorma/collection/xrefprocess/xrefprocess.rb

@@ -10,9 +10,9 @@ module Metanorma
           key = (0...8).map { rand(65..90).chr }.join # random string
           xml.root["type"] = key
           Metanorma::Utils::anchor_attributes
-            .each do |(tag_name, attribute_name)|
-            ::Metanorma::Collection::Util::add_suffix_to_attributes(
-              xml, xml.root["document_suffix"], tag_name, attribute_name, isodoc
+            .each do |(tag_name, attr_name)|
+            ::Metanorma::Collection::Util::add_suffix_to_attrs(
+              xml, xml.root["document_suffix"], tag_name, attr_name, isodoc
             )
           end
           key

data/lib/metanorma/compile/compile.rb

@@ -33,6 +33,7 @@ module Metanorma
       relaton_export(isodoc, options)
       extract(isodoc, options[:extract], options[:extract_type])
       process_exts(filename, extensions, file, isodoc, options)
+    ensure
       clean_exit(options)
     end
 

data/lib/metanorma/compile/compile_validate.rb

@@ -33,15 +33,15 @@ module Metanorma
                  "support the standard type #{stdtype}. Exiting.", :fatal)
     end
 
-    private
-
-    STDTYPE2FLAVOR = {}.freeze
-
     def stdtype2flavor(stdtype)
       flavor = STDTYPE2FLAVOR[stdtype] || stdtype
       "metanorma-#{flavor}"
     end
 
+    private
+
+    STDTYPE2FLAVOR = {}.freeze
+
     def require_flavor(flavor)
       require flavor
       Util.log("[metanorma] Info: gem `#{flavor}` loaded.", :info)

data/lib/metanorma/input/asciidoc.rb

@@ -10,29 +10,9 @@ module Metanorma
                      novalid: options[:novalid],
                      attributes: ["nodoc", "stem", "docfile=#{filename}",
                                   "output_dir=#{options[:output_dir]}"] }
-        unless asciidoctor_validate(file, filename, out_opts)
-          warn "Cannot continue compiling Asciidoctor document"
-          abort
-        end
         ::Asciidoctor.convert(file, out_opts)
       end
 
-      def asciidoctor_validate(file, filename, options)
-        err = nil
-        begin
-          previous_stderr = $stderr
-          $stderr = StringIO.new
-          ::Asciidoctor.load(file, options)
-          %r{(\n|^)asciidoctor: ERROR: ['"]?#{Regexp.escape(filename ||
-            '<empty>')}['"]?: line \d+: include file not found: }
-            .match($stderr.string) and err = $stderr.string
-        ensure
-          $stderr = previous_stderr
-        end
-        warn err unless err.nil?
-        err.nil?
-      end
-
       def extract_metanorma_options(file)
         headerextract = file.sub(/\n\n.*$/m, "\n")
         /\n:mn-document-class:\s+(?<type>\S[^\n]*)\n/ =~ headerextract

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "2.0.5".freeze
+  VERSION = "2.0.6".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-09-30 00:00:00.000000000 Z
+date: 2024-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -317,6 +317,7 @@ files:
 - lib/metanorma/collection/renderer/render_word.rb
 - lib/metanorma/collection/renderer/renderer.rb
 - lib/metanorma/collection/renderer/utils.rb
+- lib/metanorma/collection/sectionsplit/collection.rb
 - lib/metanorma/collection/sectionsplit/sectionsplit.rb
 - lib/metanorma/collection/util/disambig_files.rb
 - lib/metanorma/collection/util/util.rb