metanorma-standoc 2.8.11 → 2.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6a03a5dfead99850405d6b949a0103367ff0c280aa22d55e9c637eb34d1fe2c
-  data.tar.gz: '06098dc9ad34cc0fdbd3df1ccaeedd51ef3b79e89a645e0ccb66979f582f82bf'
+  metadata.gz: '08c688771192b46a0cabe0ec82dc8b88902a49577b4af1fafb8c3efc00192a6d'
+  data.tar.gz: 27b915f4d6ba5ebe4c8a16cf1c02a26f9cf37af524d6d3bdbc145ce360280df7
 SHA512:
-  metadata.gz: a35bd65e87ae978c0e34694b94365d364a528168e8aad39aa2733f6e900a14f219a85a38a275f9c24d00001fd0e19b5931a24578063dd1d45d1016066d744677
-  data.tar.gz: 9e8e5215b27ba6b2e11fe50d0a544084afb32aa7d74fabde539844ff38797bd3217c48b8f980e97cfdd93f446bb4ef44e9cd80e610081996d45941cfc10f2357
+  metadata.gz: e0717e6c250f4ae7b649ce1943abf0665dad4abdf1b9b20021681e64a141967c34d53a3ed4de04b8112a4cc8ea8df79f4afd46ea96aa28622d2b6d0314f349a0
+  data.tar.gz: 41d8468137fd2b538597dd8379b1364f189c0d500cba23b691513754a84eb3423aa8eb46794258cdad7e21c799f518b305f46240817d4858dcb24d8848050a80

data/.rubocop.yml

@@ -7,4 +7,4 @@ inherit_from:
 # ...
 
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 3.4

data/lib/metanorma/standoc/anchor.rb

@@ -34,7 +34,7 @@ module Metanorma
         t = node.target.gsub(/^#/, "").gsub(%r{(\.xml|\.adoc)(#.*$)}, "\\2")
         attrs, text = inline_anchor_xref_match(text)
         attrs.empty? and
-          return { target: t, type: "inline", text: text, style: @xrefstyle }
+          return { target: t, type: "inline", text:, style: @xrefstyle }
         inline_anchor_xref_attrs1(attrs, t, text)
       end
 
@@ -46,13 +46,13 @@ module Metanorma
       end
 
       def inline_anchor_xref_attrs1(attrs, target, text)
-        { target: target, hidden: attrs["hidden"],
+        { target:, hidden: attrs["hidden"],
           type: attrs.key?("fn") ? "footnote" : "inline",
           case: %w(capital lowercase).detect { |x| attrs.key?(x) },
           label: attrs["label"],
           style: attrs["style"] || @xrefstyle,
           droploc: attrs.key?("droploc") ? true : nil,
-          text: text }.compact
+          text: }.compact
       end
 
       XREF_ATTRS = "hidden|style|droploc|capital|lowercase|label".freeze

data/lib/metanorma/standoc/base.rb

@@ -130,7 +130,7 @@ module Metanorma
           %w(presentation semantic).each do |t|
             /^#{t}-metadata-/.match?(k) or next
             k = k.sub(/^#{t}-metadata-/, "")
-            csv_split(v, ",")&.each do |c|
+            quoted_csv_split(v)&.each do |c|
               ret << "<#{t}-metadata><#{k}>#{c}</#{k}></#{t}-metadata>"
             end
           end

data/lib/metanorma/standoc/blocks.rb

@@ -90,7 +90,7 @@ module Metanorma
             )) do |ex|
             wrap_in_para(node, ex)
           end
-        end.join("\n")
+        end.join("")
       end
 
       def example(node)
@@ -128,7 +128,7 @@ module Metanorma
             figure_title(node, ex)
             wrap_in_para(node, ex)
           end
-        end.join("\n")
+        end.join("")
       end
 
       def example_attrs(node)
@@ -141,7 +141,7 @@ module Metanorma
             node.title.nil? or ex.name { |name| name << node.title }
             wrap_in_para(node, ex)
           end
-        end.join("\n")
+        end.join("")
       end
 
       def para_attrs(node)
