metanorma 1.5.5 → 1.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b89c521393022873c1869075ea123a814f157c5bf37cbd4f8b9f34076396a0e
-  data.tar.gz: b289b1718e6b24dd672ec758210ac483370b5fd56d583d8e6c7d06d3bfceca9d
+  metadata.gz: 5a628508e5ba0e2e1d2ec4b77aa35866e67990ca67b38e34278e877b6e2ebee2
+  data.tar.gz: c6022674620272b5de0111fe182781b8d18d01bceb38c99b0eae92ad3a1265b6
 SHA512:
-  metadata.gz: e914e35240ed44db0d6b822d83e9bfca1fb0573c37b054ba0f343df5378364a41c3f1f7f37634b5cc592111eea696128909c2c2f78667ba96da8ea86fea3f1d4
-  data.tar.gz: a74dedfd28fb9281a729a26de8c020d560cbc298ec23172db5d6425298094f085a79ee08c76d67da7af3f1b524eb20001f9e5b9e16b63e2c286fb041e0124edd
+  metadata.gz: e8dbe50e863d2ae58969dcccb4302425b2f1acca6a3200f3395b069bace35d57376d7b3fc054e99573f6cf4da8ff21539eb233ae6163b85894169247dd010634
+  data.tar.gz: 2590266e459d6f211470f5a6f3f282e78e06c5728780871ccf24e2c5069871c9c49fb37d32286cca6218f85ea21435e8c8b40437e07aca8cc2de673e65a71649

data/lib/metanorma/collection.rb

@@ -17,9 +17,9 @@ module Metanorma
     attr_accessor :directives
 
     # @return [Hash<String, Metanorma::Document>]
-    attr_accessor :documents
+    attr_accessor :documents, :bibdatas, :coverpage
 
-    attr_accessor :disambig
+    attr_accessor :disambig, :manifest
 
     # @param file [String] path to source file
     # @param directives [Array<String>] documents-inline to inject the XML into
@@ -28,6 +28,7 @@ module Metanorma
     # @param manifest [Metanorma::CollectionManifest]
     # @param documents [Hash<String, Metanorma::Document>]
     # @param prefatory [String]
+    # @param coverpage [String]
     # @param final [String]
     # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
     def initialize(**args)
@@ -36,11 +37,17 @@ module Metanorma
       @bibdata = args[:bibdata]
       @manifest = args[:manifest]
       @manifest.collection = self
+      c = @directives.detect { |x| x.is_a?(Hash) && x["coverpage"] }
+      c and @coverpage = c["coverpage"]
+      c = @directives.detect { |x| x.is_a?(Hash) && x["coverpage-style"] }
+      c and @coverpage_style = c["coverpage-style"]
       @documents = args[:documents] || {}
+      @bibdatas = args[:documents] || {}
       if @documents.any? && !@directives.include?("documents-inline")
         @directives << "documents-inline"
       end
       @documents.merge! @manifest.documents(File.dirname(@file))
+      @bibdatas.merge! @manifest.documents(File.dirname(@file))
       @prefatory = args[:prefatory]
       @final = args[:final]
       @log = Metanorma::Utils::Log.new
@@ -66,12 +73,29 @@ module Metanorma
 
     def collection_body(coll)
       coll << @bibdata.to_xml(bibdata: true, date_format: :full)
+      @directives.each do |d|
+        coll << "<directives>#{obj_to_xml(d)}</directives>"
+      end
       @manifest.to_xml coll
       content_to_xml "prefatory", coll
       doccontainer coll
       content_to_xml "final", coll
     end
 
+    def obj_to_xml(elem)
+      case elem
+      when ::Array
+        elem.each_with_object([]) do |v, m|
+          m << "<value>#{obj_to_xml(v)}</value>"
+        end.join
+      when ::Hash
+        elem.each_with_object([]) do |(k, v), m|
+          m << "<#{k}>#{obj_to_xml(v)}</#{k}>"
+        end.join
+      else elem
+      end
+    end
+
     def render(opts)
       CollectionRenderer.render self, opts.merge(log: @log)
       clean_exit
@@ -98,8 +122,27 @@ module Metanorma
         mnf = CollectionManifest.from_xml mnf_xml
         pref = pref_final_content xml.at("//xmlns:prefatory-content")
         fnl = pref_final_content xml.at("//xmlns:final-content")