@@ -158,7 +158,7 @@ module Metanorma
           xml.p **para_attrs(node) do |xml_t|
             xml_t << node.content
           end
-        end.join("\n")
+        end.join("")
       end
 
       def quote_attrs(node)
@@ -183,7 +183,7 @@ module Metanorma
             quote_attribution(node, q)
             wrap_in_para(node, q)
           end
-        end.join("\n")
+        end.join("")
       end
 
       def listing_attrs(node)

data/lib/metanorma/standoc/blocks_image.rb

@@ -26,7 +26,7 @@ module Metanorma
             node.title.nil? or ex.name { |name| name << node.title }
             wrap_in_para(node, ex)
           end
-        end.join("\n")
+        end.join("")
       end
 
       def figure_title(node, out)

data/lib/metanorma/standoc/blocks_notes.rb

@@ -32,7 +32,7 @@ module Metanorma
           xml.review **sidebar_attrs(node) do |r|
             wrap_in_para(node, r)
           end
-        end.join("\n")
+        end.join("")
       end
 
       def todo_attrs(node)
@@ -41,7 +41,7 @@ module Metanorma
         attr_code(id_attr(node)
           .merge(reviewer: node.attr("reviewer") || node.attr("source") ||
                  "(Unknown)",
-                 date: date, type: "todo"))
+                 date:, type: "todo"))
       end
 
       def todo(node)
@@ -49,7 +49,7 @@ module Metanorma
           xml.review **todo_attrs(node) do |r|
             wrap_in_para(node, r)
           end
-        end.join("\n")
+        end.join("")
       end
 
       def termnote(node)
@@ -57,7 +57,7 @@ module Metanorma
           xml.termnote **termnote_attrs(node) do |ex|
             wrap_in_para(node, ex)
           end
-        end.join("\n")
+        end.join("")
       end
 
       def note(node)
@@ -67,7 +67,7 @@ module Metanorma
           xml.note **note_attrs(node) do |c|
             wrap_in_para(node, c)
           end
-        end.join("\n")
+        end.join("")
       end
 
       def boilerplate_note(node)
@@ -101,7 +101,7 @@ module Metanorma
             node.title.nil? or a.name { |name| name << node.title }
             wrap_in_para(node, a)
           end
-        end.join("\n")
+        end.join("")
       end
 
       def admonition_alternatives(node)

data/lib/metanorma/standoc/cleanup.rb

@@ -64,6 +64,7 @@ module Metanorma
         bookmark_cleanup(xmldoc)
         termdef_cleanup(xmldoc) # feeds: relaton_iev_cleanup, term_index_cleanup
         relaton_iev_cleanup(xmldoc)
+        relaton_log_cleanup(xmldoc)
         element_name_cleanup(xmldoc)
         term_index_cleanup(xmldoc)
         bpart_cleanup(xmldoc)
@@ -97,6 +98,20 @@ module Metanorma
         end
       end
 
+      RELATON_SEVERITIES =
+        { "INFO": 3, "WARN": 2, "ERROR": 1, "FATAL": 0,
+          "UNKNOWN": 3 }.freeze
+
+      def relaton_log_cleanup(_xmldoc)
+        @relaton_log or return
+        @relaton_log.rewind
+        @relaton_log.string.split(/(?<=})\n(?={)/).each do |l|
+          e = JSON.parse(l)
+          @log.add("Relaton", e["key"], e["message"],
+                   severity: RELATON_SEVERITIES[e["severity"].to_sym])
+        end
+      end
+
       def docidentifier_cleanup(xmldoc); end
 
       TEXT_ELEMS =

data/lib/metanorma/standoc/cleanup_block.rb

@@ -163,7 +163,7 @@ module Metanorma
           acc << safe_noko(a[0], node.document)
           a.size == 4 or next
           acc << Asciidoctor.convert(
-            a[2], doctype: :inline, backend: (self&.backend&.to_sym || :standoc)
+            a[2], doctype: :inline, backend: self&.backend&.to_sym || :standoc
           )
         end.join
       end