+        cov = pref_final_content xml.at("//xmlns:coverpage")
         new(file: file, bibdata: bd, manifest: mnf,
-            documents: docs_from_xml(xml, mnf), prefatory: pref, final: fnl)
+            directives: directives_from_xml(xml.xpath("//xmlns:directives")),
+            documents: docs_from_xml(xml, mnf),
+            bibdatas: docs_from_xml(xml, mnf),
+            prefatory: pref, final: fnl, coverpage: cov)
+      end
+
+      # TODO refine
+      def directives_from_xml(dir)
+        dir.each_with_object([]) do |d, m|
+          if d.at("./xmlns:value")
+            m << x.xpath("./xmlns:value").map(&:text)
+          elsif d.at("./*")
+            out = d.elements.each_with_object({}) do |e, ret|
+              ret[e.name] = e.children.to_xml
+            end
+            m << out
+          else m << d.children.to_xml
+          end
+        end
       end
 
       def parse_yaml(file)
@@ -135,8 +178,8 @@ module Metanorma
 
         <<~CONT
 
-          == #{xml.at('title')&.text}
-        #{xml.at('p')&.text}
+            == #{xml.at('title')&.text}
+          #{xml.at('p')&.text}
         CONT
       end
     end

data/lib/metanorma/collection_fileparse.rb

@@ -54,9 +54,9 @@ module Metanorma
       # IDs for repo references are untyped by default
       docid = bib.at(ns("./docidentifier[not(@type)]")) ||
         bib.at(ns("./docidentifier"))
-      docid &&= docid.children.to_xml
-      if @files[docid]
-        docid
+      docid &&= @c.decode(@isodoc
+          .docid_prefix(docid["type"], docid.children.to_xml))
+      if @files[docid] then docid
       else
         fail_update_bibitem(docid, identifier)
         nil
@@ -64,9 +64,9 @@ module Metanorma
     end
 
     def fail_update_bibitem(docid, identifier)
-      error = "[metanorma] Cannot find crossreference to document #{docid} "\
+      error = "[metanorma] Cannot find crossreference to document #{docid} " \
               "in document #{identifier}."
-      @log.add("Cross-References", nil, error)
+      @log&.add("Cross-References", nil, error)
       Util.log(error, :warning)
     end
 
@@ -101,7 +101,7 @@ module Metanorma
     end
 
     def hide_refs(docxml)