data/lib/metanorma/standoc/cleanup_boilerplate.rb

@@ -2,19 +2,15 @@ module Metanorma
   module Standoc
     module Cleanup
       def external_terms_boilerplate(sources)
-        @i18n.l10n(
-          @i18n.external_terms_boilerplate.gsub(/%(?=\p{P}|\p{Z}|$)/,
-                                                sources || "???"),
-          @lang, @script, @locale
-        )
+        e = @i18n.external_terms_boilerplate
+        @i18n.l10n(e.gsub(/%(?=\p{P}|\p{Z}|$)/, sources || "???"),
+                   @lang, @script, @locale)
       end
 
       def internal_external_terms_boilerplate(sources)
-        @i18n.l10n(
-          @i18n.internal_external_terms_boilerplate.gsub(/%(?=\p{P}|\p{Z}|$)/,
-                                                         sources || "??"),
-          @lang, @script
-        )
+        e = @i18n.internal_external_terms_boilerplate
+        @i18n.l10n(e.gsub(/%(?=\p{P}|\p{Z}|$)/, sources || "??"),
+                   @lang, @script)
       end
 
       def term_defs_boilerplate(div, source, term, _preface, isodoc)
@@ -26,8 +22,7 @@ module Metanorma
         end
         a = if source.empty? && term.nil? then @i18n.no_terms_boilerplate
             else term_defs_boilerplate_cont(source, term, isodoc)
-            end
-        a and div.next = a
+            end and div.next = a
       end
 
       def term_defs_boilerplate_cont(src, term, isodoc)
@@ -42,19 +37,42 @@ module Metanorma
       end
 
       def norm_ref_preface(ref)
-        if ref.at("./note[@type = 'boilerplate']")
-          unwrap_boilerplate_clauses(ref, ".")
-        else
-          refs = ref.elements.select do |e|
-            %w(references bibitem).include? e.name
-          end
-          pref = refs.empty? ? @i18n.norm_empty_pref : @i18n.norm_with_refs_pref
-          ref.at("./title").next = "<p>#{pref}</p>"
+        ins = norm_ref_boilerplate_insert_location(ref)
+        ins2 = norm_ref_process_boilerplate_note(ref)
+        ins2 == :populated and return
+        ins2 == :missing or ins = ins2
+        refs = ref.elements.select do |e|
+          %w(references bibitem).include? e.name
+        end
+        pref = refs.empty? ? @i18n.norm_empty_pref : @i18n.norm_with_refs_pref
+        ins.next = "<p>#{pref}</p>"
+      end
+
+      def norm_ref_process_boilerplate_note(ref)
+        ins2 = ref.at("./note[@type = 'boilerplate']") or return :missing
+        if ins2 && ins2.text.strip.downcase == "(default)"
+          ins2.children = " "
+          ins2.children.first
+        else :populated
+        end
+      end
+
+      def norm_ref_boilerplate_insert_location(ref)
+        while (n = ref.parent) && %w(clause references).include?(n&.name)
+          n.elements.detect do |e|
+            !%(title references).include?(e.name) &&
+              !e.at("./self::clause[@type = 'boilerplate']") &&
+              !e.at("./self::clause[.//references][not(.//clause[not(.//bibitem)])]")
+          end and break
+          ref = n
         end
+        ref.at("./title")
       end
 
-      TERM_CLAUSE = "//sections/terms | " \
-                    "//sections/clause[descendant::terms]".freeze
+      TERM_CLAUSE =
+        "//sections//terms[not(.//ancestor::clause[@type = 'terms'])] | " \
+        "//sections/clause[descendant::terms][@type = 'terms'] | " \
+        "//sections/clause[not(@type = 'terms')]//terms".freeze
 
       NORM_REF =
         "//bibliography/references[@normative = 'true'][not(@hidden)] | " \
@@ -100,18 +118,33 @@ module Metanorma
 
       def termdef_boilerplate_insert_location(xmldoc)
         f = xmldoc.at(self.class::TERM_CLAUSE)
-        root = xmldoc.at("//sections/terms | //sections/clause[.//terms]")
-        !f || !root and return f || root
-        f.at("./following::terms") and return root
-        f.at("./preceding-sibling::clause") and return root
+        root = xmldoc.at("//sections/terms | //sections/clause[@type = 'terms']")
+        if f && root && f["id"] != root["id"]
+          f = termdef_boilerplate_climb_up(f, root)
+        elsif !f && root then f = root
+        end
         f
       end
 
+      def termdef_boilerplate_climb_up(clause, container)
+        container.at(".//*[@id = '#{clause['id']}']") or return clause
+        while (n = clause.parent)
+          n.at(".//definitions") and break
+          clause = n
+          n["id"] == container["id"] and break
+        end
+        clause
+      end
+
       def termdef_boilerplate_insert1(sect, xmldoc, isodoc)
-        sect.at("./clause[@type = 'boilerplate'] | " \
-                "./note[@type = 'boilerplate']") and return
-        term_defs_boilerplate(sect.at("./title"),
-                              xmldoc.xpath(".//termdocsource"),
+        ins = sect.at("./title")
+        if (ins2 = sect.at("./clause[@type = 'boilerplate'] | " \
+                "./note[@type = 'boilerplate']"))
+          ins2.text.strip.downcase == "(default)" or return
+          ins2.children = " "
+          ins = ins2.children.first
+        end
+        term_defs_boilerplate(ins, xmldoc.xpath(".//termdocsource"),
                               sect.at(".//term"), sect.at(".//p"), isodoc)
       end
 
@@ -120,7 +153,10 @@ module Metanorma
         termdef_boilerplate_cleanup(xmldoc)
         termdef_boilerplate_insert(xmldoc, isodoc)
         unwrap_boilerplate_clauses(xmldoc, self.class::TERM_CLAUSE)
-        f = xmldoc.at(self.class::NORM_REF) and norm_ref_preface(f)
+        if f = xmldoc.at(self.class::NORM_REF)
+          norm_ref_preface(f)
+          unwrap_boilerplate_clauses(f, ".")
+        end
         initial_boilerplate(xmldoc, isodoc)
       end
 

data/lib/metanorma/standoc/cleanup_maths.rb

@@ -27,7 +27,7 @@ module Metanorma
       end
 
       # https://medium.com/@rickwang_wxc/in-ruby-given-a-string-detect-if-it-is-valid-numeric-c58275eace60
-      NUMERIC_REGEX = %r{^((\+|-)?\d*\.?\d+)([eE](\+|-){1}\d+)?$}.freeze
+      NUMERIC_REGEX = %r{^((\+|-)?\d*\.?\d+)([eE](\+|-){1}\d+)?$}
 
       MATHML_NS = "http://www.w3.org/1998/Math/MathML".freeze
 
@@ -204,6 +204,28 @@ module Metanorma
         end
       end
 
+      def mathml_mn_format(math)
+        math.xpath(".//m:mn", "m" => MATHML_NS).each do |m|
+          profile = mathml_mn_profile(m)
+          attr = profile.each_with_object([]) do |(k, v), acc|
+            v == "nil" and next
+            acc << "#{k}='#{v}'"
+          end.join(",")
+          attr.empty? or m["data-metanorma-numberformat"] = attr
+        end
+      end
+
+      def mathml_mn_profile(mnum)
+        fmt = @numberfmt_default&.dup || {}
+        fmt1 = {}
+        fmt2 = kv_parse(mnum["data-metanorma-numberformat"] || "")
+        if fmt2["profile"]
+          fmt1 = @numberfmt_prof[fmt2["profile"]] || {}
+          fmt2.delete("profile")
+        end
+        fmt.merge(fmt1).merge(fmt2)
+      end
+
       def mathml_cleanup(xmldoc)
         unitsml = Asciimath2UnitsML::Conv.new(asciimath2unitsml_options)
         xmldoc.xpath("//stem[@type = 'MathML'][not(@validate = 'false')]")
@@ -214,6 +236,7 @@ module Metanorma
           unitsml.MathML2UnitsML(x)
           mathml_mathvariant(x)
           mathml_italicise(x)
+          mathml_mn_format(x)
         end
         mathml_unitsML(xmldoc)
       end

data/lib/metanorma/standoc/cleanup_ref.rb

@@ -1,4 +1,3 @@
-require "set"
 require "relaton_bib"
 require_relative "merge_bibitems"
 require_relative "spans_to_bibitem"

data/lib/metanorma/standoc/cleanup_section.rb

@@ -16,9 +16,7 @@ module Metanorma
       end
 
       def move_clauses_into_preface(xml, preface)
-        xml.xpath("//*[@preface]").each do |c|
-          to_preface(preface, c)
-        end
+        xml.xpath("//*[@preface]").each { |c| to_preface(preface, c) }
       end
 
       def to_preface(preface, clause)
@@ -202,10 +200,9 @@ module Metanorma
       end
 
       # only move clausebefore notes at the very end of preface
-      def endofpreface_clausebefore(xmldoc, ins)
-        xmldoc.xpath("//preface//*[@beforeclauses = 'true']").reverse
-          .each do |x|
-          textafter = xmldoc.xpath("//preface//*") & x.xpath("./following::*")
+      def endofpreface_clausebefore(xml, ins)
+        xml.xpath("//preface//*[@beforeclauses = 'true']").reverse.each do |x|
+          textafter = xml.xpath("//preface//*") & x.xpath("./following::*")
           textafter.text.strip.empty? or break
           x.delete("beforeclauses")
           ins.previous = x.remove
@@ -241,9 +238,8 @@ module Metanorma
       def floating_title_preface2sections(xmldoc)
         t = xmldoc.at("//preface/floating-title") or return
         s = xmldoc.at("//sections")
-        unless t.next_element
+        t.next_element or
           s.children.first.previous = t.remove
-        end
       end
     end
   end

data/lib/metanorma/standoc/cleanup_section_names.rb

@@ -84,15 +84,15 @@ module Metanorma
 
       def section_names_terms1_cleanup(xml)
         auto_name_terms(xml) or return
-        replace_title(xml, "//terms#{SYMnoABBR} | //clause[.//terms]#{SYMnoABBR}",
+        replace_title(xml, "//terms#{SYMnoABBR} | //clause[@type = 'terms']#{SYMnoABBR}",
                       @i18n&.termsdefsymbols, true)
-        replace_title(xml, "//terms#{ABBRnoSYM} | //clause[.//terms]#{ABBRnoSYM}",
+        replace_title(xml, "//terms#{ABBRnoSYM} | //clause[@type = 'terms']#{ABBRnoSYM}",
                       @i18n&.termsdefabbrev, true)
-        replace_title(xml, "//terms#{SYMABBR} | //clause[.//terms]#{SYMABBR}",
+        replace_title(xml, "//terms#{SYMABBR} | //clause[@type = 'terms']#{SYMABBR}",
                       @i18n&.termsdefsymbolsabbrev, true)
-        replace_title(xml, "//terms#{NO_SYMABBR} | //clause[.//terms]#{NO_SYMABBR}",
+        replace_title(xml, "//terms#{NO_SYMABBR} | //clause[@type = 'terms']#{NO_SYMABBR}",
                       @i18n&.termsdefsymbolsabbrev, true)
-        replace_title(xml, "//terms[not(.//definitions)] | //clause[.//terms][not(.//definitions)]",
+        replace_title(xml, "//terms[not(.//definitions)] | //clause[@type = 'terms'][not(.//definitions)]",
                       @i18n&.termsdef, true)
       end
 

data/lib/metanorma/standoc/cleanup_terms.rb

@@ -74,7 +74,10 @@ module Metanorma
       end
 
       def term_children_cleanup(xmldoc)
-        xmldoc.xpath("//terms[terms][not(term)]").each { |t| t.name = "clause" }
+        xmldoc.xpath("//terms[terms][not(term)]").each do |t|
+          t.name = "clause"
+          t["type"] = "terms"
+        end
         xmldoc.xpath("//term").each do |t|
           %w(termnote termexample termsource term).each do |w|
             t.xpath("./#{w}").each { |n| t << n.remove }
@@ -122,8 +125,7 @@ module Metanorma
       end
 
       def term_index_cleanup(xmldoc)
-        return unless @index_terms
-
+        @index_terms or return
         xmldoc.xpath("//preferred").each do |p|
           index_cleanup1(p.at("./expression/name | ./letter-symbol/name"),
                          p.xpath("./field-of-application | ./usage-info")
@@ -135,8 +137,7 @@ module Metanorma
       end
 
       def index_cleanup1(term, fieldofappl)
-        return unless term
-
+        term or return
         idx = term.children.dup
         fieldofappl.empty? or idx << ", &#x3c;#{fieldofappl}&#x3e;"
         term << "<index><primary>#{idx.to_xml}</primary></index>"

data/lib/metanorma/standoc/cleanup_xref.rb

@@ -95,10 +95,9 @@ module Metanorma
         elem.xpath("./localityStack").size < 2 and return
         elem.xpath("./localityStack[not(@connective)]").each do |l|
           n = l.next_element
-          l["connective"] = if n && n.name == "localityStack" &&
-              n["connective"] == "to"
-                              "from"
-                            else "and" end
+          l["connective"] = "and"
+          n && n.name == "localityStack" && n["connective"] == "to" and
+            l["connective"] = "from"
         end
       end
 
@@ -111,8 +110,7 @@ module Metanorma
         elem.name = name
         elem["bibitemid"] = elem["target"]
         if ref = @anchors&.dig(elem["target"], :xref)
-          t = @anchors.dig(elem["target"], :id, elem["style"]) and
-            ref = t
+          t = @anchors.dig(elem["target"], :id, elem["style"]) and ref = t
           elem["citeas"] = @c.decode(ref)
         else xref_to_eref1(elem)
         end
@@ -141,9 +139,7 @@ module Metanorma
           e.name = "erefstack"
           e.delete("bibitemid")
           e.delete("citeas")
-          e.xpath("./eref").each do |e1|
-            e1["type"] = e["type"]
-          end
+          e.xpath("./eref").each { |e1| e1["type"] = e["type"] }
           e.delete("type")
         end
       end
@@ -219,7 +215,7 @@ module Metanorma
         unless a.size < 2 || a[0].empty? || a[1].empty?
           elem["target"] = "#{a[0]}_#{a[1]}"
           a.size > 2 and
-            elem.children = %{anchor="#{a[2..-1].join}",#{elem.children&.text}}
+            elem.children = %{anchor="#{a[2..].join}",#{elem.children&.text}}
           elem["type"] = a[0]
           @internal_eref_namespaces << a[0]
           xref_to_eref(elem, "eref")

data/lib/metanorma/standoc/converter.rb

@@ -67,6 +67,7 @@ module Metanorma
         inline_macro Metanorma::Standoc::ToCInlineMacro
         inline_macro Metanorma::Standoc::PassInlineMacro
         inline_macro Metanorma::Standoc::StdLinkInlineMacro
+        inline_macro Metanorma::Standoc::NumberInlineMacro
         block Metanorma::Standoc::ToDoAdmonitionBlock
         block Metanorma::Standoc::EditorAdmonitionBlock
         treeprocessor Metanorma::Standoc::EditorInlineAdmonitionBlock

data/lib/metanorma/standoc/init.rb

@@ -1,3 +1,5 @@
+require_relative "utils"
+
 module Metanorma
   module Standoc
     module Base
@@ -10,6 +12,7 @@ module Metanorma
         init_output(node) # feeds init_biblio
         init_i18n(node)
         init_biblio(node)
+        init_math(node)
         @metadata_attrs = metadata_attrs(node)
       end
 
@@ -42,12 +45,11 @@ module Metanorma
       def init_processing(node)
         @novalid = node.attr("novalid")
         @smartquotes = node.attr("smartquotes") != "false"
-        @keepasciimath = node.attr("mn-keep-asciimath") &&
-          node.attr("mn-keep-asciimath") != "false"
         @sourcecode_markup_start = node.attr("sourcecode-markup-start") || "{{{"
         @sourcecode_markup_end = node.attr("sourcecode-markup-end") || "}}}"
         @datauriimage = node.attr("data-uri-image") != "false"
         @datauriattachment = node.attr("data-uri-attachment") != "false"
+        @dataurimaxsize = node.attr("data-uri-maxsize")&.to_i || 13981013
         @blockunnumbered = (node.attr("block-unnumbered") || "").split(",")
           .map(&:strip)
       end
@@ -101,6 +103,7 @@ module Metanorma
       def init_biblio(node)
         @no_isobib_cache = node.attr("no-isobib-cache")
         @no_isobib = node.attr("no-isobib")
+        init_bib_log
         @bibdb = nil
         init_bib_caches(node)
         init_iev_caches(node)
@@ -108,6 +111,24 @@ module Metanorma
           ::Metanorma::Standoc::LocalBiblio.new(node, @localdir, self)
       end
 
+      def init_bib_log
+        @relaton_log = StringIO.new
+        relaton_logger = Relaton::Logger::Log
+          .new(@relaton_log, levels: %i(info warn error fatal unknown),
+                             formatter: Relaton::Logger::FormatterJSON)
+        Relaton.logger_pool[:my_logger] = relaton_logger
+      end
+
+      def init_math(node)
+        @keepasciimath = node.attr("mn-keep-asciimath") &&
+          node.attr("mn-keep-asciimath") != "false"
+        @numberfmt_default = kv_parse(node.attr("number-presentation"))
+        @numberfmt_prof =  node.attributes.each_with_object({}) do |(k, v), m|
+          p = /^number-presentation-profile-(.*)$/.match(k) or next
+          m[p[1]] = kv_parse(v)
+        end
+      end
+
       def requirements_processor
         Metanorma::Requirements
       end

data/lib/metanorma/standoc/inline.rb

@@ -43,21 +43,21 @@ module Metanorma
         if /<([^:>&]+:)?math(\s+[^>&]+)?> |
           <([^:>&]+:)?math(\s+[^>&]+)?>/x.match? text
           math = xml_encode(text)
-          xml.stem type: "MathML", block: block do |s|
+          xml.stem(type: "MathML", block:) do |s|
             s << math
           end
         elsif style == :latexmath then latex_parse(text, xml, block)
         else
-          xml.stem text&.gsub("&amp;#", "&#"), type: "AsciiMath", block: block
+          xml.stem text&.gsub("&amp;#", "&#"), type: "AsciiMath", block:
         end
       end
 
       def latex_parse(text, xml, block)
         latex = latex_parse1(text, block) or
-          return xml.stem type: "MathML", block: block
-        xml.stem type: "MathML", block: block do |s|
+          return xml.stem(type: "MathML", block:)
+        xml.stem(type: "MathML", block:) do |s|
           math = Nokogiri::XML.fragment(latex.sub(/<\?[^>]+>/, ""))
-            .elements[0]
+              .elements[0]
           math.delete("alttext")
           s.parent.children = math
           s << "<latexmath>#{text}</latexmath>"

data/lib/metanorma/standoc/isodoc.rng

@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.3.2 -->
+<!-- VERSION v1.3.3 -->
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <include href="reqt.rng"/>
   <include href="basicdoc.rng">
@@ -331,9 +331,9 @@
       <zeroOrMore>
         <ref name="table-note"/>
       </zeroOrMore>
-      <optional>
+      <zeroOrMore>
         <ref name="source"/>
-      </optional>
+      </zeroOrMore>
     </define>
     <define name="FigureAttr">
       <optional>
@@ -380,9 +380,9 @@
       <zeroOrMore>
         <ref name="note"/>
       </zeroOrMore>
-      <optional>
+      <zeroOrMore>
         <ref name="source"/>
-      </optional>
+      </zeroOrMore>
     </define>
     <define name="source">
       <element name="source">