-      docxml.xpath(ns("//references[bibitem][not(./bibitem[not(@hidden) or "\
+      docxml.xpath(ns("//references[bibitem][not(./bibitem[not(@hidden) or " \
                       "@hidden = 'false'])]")).each do |f|
         f["hidden"] = "true"
       end
@@ -111,11 +111,12 @@ module Metanorma
       docxml.xpath(ns("//bibitem[not(ancestor::bibitem)]")).each do |b|
         next if b&.at(ns("./docidentifier[@type = 'repository']"))
 
-        b.xpath(ns("./docidentifier")).each do |d|
-          next unless @files[d.text]
-
-          d.next = "<docidentifier type='repository'>"\
-                   "current-metanorma-collection/#{d.text}"
+        b.xpath(ns("./docidentifier")).each do |docid|
+          id = @c.decode(@isodoc
+          .docid_prefix(docid["type"], docid.children.to_xml))
+          @files[id] or next
+          docid.next = "<docidentifier type='repository'>" \
+                       "current-metanorma-collection/#{id}"
         end
       end
     end
@@ -154,16 +155,21 @@ module Metanorma
     def update_direct_refs_to_docs(docxml, identifier)
       erefs = collect_erefs(docxml)
       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)
-
+        docid = b.at(ns("./docidentifier[@type = 'repository']"))
+        (docid && %r{^current-metanorma-collection/}.match(docid.text)) or next
         update_bibitem(b, identifier)
-        docid = b.at(ns("./docidentifier")) or next
-        docid = docid.children.to_xml
+        docid = docid_to_citeas(b) or next
         erefs[:citeas][docid] and update_anchors(b, docxml, docid)
       end
     end
 
+    def docid_to_citeas(bib)
+      docid = bib.at(ns("./docidentifier[@primary = 'true']")) ||
+        bib.at(ns("./docidentifier")) or return
+      @c.decode(@isodoc
+          .docid_prefix(docid["type"], docid.children.to_xml))
+    end
+
     def collect_erefs(docxml)
       docxml.xpath(ns("//eref"))
         .each_with_object({ citeas: {}, bibitemid: {} }) do |i, m|
@@ -189,7 +195,7 @@ module Metanorma
           a.children = "#{a.text}_#{Metanorma::Utils::to_ncname(file)}"
         end
       end
-      docid = docxml.at(ns("//bibitem[@id = '#{schema}_#{id}']/"\
+      docid = docxml.at(ns("//bibitem[@id = '#{schema}_#{id}']/" \
                            "docidentifier[@type = 'repository']")) or return
       docid.children = "current-metanorma-collection/#{file}"
       docid.previous = "<docidentifier type='X'>#{file}</docidentifier>"
@@ -201,7 +207,7 @@ module Metanorma
       docxml.xpath("//xmlns:eref[@citeas = '#{docid}']").each do |e|
         if @files[docid] then update_anchor_loc(bib, e, docid)
         else
-          e << "<strong>** Unresolved reference to document #{docid} "\
+          e << "<strong>** Unresolved reference to document #{docid} " \
                "from eref</strong>"
         end
       end
@@ -211,7 +217,7 @@ module Metanorma
       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
+      ref = loc.at(ns("./referenceFrom")) or return
       anchor = "#{ref.text}_#{document_suffix}"
       return unless @files[docid][:anchors].inject([]) do |m, (_, x)|
         m += x.values
@@ -228,18 +234,17 @@ module Metanorma
       type = "clause" if type == "annex"
       ref = ins.at(ns("./locality/referenceFrom"))&.text
       anchor = @files[docid][:anchors].dig(type, ref) or return
-      ins << "<locality type='anchor'><referenceFrom>#{anchor.sub(/^_/, '')}"\
+      ins << "<locality type='anchor'><referenceFrom>#{anchor.sub(/^_/, '')}" \
              "</referenceFrom></locality>"
     end
 
     # gather internal bibitem references
     def gather_internal_refs
       @files.each_with_object({}) do |(_, x), refs|
-        next if x[:attachment]
-
+        x[:attachment] and next
         file, = targetfile(x, read: true)
         Nokogiri::XML(file)
-          .xpath(ns("//bibitem[@type = 'internal']/"\
+          .xpath(ns("//bibitem[@type = 'internal']/" \
                     "docidentifier[@type = 'repository']")).each do |d|
           a = d.text.split(%r{/}, 2)
           a.size > 1 or next
@@ -253,7 +258,8 @@ module Metanorma
     def locate_internal_refs
       refs = gather_internal_refs
       @files.keys.reject { |k| @files[k][:attachment] }.each do |identifier|
-        locate_internal_refs1(refs, identifier, @files[identifier])
+        id = @c.decode(@isodoc.docid_prefix("", identifier.dup))
+        locate_internal_refs1(refs, identifier, @files[id])
       end
       refs.each do |schema, ids|
         ids.each do |id, key|

data/lib/metanorma/collection_fileprocess.rb

@@ -15,8 +15,10 @@ module Metanorma
     def read_files(path) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       files = {}
       @xml.xpath(ns("//docref")).each do |d|
-        identifier = d.at(ns("./identifier")).children.to_xml
-        files[identifier] = file_entry(d, identifier, path)
+        orig_id = d.at(ns("./identifier"))
+        identifier = @c.decode(@isodoc
+                  .docid_prefix(orig_id["type"], orig_id.children.to_xml))
+        files[identifier] = file_entry(d, orig_id.children.to_xml, path)
         if files[identifier][:attachment]
           files[identifier][:bibdata] = Metanorma::Document
             .attachment_bibitem(identifier).root
@@ -95,6 +97,7 @@ module Metanorma
     # rel_path is the source file address, determined relative to the YAML.
     # out_path is the destination file address, with any references outside
     # the working directory (../../...) truncated
+    # identifier is the id with only spaces, no nbsp
     def file_entry(ref, identifier, _path)
       out = ref["attachment"] ? ref["fileref"] : File.basename(ref["fileref"])
       ret = if ref["fileref"]
@@ -122,6 +125,15 @@ module Metanorma
       Metanorma::Utils::anchor_attributes.each do |(tag_name, attribute_name)|
         add_suffix_to_attributes(doc, document_suffix, tag_name, attribute_name)
       end
+      url_in_css_styles(doc, document_suffix)
+    end
+
+    # update relative URLs, url(#...), in CSS in @style attrs (including SVG)
+    def url_in_css_styles(doc, document_suffix)
+      doc.xpath("//*[@style]").each do |s|
+        s["style"] = s["style"]
+          .gsub(%r{url\(#([^)]+)\)}, "url(#\\1_#{document_suffix})")
+      end
     end
 
     # return file contents + output filename for each file in the collection,

data/lib/metanorma/collection_manifest.rb

@@ -111,6 +111,9 @@ module Metanorma
           b.identifier do |i|
             i << dr["identifier"]
           end
+          !dr["attachment"] && !dr["sectionsplit"] &&
+            d = @collection.bibdatas[dr["identifier"]] and
+            b.parent.add_child(d.bibitem.to_xml(bibdata: true))
         end
         docref_to_xml_attrs(drf, dr)
       end

data/lib/metanorma/collection_renderer.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "isodoc"
+require "htmlentities"
 require_relative "collection_fileprocess"
 require_relative "fontist_utils"
 require_relative "util"
@@ -10,6 +11,8 @@ module Metanorma
   class CollectionRenderer
     FORMATS = %i[html xml doc pdf].freeze
 
+    attr_accessor :isodoc
+
     # This is only going to render the HTML collection
     # @param xml [Metanorma::Collection] input XML collection
     # @param folder [String] input folder
@@ -31,23 +34,23 @@ module Metanorma
       @doctype = doctype
       require "metanorma-#{@doctype}"
 
-      # output processor for flavour
-      @isodoc = isodoc
-
+      @isodoc = isodoc_create # output processor for flavour
       @outdir = dir_name_cleanse(options[:output_folder])
-      @coverpage = options[:coverpage]
+      @coverpage = options[:coverpage] || collection.coverpage
       @format = Util.sort_extensions_execution(options[:format])
       @compile_options = options[:compile] || {}
       @compile_options[:no_install_fonts] = true if options[:no_install_fonts]
       @log = options[:log]
       @documents = collection.documents
+      @bibdata = collection.documents
       @directives = collection.directives
       @disambig = Util::DisambigFiles.new
       @compile = Compile.new
+      @c = HTMLEntities.new
 
       # list of files in the collection
       @files = read_files folder
-      isodoc_populate(@isodoc)
+      @isodoc = isodoc_populate # output processor for flavour
       create_non_existing_directory(@outdir)
     end
 
@@ -77,6 +80,7 @@ module Metanorma
       warn "\n\n\n\n\nCoverpage: #{DateTime.now.strftime('%H:%M:%S')}"
       cr.coverpage if options[:format]&.include?(:html)
       warn "\n\n\n\n\nDone: #{DateTime.now.strftime('%H:%M:%S')}"
+      cr
     end
 
     def concatenate(col, options)
@@ -95,7 +99,8 @@ module Metanorma
 
     def concatenate1(out, ext)
       out.directives << "documents-inline"
-      out.documents.each_key do |id|
+      out.bibdatas.each_key do |ident|
+        id = @c.decode(@isodoc.docid_prefix(nil, ident.dup))
         @files[id][:attachment] || @files[id][:outputs].nil? and next
 
         out.documents[id] =
@@ -125,34 +130,43 @@ module Metanorma
       end
     end
 
-    # Dummy class
     class Dummy
       def attr(_key); end
     end
 
-    # The isodoc class for the metanorma flavour we are using
-    def isodoc
+    def isodoc_create
       x = Asciidoctor.load nil, backend: @doctype.to_sym
-      isodoc = x.converter.html_converter(Dummy.new)
+      isodoc = x.converter.html_converter(Dummy.new) # to obtain Isodoc class
       isodoc.i18n_init(@lang, @script, @locale) # read in internationalisation
       isodoc.metadata_init(@lang, @script, @locale, isodoc.i18n)
       isodoc.info(@xml, nil)
       isodoc
     end
 
-    def isodoc_populate(isodoc)
-      # create the @meta class of isodoc, with "navigation" set to the index bar
+    def isodoc_populate
+      # create the @meta class of isodoc, for populating Liquid,
+      # with "navigation" set to the index bar.
       # extracted from the manifest
-      nav = indexfile(@xml.at(ns("//manifest")))
-      i18n = isodoc.i18n
-      i18n.set("navigation", nav)
-      isodoc.metadata_init(@lang, @script, @locale, i18n)
-      # populate the @meta class of isodoc with the various metadata fields
-      # native to the flavour; used to populate Liquid
+      isodoc = isodoc_create
+      isodoc.meta.set(:navigation, indexfile(@xml.at(ns("//manifest"))))
+      isodoc.meta.set(:docrefs, liquid_docrefs)
+      isodoc.meta.set(:"prefatory-content",
+                      isodoc_builder(isodoc,
+                                     @xml.at(ns("//prefatory-content"))))
+      isodoc.meta.set(:"final-content",
+                      isodoc_builder(isodoc, @xml.at(ns("//final-content"))))
       isodoc.info(@xml, nil)
       isodoc
     end
 
+    def isodoc_builder(isodoc, node)
+      Nokogiri::HTML::Builder.new(encoding: "UTF-8") do |b|
+        b.div do |div|
+          node&.children&.each { |n| isodoc.parse(n, div) }
+        end
+      end.doc.root.to_html
+    end
+
     # infer the flavour from the first document identifier; relaton does that
     def doctype
       if (docid = @xml.at(ns("//bibdata/docidentifier/@type"))&.text)
@@ -172,8 +186,7 @@ module Metanorma
     # populate liquid template of ARGV[1] with metadata extracted from
     # collection manifest
     def coverpage
-      return unless @coverpage
-
+      @coverpage or return
       File.open(File.join(@outdir, "index.html"), "w:UTF-8") do |f|
         f.write @isodoc.populate_template(File.read(@coverpage))
       end
@@ -203,9 +216,12 @@ module Metanorma
     def docrefs(elm, builder)
       elm.xpath(ns("./docref[@index = 'true']")).each do |d|
         ident = d.at(ns("./identifier")).children.to_xml
+        ident = @c.decode(@isodoc.docid_prefix(nil, ident))
         builder.li do |li|
-          li.a **{ href: index_link(d, ident) } do |a|
-            a << ident
+          li.a href: index_link(d, ident) do |a|
+            a << ident.split(/([<>&])/).map do |x|
+              /[<>&]/.match?(x) ? x : @c.encode(x, :hexadecimal)
+            end.join
           end
         end
       end
@@ -238,12 +254,23 @@ module Metanorma
       end.doc.root.to_html
     end
 
+    def liquid_docrefs
+      @xml.xpath(ns("//docref[@index = 'true']")).each_with_object([]) do |d, m|
+        ident = d.at(ns("./identifier")).children.to_xml
+        ident = @c.decode(@isodoc.docid_prefix(nil, ident))
+        title = d.at(ns("./bibdata/title[@type = 'main']")) ||
+          d.at(ns("./bibdata/title")) || d.at(ns("./title"))
+        m << { "identifier" => ident, "file" => index_link(d, ident),
+               "title" => title&.children&.to_xml,
+               "level" => d.at(ns("./level"))&.text }
+      end
+    end
+
     private
 
     def create_non_existing_directory(output_directory)
-      if !File.exist?(output_directory)
+      !File.exist?(output_directory) and
         FileUtils.mkdir_p(output_directory)
-      end
     end
 
     def format_sort(formats)
@@ -257,9 +284,8 @@ module Metanorma
     # @param options [Hash]
     # @raise [ArgumentError]
     def check_options(options)
-      unless options[:format].is_a?(Array) && (FORMATS & options[:format]).any?
+      (options[:format].is_a?(Array) && (FORMATS & options[:format]).any?) or
         raise ArgumentError, "Need to specify formats (xml,html,pdf,doc)"
-      end
     end
   end
 end

data/lib/metanorma/compile.rb

@@ -55,7 +55,8 @@ module Metanorma
         file.sub!(/^(=[^\n]+\n)/, "\\1:mn-keep-asciimath:\n")
       dir = File.dirname(filename)
       dir != "." and
-        file.gsub!(/^include::/, "include::#{dir}/")
+        file = file.gsub(/^include::/, "include::#{dir}/")
+          .gsub(/^embed::/, "embed::#{dir}/")
       [file, @processor.input_to_isodoc(file, filename, options)]
     end
 

data/lib/metanorma/document.rb

@@ -47,10 +47,27 @@ module Metanorma
 
       private
 
+      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
+        end
+      end
+
       # #param xml [Nokogiri::XML::Document, Nokogiri::XML::Element]
       # @return [RelatonBib::BibliographicItem,RelatonIso::IsoBibliographicItem]
       def from_xml(xml)
-        Relaton::Cli.parse_xml xml.at("//xmlns:bibitem|//xmlns:bibdata")
+        b = xml.at("//xmlns:bibitem|//xmlns:bibdata")
+        r = mn2relaton_parser(xml.root.name)
+        r.from_xml(b.to_xml)
       end
 
       # @param file [String]
@@ -104,7 +121,8 @@ module Metanorma
 
     def render_xml(builder)
       if @raw
-        builder << @bibitem.root.to_xml
+        #builder << @bibitem.root.to_xml
+        builder.parent.add_child(@bibitem.root)
       else
         builder.send("#{type}-standard") do |b|
           b << @bibitem.to_xml(bibdata: true)

data/lib/metanorma/input/asciidoc.rb

@@ -36,18 +36,18 @@ module Metanorma
 
       def extract_metanorma_options(file)
         headerextract = file.sub(/\n\n.*$/m, "\n")
-        /\n:mn-document-class: (?<type>[^\n]+)\n/ =~ headerextract
-        /\n:mn-output-extensions: (?<extensions>[^\n]+)\n/ =~ headerextract
-        /\n:mn-relaton-output-file: (?<relaton>[^\n]+)\n/ =~ headerextract
+        /\n:mn-document-class:\s+(?<type>[^\n]+)\n/ =~ headerextract
+        /\n:mn-output-extensions:\s+(?<extensions>[^\n]+)\n/ =~ headerextract
+        /\n:mn-relaton-output-file:\s+(?<relaton>[^\n]+)\n/ =~ headerextract
         /\n(?<asciimath>:mn-keep-asciimath:[^\n]*)\n/ =~ headerextract
         asciimath = if defined?(asciimath)
                       (!asciimath.nil? && asciimath != ":mn-keep-asciimath: false")
                     end
         asciimath = nil if asciimath == false
         {
-          type: defined?(type) ? type : nil,
-          extensions: defined?(extensions) ? extensions : nil,
-          relaton: defined?(relaton) ? relaton : nil,
+          type: defined?(type) ? type&.strip : nil,
+          extensions: defined?(extensions) ? extensions&.strip : nil,
+          relaton: defined?(relaton) ? relaton&.strip : nil,
           asciimath: asciimath,
         }.compact
       end
@@ -70,11 +70,11 @@ module Metanorma
            pdf-allow-print pdf-allow-print-hq pdf-allow-fill-in-forms
            fonts font-license-agreement pdf-allow-access-content
            pdf-encrypt-metadata iso-word-template document-scheme
-           localize-number iso-word-bg-strip-color modspec-identifier-base
-           ).freeze
+           localize-number iso-word-bg-strip-color modspec-identifier-base).freeze
 
       EMPTY_ADOC_OPTIONS_DEFAULT_TRUE =
-        %w(data-uri-image suppress-asciimath-dup use-xinclude source-highlighter).freeze
+        %w(data-uri-image suppress-asciimath-dup use-xinclude
+           source-highlighter).freeze
 
       EMPTY_ADOC_OPTIONS_DEFAULT_FALSE =
         %w(hierarchical-assets break-up-urls-in-tables toc-figures
@@ -88,8 +88,8 @@ module Metanorma
       def extract_options(file)
         header = file.sub(/\n\n.*$/m, "\n")
         ret = ADOC_OPTIONS.each_with_object({}) do |w, acc|
-          m = /\n:#{w}: ([^\n]+)\n/.match(header) or next
-          acc[attr_name_normalise(w)] = m[1]
+          m = /\n:#{w}:\s+([^\n]+)\n/.match(header) or next
+          acc[attr_name_normalise(w)] = m[1]&.strip
         end
         ret2 = EMPTY_ADOC_OPTIONS_DEFAULT_TRUE.each_with_object({}) do |w, acc|
           m = /\n:#{w}:([^\n]*)\n/.match(header) || [nil, "true"]

data/lib/metanorma/version.rb

@@ -1,3 +1,3 @@
 module Metanorma
-  VERSION = "1.5.5".freeze
+  VERSION = "1.5.7".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma
 version: !ruby/object:Gem::Version
-  version: 1.5.5
+  version: 1.5.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-24 00:00:00.000000000 Z
+date: 2023-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor