metanorma-standoc 2.9.4 → 2.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49c6dfeea46b38b2e162f13b0e5b8f1e57f446c433e2e30313fff2e4c5b4e96e
-  data.tar.gz: 188590c9c73a87e1ba73322a540986836b256541764ef4e45ba1a1a134eda1df
+  metadata.gz: 992869ede2c5466f357da227133b1604fba74a6d777759684d0cdcda349d3d10
+  data.tar.gz: 0c7df6eb69b3999ce5386967cb0f0bd49a2b12167c01125e0620617ee3686817
 SHA512:
-  metadata.gz: cc6aed2b8ca43330882c41c8a00e2bc679ff5de30e9c1f914eca253ecc7900368b4c1968a2dbeceeae9db025798a15fe73a68892d83c4c0dcc6080477e66327a
-  data.tar.gz: 0bf3a151f8dd22a2c28ee6ed158df5f8d8c6f2afe0d27cad2d8ec3234746d1994354ab52dbd1735b8c54ab99e44c3d3b7b10249a464205fc29c453d996e377c9
+  metadata.gz: 38291074e2bb9a535880b105609d8eb403b871f16fb180f4f4075e138b05c88e95e7034520869dfe124b620ee266f1ca693c98c7de99768647d8ee780be7fbc3
+  data.tar.gz: ddfbe22600ed612456d461cad1dc48ae5b04b8222a515893e7ab08a47c9f1d8782e9baed1d61e20204de145e8626a85471c2e1c33319f056f42eda81e7e609ed

data/lib/metanorma/standoc/base.rb

@@ -47,15 +47,15 @@ module Metanorma
 
       def insert_xml_cr(doc)
         doc.gsub(%r{(</(clause|table|figure|p|bibitem|ul|ol|dl|dt|dd|li|example|
-                       sourcecode|formula|quote|references|annex|appendix|title|
-                       name|note|thead|tbody|tfoot|th|td|form|requirement|
-                       recommendation|permission|imagemap|svgmap|preferred|
-                       admitted|related|deprecates|letter-symbol|domain|
-                       graphical-symbol|expression|abbreviation-type|subject|
-                       pronunciation|grammar|term|terms|termnote|termexample|
-                       termsource|origin|termref|modification)>)}x, "\\1\n")
+            sourcecode|formula|quote|references|annex|appendix|title|name|note|
+            thead|tbody|tfoot|th|td|form|requirement|recommendation|permission|
+            imagemap|svgmap|preferred|admitted|related|domain|deprecates|
+            letter-symbol|graphical-symbol|expression|subject|abbreviation-type|
+            pronunciation|grammar|term|terms|termnote|termexample|termsource|
+            origin|termref|modification)>)}x, "\\1\n")
           .gsub(%r{(<(title|name))}, "\n\\1")
-          .gsub(%r{(<sourcecode[^>]*>)\s+(<name[^>]*>[^<]+</name>)\s+}, "\\1\\2")
+          .gsub(%r{(<sourcecode[^<>]*>)\s+(<name[^<>]*>[^<]+</name>)\s+},
+                "\\1\\2")
       end
 
       def version

data/lib/metanorma/standoc/basicdoc.rng

@@ -1000,14 +1000,14 @@
   <define name="PureTextElement">
     <choice>
       <text/>
-      <ref name="em"/>
-      <ref name="strong"/>
+      <ref name="pure_em"/>
+      <ref name="pure_strong"/>
       <ref name="sub"/>
       <ref name="sup"/>
-      <ref name="tt"/>
-      <ref name="underline"/>
-      <ref name="strike"/>
-      <ref name="smallcap"/>
+      <ref name="pure_tt"/>
+      <ref name="pure_underline"/>
+      <ref name="pure_strike"/>
+      <ref name="pure_smallcap"/>
       <ref name="br"/>
     </choice>
   </define>
@@ -1031,6 +1031,13 @@
       </zeroOrMore>
     </element>
   </define>
+  <define name="pure_em">
+    <element name="em">
+      <zeroOrMore>
+        <ref name="PureTextElement"/>
+      </zeroOrMore>
+    </element>
+  </define>
   <define name="strong">
     <element name="strong">
       <zeroOrMore>
@@ -1046,6 +1053,13 @@
       </zeroOrMore>
     </element>
   </define>
+  <define name="pure_strong">
+    <element name="strong">
+      <zeroOrMore>
+        <ref name="PureTextElement"/>
+      </zeroOrMore>
+    </element>
+  </define>
   <define name="tt">
     <element name="tt">
       <zeroOrMore>
@@ -1060,6 +1074,13 @@
       </zeroOrMore>
     </element>
   </define>
+  <define name="pure_tt">
+    <element name="tt">
+      <zeroOrMore>
+        <ref name="PureTextElement"/>
+      </zeroOrMore>
+    </element>
+  </define>
   <define name="keyword">
     <element name="keyword">
       <zeroOrMore>
@@ -1090,13 +1111,42 @@
       <zeroOrMore>
         <choice>
           <ref name="PureTextElement"/>
+          <ref name="stem"/>
+          <ref name="eref"/>
+          <ref name="xref"/>
+          <ref name="hyperlink"/>
           <ref name="index"/>
           <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
   </define>
+  <define name="pure_strike">
+    <element name="strike">
+      <zeroOrMore>
+        <ref name="PureTextElement"/>
+      </zeroOrMore>
+    </element>
+  </define>
   <define name="underline">
+    <element name="underline">
+      <optional>
+        <attribute name="style"/>
+      </optional>
+      <zeroOrMore>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="stem"/>
+          <ref name="eref"/>
+          <ref name="xref"/>
+          <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
+        </choice>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="pure_underline">
     <element name="underline">
       <optional>
         <attribute name="style"/>
@@ -1107,6 +1157,21 @@
     </element>
   </define>
   <define name="smallcap">
+    <element name="smallcap">
+      <zeroOrMore>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="stem"/>
+          <ref name="eref"/>
+          <ref name="xref"/>
+          <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
+        </choice>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="pure_smallcap">
     <element name="smallcap">
       <zeroOrMore>
         <ref name="PureTextElement"/>

data/lib/metanorma/standoc/biblio.rng

@@ -1204,7 +1204,9 @@
       <optional>
         <ref name="formattedref"/>
       </optional>
-      <ref name="btitle"/>
+      <oneOrMore>
+        <ref name="btitle"/>
+      </oneOrMore>
       <optional>
         <ref name="bplace"/>
       </optional>

data/lib/metanorma/standoc/blocks.rb

@@ -77,7 +77,7 @@ module Metanorma
       def stem(node)
         noko do |xml|
           xml.formula **formula_attrs(node) do |s|
-            stem_parse(node.lines.join("\n"), s, node.style.to_sym, node.block?)
+            stem_parse(node.lines.join("\n"), s, node.style.to_sym, node)
           end
         end
       end

data/lib/metanorma/standoc/cleanup.rb

@@ -54,6 +54,7 @@ module Metanorma
         normref_cleanup(xmldoc)
         biblio_cleanup(xmldoc)
         reference_names(xmldoc)
+        terms_terms_cleanup(xmldoc) # feeds: boilerplate_cleanup
         asciimath_cleanup(xmldoc) # feeds: mathml_cleanup, termdef_cleanup,
         # symbols_cleanup
         symbols_cleanup(xmldoc) # feeds: termdef_cleanup
@@ -77,9 +78,10 @@ module Metanorma
         docidentifier_cleanup(xmldoc) # feeds: bibdata_cleanup
         ext_contributor_cleanup(xmldoc) # feeds: bibdata_cleanup
         ext_dochistory_cleanup(xmldoc) # feeds: bibdata_cleanup
-        bibdata_cleanup(xmldoc)
+        bibdata_cleanup(xmldoc) # feeds: boilerplate_cleanup
+        boilerplate_cleanup(xmldoc) # feeds: xref_cleanup for new <<>> introduced
+        xref_cleanup(xmldoc)
         svgmap_cleanup(xmldoc) # feeds: img_cleanup
-        boilerplate_cleanup(xmldoc)
         toc_cleanup(xmldoc)
         smartquotes_cleanup(xmldoc)
         linebreak_cleanup(xmldoc)

data/lib/metanorma/standoc/cleanup_bibitem.rb

@@ -131,6 +131,9 @@ module Metanorma
         xmldoc.xpath("//bibitem//bibitem").each do |b|
           b.delete("id")
         end
+        xmldoc.xpath("//bibdata//bibitem").each do |b|
+          b.delete("id")
+        end
       end
 
       def attachment_cleanup(xmldoc)
@@ -139,34 +142,46 @@ module Metanorma
           u = b.at("./uri[@type = 'attachment']")
           c = b.at("./uri[@type = 'citation']") ||
             u.after("<uri type='citation'/>")
-          uri = save_attachment(u.text, b)
+          uri = attachment_uri(u.text, b)
           u.children = uri
           c.children = uri
         end
       end
 
-      def save_attachment(path, bib)
+      def attachment_uri(path, bib)
         init_attachments
         path = File.join(@localdir, path)
         valid_attachment?(path, bib) or return ""
+        @datauriattachment or return attachment_location(path)
+        save_attachment(path, bib)
+      end
+
+      def save_attachment(path, bib)
+        init_attachments
         f = File.basename(path)
         File.exist?(File.join(@attachmentsdir, f)) and
           f += "_#{UUIDTools::UUID.random_create}"
         out_fld = File.join(@attachmentsdir, f)
         FileUtils.cp(path, out_fld)
         datauri_attachment(out_fld, bib.document)
-        File.join(@attachmentsfld, f)
+      end
+
+      def attachment_location(path)
+        f = path
+        @datauriattachment and
+          f = File.join(@attachmentsdir, File.basename(path))
+        Pathname.new(File.expand_path(f))
+          .relative_path_from(Pathname.new(File.expand_path(@localdir))).to_s
       end
 
       def datauri_attachment(path, doc)
         @datauriattachment or return
         m = add_misc_container(doc)
-        f = File.join(@attachmentsdir, File.basename(path))
-        f = Pathname.new(File.expand_path(f))
-          .relative_path_from(Pathname.new(File.expand_path(@localdir)))
+        f = attachment_location(path)
         e = (m << "<attachment name='#{f}'/>").last_element_child
         Vectory::Utils::datauri(path, @localdir).scan(/.{1,60}/)
           .each { |dd| e << "#{dd}\n" }
+        f
       end
 
       def valid_attachment?(path, bib)

data/lib/metanorma/standoc/cleanup_boilerplate.rb

@@ -1,41 +1,8 @@
+require_relative "cleanup_terms_boilerplate"
+
 module Metanorma
   module Standoc
     module Cleanup
-      def external_terms_boilerplate(sources)
-        e = @i18n.external_terms_boilerplate
-        @i18n.l10n(e.gsub(/%(?=\p{P}|\p{Z}|$)/, sources || "???"),
-                   @lang, @script, @locale)
-      end
-
-      def internal_external_terms_boilerplate(sources)
-        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)
-        a = @i18n.term_def_boilerplate and div.next = a
-        source.each do |s|
-          @anchors[s["bibitemid"]] or
-            @log.add("Crossreferences", nil,
-                     "term source #{s['bibitemid']} not referenced", severity: 1)
-        end
-        a = if source.empty? && term.nil? then @i18n.no_terms_boilerplate
-            else term_defs_boilerplate_cont(source, term, isodoc)
-            end and div.next = a
-      end
-
-      def term_defs_boilerplate_cont(src, term, isodoc)
-        sources = isodoc.sentence_join(src.map do |s|
-          %{<eref bibitemid="#{s['bibitemid']}"/>}
-        end)
-        if src.empty? then @i18n.internal_terms_boilerplate
-        elsif term.nil? then external_terms_boilerplate(sources)
-        else
-          internal_external_terms_boilerplate(sources)
-        end
-      end
-
       def norm_ref_preface(ref)
         ins = norm_ref_boilerplate_insert_location(ref)
         ins2 = norm_ref_process_boilerplate_note(ref)
@@ -45,7 +12,7 @@ module Metanorma
           %w(references bibitem).include? e.name
         end
         pref = refs.empty? ? @i18n.norm_empty_pref : @i18n.norm_with_refs_pref
-        ins.next = "<p>#{pref}</p>"
+        ins.next = boilerplate_snippet_convert(pref)
       end
 
       def norm_ref_process_boilerplate_note(ref)
@@ -69,16 +36,15 @@ module Metanorma
         ref.at("./title")
       end
 
-      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)] | " \
         "//bibliography/clause[.//references[@normative = 'true']]".freeze
 
       def boilerplate_isodoc(xmldoc)
+        # prevent infinite recursion of asciidoc boilerplate processing
+        # in termdef_boilerplate_insert and initial_boilerplate
+        xmldoc.at("//metanorma-extension/semantic-metadata/" \
+                  "headless[text() = 'true']") and return nil
         x = xmldoc.dup
         x.root.add_namespace(nil, self.class::XML_NAMESPACE)
         xml = Nokogiri::XML(x.to_xml)
@@ -87,14 +53,6 @@ module Metanorma
         @isodoc
       end
 
-      def termdef_boilerplate_cleanup(xmldoc)
-        # termdef_remove_initial_paras(xmldoc)
-      end
-
-      def termdef_remove_initial_paras(xmldoc)
-        xmldoc.xpath("//terms/p | //terms/ul").each(&:remove)
-      end
-
       def unwrap_boilerplate_clauses(xmldoc, xpath)
         xmldoc.xpath(xpath).each do |f|
           f.xpath(".//clause[@type = 'boilerplate'] | " \
@@ -105,51 +63,8 @@ module Metanorma
         end
       end
 
-      def termdef_boilerplate_insert(xmldoc, isodoc, once = false)
-        if once
-          f = termdef_boilerplate_insert_location(xmldoc) and
-            termdef_boilerplate_insert1(f, xmldoc, isodoc)
-        else
-          xmldoc.xpath(self.class::TERM_CLAUSE).each do |f|
-            termdef_boilerplate_insert1(f, xmldoc, isodoc)
-          end
-        end
-      end
-
-      def termdef_boilerplate_insert_location(xmldoc)
-        f = xmldoc.at(self.class::TERM_CLAUSE)
-        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)
-        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
-
       def boilerplate_cleanup(xmldoc)
-        isodoc = boilerplate_isodoc(xmldoc)
+        isodoc = boilerplate_isodoc(xmldoc) or return
         termdef_boilerplate_cleanup(xmldoc)
         termdef_boilerplate_insert(xmldoc, isodoc)
         unwrap_boilerplate_clauses(xmldoc, self.class::TERM_CLAUSE)
@@ -245,6 +160,7 @@ module Metanorma
           /^_\d+$/.match?(n["id"]) and
             n["id"] = "_#{UUIDTools::UUID.random_create}"
         end
+        xml
       end
 
       def boilerplate_top_elements(xml)

data/lib/metanorma/standoc/cleanup_inline.rb

@@ -99,7 +99,7 @@ module Metanorma
       def key_extract_locality(elem)
         elem["key"].include?(",") or return
         elem.add_child("<locality>#{elem['key'].sub(/^[^,]+,/, '')}</locality>")
-        elem["key"] = elem["key"].sub(/,.*$/, "")
+        elem["key"] = elem["key"].sub(/(^[^,]+),.*$/, "\\1")
       end
 
       def concept_termbase_cleanup(elem)

data/lib/metanorma/standoc/cleanup_maths.rb

@@ -1,4 +1,5 @@
 require "asciimath2unitsml"
+require_relative "cleanup_mathvariant"
 
 module Metanorma
   module Standoc
@@ -58,15 +59,19 @@ module Metanorma
         xml
       end
 
-      def progress_conv(idx, step, total, threshold, msg)
-        return unless (idx % step).zero? && total > threshold && idx.positive?
+      def mathml_xml_cleanup(stem)
+        xml_unescape_mathml(stem)
+        mathml_namespace(stem)
+        mathml_preserve_space(stem)
+      end
 
+      def progress_conv(idx, step, total, threshold, msg)
+        (idx % step).zero? && total > threshold && idx.positive? or return
         warn "#{msg} #{idx} of #{total}"
       end
 
       def xml_unescape_mathml(xml)
-        return if xml.children.any?(&:element?)
-
+        xml.children.any?(&:element?) and return
         math = xml.text.gsub("&lt;", "<").gsub("&gt;", ">")
           .gsub("&quot;", '"').gsub("&apos;", "'").gsub("&amp;", "&")
           .gsub(/<[^: \r\n\t\/]+:/, "<").gsub(/<\/[^ \r\n\t:]+:/, "</")
@@ -86,33 +91,6 @@ module Metanorma
         end
       end
 
-      def mathml_mi_italics
-        { uppergreek: true, upperroman: true,
-          lowergreek: true, lowerroman: true }
-      end
-
-      # presuppose multichar mi upright, singlechar mi MathML default italic
-      def mathml_italicise(xml)
-        xml.xpath(".//m:mi[not(ancestor::*[@mathvariant])]",
-                  "m" => MATHML_NS).each do |i|
-          char = @c.decode(i.text)
-          i["mathvariant"] = "normal" if mi_italicise?(char)
-        end
-      end
-
-      def mi_italicise?(char)
-        char.length > 1 and return false
-        case char
-        when /\p{Greek}/
-          (/\p{Lower}/.match(char) && !mathml_mi_italics[:lowergreek]) ||
-            (/\p{Upper}/.match(char) && !mathml_mi_italics[:uppergreek])
-        when /\p{Latin}/
-          (/\p{Lower}/.match(char) && !mathml_mi_italics[:lowerroman]) ||
-            (/\p{Upper}/.match(char) && !mathml_mi_italics[:upperroman])
-        else false
-        end
-      end
-
       UNITSML_NS = "https://schema.unitsml.org/unitsml/1.0".freeze
 
       def add_misc_container(xmldoc)
@@ -125,8 +103,7 @@ module Metanorma
       end
 
       def mathml_unitsML(xmldoc)
-        return unless xmldoc.at(".//m:*", "m" => UNITSML_NS)
-
+        xmldoc.at(".//m:*", "m" => UNITSML_NS) or return
         misc = add_misc_container(xmldoc)
         unitsml = misc.add_child("<UnitsML xmlns='#{UNITSML_NS}'/>").first
         %w(Unit CountedItem Quantity Dimension Prefix).each do |t|
@@ -139,8 +116,7 @@ module Metanorma
           .each_with_object({}) do |x, m|
           m[x["xml:id"]] = x.remove
         end
-        return if tags.empty?
-
+        tags.empty? and return
         set = unitsml.add_child("<#{tag}Set/>").first
         tags.each_value { |v| set << v }
       end
@@ -149,62 +125,8 @@ module Metanorma
         { multiplier: :space }
       end
 
-      MATHVARIANT_OVERRIDE = {
-        bold: { normal: "bold", italic: "bold-italic", fraktur: "bold-fraktur",
-                script: "bold-script", "sans-serif": "bold-sans-serif",
-                "sans-serif-italic": "sans-serif-bold-italic" },
-        italic: { normal: "italic", bod: "bold-italic",
-                  "sans-serif": "sans-serif-italic",
-                  "bold-sans-serif": "sans-serif-bold-italic" },
-        "bold-italic": { normal: "bold-italic", bold: "bold-italic",
-                         italic: "bold-italic",
-                         "sans-serif": "sans-serif-bold-italic",
-                         "bold-sans-serif": "sans-serif-bold-italic",
-                         "sans-serif-italic": "sans-serif-bold-italic" },
-        fraktur: { normal: "fraktur", bold: "bold-fraktur" },
-        "bold-fraktur": { normal: "bold-fraktur", fraktur: "bold-fraktur" },
-        script: { normal: "script", bold: "bold-script" },
-        "bold-script": { normal: "script", script: "bold-script" },
-        "sans-serif": { normal: "sans-serif", bold: "bold-sans-serif",
-                        italic: "sans-serif-italic",
-                        "bold-italic": "sans-serif-bold-italic" },
-        "bold-sans-serif": { normal: "bold-sans-serif", bold: "bold-sans-serif",
-                             "sans-serif": "bold-sans-serif",
-                             italic: "sans-serif-bold-italic",
-                             "bold-italic": "sans-serif-bold-italic",
-                             "sans-serif-italic": "sans-serif-bold-italic" },
-        "sans-serif-italic": { normal: "sans-serif-italic",
-                               italic: "sans-serif-italic",
-                               "sans-serif": "sans-serif-italic",
-                               bold: "sans-serif-bold-italic",
-                               "bold-italic": "sans-serif-bold-italic",
-                               "sans-serif-bold": "sans-serif-bold-italic" },
-        "sans-serif-bold-italic": { normal: "sans-serif-bold-italic",
-                                    italic: "sans-serif-bold-italic",
-                                    "sans-serif": "sans-serif-bold-italic",
-                                    "sans-serif-italic": "sans-serif-bold-italic",
-                                    bold: "sans-serif-bold-italic",
-                                    "bold-italic": "sans-serif-bold-italic",
-                                    "sans-serif-bold": "sans-serif-bold-italic" },
-      }.freeze
-
-      def mathvariant_override(inner, outer)
-        o = outer.to_sym
-        i = inner.to_sym
-        MATHVARIANT_OVERRIDE[o] or return inner
-        MATHVARIANT_OVERRIDE[o][i] || inner
-      end
-
-      def mathml_mathvariant(math)
-        math.xpath(".//*[@mathvariant]").each do |outer|
-          outer.xpath(".//*[@mathvariant]").each do |inner|
-            inner["mathvariant"] =
-              mathvariant_override(inner["mathvariant"], outer["mathvariant"])
-          end
-        end
-      end
-
       def mathml_mn_format(math)
+        math["number-format"] or return
         math.xpath(".//m:mn", "m" => MATHML_NS).each do |m|
           profile = mathml_mn_profile(m)
           attr = profile.each_with_object([]) do |(k, v), acc|
@@ -226,17 +148,44 @@ module Metanorma
         fmt.merge(fmt1).merge(fmt2)
       end
 
+      def mathml_stem_format(stem)
+        f = mathml_stem_format_attr(stem) or return
+        attr = quoted_csv_split(f, ",").map do |x|
+          m = /^(.+?)=(.+)?$/.match(x) or next
+          "#{m[1]}='#{m[2]}'"
+        end.join(",")
+        stem.xpath(".//m:mn", "m" => MATHML_NS).each do |m|
+          m["data-metanorma-numberformat"] = attr
+        end
+      end
+
+      def mathml_stem_format_attr(stem)
+        f = stem["number-format"] || @numberfmt_formula or return
+        if f == "nil"
+          stem.delete("number-format")
+          return
+        end
+        f == "default" or return f
+        if @numberfmt_default.empty?
+          "notation='basic'"
+        else @numberfmt_default&.map { |k, v| "#{k}=#{v}" }&.join(",")
+        end
+      end
+
+      def mathml_number_format(stem)
+        mathml_stem_format(stem)
+        mathml_mn_format(stem)
+        stem.delete("number-format")
+      end
+
       def mathml_cleanup(xmldoc)
         unitsml = Asciimath2UnitsML::Conv.new(asciimath2unitsml_options)
         xmldoc.xpath("//stem[@type = 'MathML'][not(@validate = 'false')]")
           .each do |x|
-          xml_unescape_mathml(x)
-          mathml_namespace(x)
-          mathml_preserve_space(x)
+          mathml_xml_cleanup(x)
           unitsml.MathML2UnitsML(x)
           mathml_mathvariant(x)
-          mathml_italicise(x)
-          mathml_mn_format(x)
+          mathml_number_format(x)
         end
         mathml_unitsML(xmldoc)
       end

data/lib/metanorma/standoc/cleanup_mathvariant.rb

@@ -0,0 +1,88 @@
+module Metanorma
+  module Standoc
+    module Cleanup
+      def mathml_mi_italics
+        { uppergreek: true, upperroman: true,
+          lowergreek: true, lowerroman: true }
+      end
+
+      # presuppose multichar mi upright, singlechar mi MathML default italic
+      def mathml_italicise(xml)
+        xml.xpath(".//m:mi[not(ancestor::*[@mathvariant])]",
+                  "m" => MATHML_NS).each do |i|
+          char = @c.decode(i.text)
+          i["mathvariant"] = "normal" if mi_italicise?(char)
+        end
+      end
+
+      def mi_italicise?(char)
+        char.length > 1 and return false
+        case char
+        when /\p{Greek}/
+          (/\p{Lower}/.match(char) && !mathml_mi_italics[:lowergreek]) ||
+            (/\p{Upper}/.match(char) && !mathml_mi_italics[:uppergreek])
+        when /\p{Latin}/
+          (/\p{Lower}/.match(char) && !mathml_mi_italics[:lowerroman]) ||
+            (/\p{Upper}/.match(char) && !mathml_mi_italics[:upperroman])
+        else false
+        end
+      end
+
+      MATHVARIANT_OVERRIDE = {
+        bold: { normal: "bold", italic: "bold-italic", fraktur: "bold-fraktur",
+                script: "bold-script", "sans-serif": "bold-sans-serif",
+                "sans-serif-italic": "sans-serif-bold-italic" },
+        italic: { normal: "italic", bod: "bold-italic",
+                  "sans-serif": "sans-serif-italic",
+                  "bold-sans-serif": "sans-serif-bold-italic" },
+        "bold-italic": { normal: "bold-italic", bold: "bold-italic",
+                         italic: "bold-italic",
+                         "sans-serif": "sans-serif-bold-italic",
+                         "bold-sans-serif": "sans-serif-bold-italic",
+                         "sans-serif-italic": "sans-serif-bold-italic" },
+        fraktur: { normal: "fraktur", bold: "bold-fraktur" },
+        "bold-fraktur": { normal: "bold-fraktur", fraktur: "bold-fraktur" },
+        script: { normal: "script", bold: "bold-script" },
+        "bold-script": { normal: "script", script: "bold-script" },
+        "sans-serif": { normal: "sans-serif", bold: "bold-sans-serif",
+                        italic: "sans-serif-italic",
+                        "bold-italic": "sans-serif-bold-italic" },
+        "bold-sans-serif": { normal: "bold-sans-serif", bold: "bold-sans-serif",
+                             "sans-serif": "bold-sans-serif",
+                             italic: "sans-serif-bold-italic",
+                             "bold-italic": "sans-serif-bold-italic",
+                             "sans-serif-italic": "sans-serif-bold-italic" },
+        "sans-serif-italic": { normal: "sans-serif-italic",
+                               italic: "sans-serif-italic",
+                               "sans-serif": "sans-serif-italic",
+                               bold: "sans-serif-bold-italic",
+                               "bold-italic": "sans-serif-bold-italic",
+                               "sans-serif-bold": "sans-serif-bold-italic" },
+        "sans-serif-bold-italic": { normal: "sans-serif-bold-italic",
+                                    italic: "sans-serif-bold-italic",
+                                    "sans-serif": "sans-serif-bold-italic",
+                                    "sans-serif-italic": "sans-serif-bold-italic",
+                                    bold: "sans-serif-bold-italic",
+                                    "bold-italic": "sans-serif-bold-italic",
+                                    "sans-serif-bold": "sans-serif-bold-italic" },
+      }.freeze
+
+      def mathvariant_override(inner, outer)
+        o = outer.to_sym
+        i = inner.to_sym
+        MATHVARIANT_OVERRIDE[o] or return inner
+        MATHVARIANT_OVERRIDE[o][i] || inner
+      end
+
+      def mathml_mathvariant(math)
+        math.xpath(".//*[@mathvariant]").each do |outer|
+          outer.xpath(".//*[@mathvariant]").each do |inner|
+            inner["mathvariant"] =
+              mathvariant_override(inner["mathvariant"], outer["mathvariant"])
+          end
+        end
+        mathml_italicise(math)
+      end
+    end
+  end
+end

data/lib/metanorma/standoc/cleanup_terms.rb

@@ -73,11 +73,14 @@ module Metanorma
         xmldoc.xpath("//termdocsource").each { |s| f.previous = s.remove }
       end
 
-      def term_children_cleanup(xmldoc)
+      def terms_terms_cleanup(xmldoc)
         xmldoc.xpath("//terms[terms][not(term)]").each do |t|
           t.name = "clause"
           t["type"] = "terms"
         end
+      end
+
+      def term_children_cleanup(xmldoc)
         xmldoc.xpath("//term").each do |t|
           %w(termnote termexample termsource term).each do |w|
             t.xpath("./#{w}").each { |n| t << n.remove }

data/lib/metanorma/standoc/cleanup_terms_boilerplate.rb

@@ -0,0 +1,106 @@
+module Metanorma
+  module Standoc
+    module Cleanup
+      def external_terms_boilerplate(sources)
+        e = @i18n.external_terms_boilerplate
+        e.gsub(/%(?=\p{P}|\p{Z}|$)/, sources || "???")
+      end
+
+      def internal_external_terms_boilerplate(sources)
+        e = @i18n.internal_external_terms_boilerplate
+        e.gsub(/%(?=\p{P}|\p{Z}|$)/, sources || "??")
+      end
+
+      def boilerplate_snippet_convert(adoc)
+        ret = boilerplate_xml_cleanup(adoc2xml(adoc, backend.to_sym))
+        @i18n.l10n(ret.children.to_xml, @lang, @script)
+      end
+
+      def term_defs_boilerplate(div, source, term, _preface, isodoc)
+        verify_term_defs_source(source)
+        a = @i18n.term_def_boilerplate and
+          div.next = boilerplate_snippet_convert(a)
+        a = if source.empty? && term.nil? then @i18n.no_terms_boilerplate
+            else term_defs_boilerplate_cont(source, term, isodoc)
+            end
+        a and div.next = boilerplate_snippet_convert(a)
+      end
+
+      def verify_term_defs_source(source)
+        source.each do |s|
+          @anchors[s["bibitemid"]] or
+            @log.add("Crossreferences", nil,
+                     "term source #{s['bibitemid']} not referenced",
+                     severity: 1)
+        end
+      end
+
+      def term_defs_boilerplate_cont(src, term, isodoc)
+        sources = isodoc.sentence_join(src.map do |s|
+          %{<<#{s['bibitemid']}>>}
+        end)
+        if src.empty? then @i18n.internal_terms_boilerplate
+        elsif term.nil? then external_terms_boilerplate(sources)
+        else
+          internal_external_terms_boilerplate(sources)
+        end
+      end
+
+      TERM_CLAUSE =
+        "//sections//terms[not(.//ancestor::clause[@type = 'terms'])] | " \
+        "//sections/clause[descendant::terms][@type = 'terms'] | " \
+        "//sections/clause[not(@type = 'terms')]//terms".freeze
+
+      def termdef_boilerplate_cleanup(xmldoc)
+        # termdef_remove_initial_paras(xmldoc)
+      end
+
+      def termdef_remove_initial_paras(xmldoc)
+        xmldoc.xpath("//terms/p | //terms/ul").each(&:remove)
+      end
+
+      def termdef_boilerplate_insert(xmldoc, isodoc, once = false)
+        if once
+          f = termdef_boilerplate_insert_location(xmldoc) and
+            termdef_boilerplate_insert1(f, xmldoc, isodoc)
+        else
+          xmldoc.xpath(self.class::TERM_CLAUSE).each do |f|
+            termdef_boilerplate_insert1(f, xmldoc, isodoc)
+          end
+        end
+      end
+
+      def termdef_boilerplate_insert_location(xmldoc)
+        f = xmldoc.at(self.class::TERM_CLAUSE)
+        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)
+        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
+    end
+  end
+end

data/lib/metanorma/standoc/cleanup_terms_designations.rb

@@ -156,8 +156,7 @@ module Metanorma
           while %w(domain subject).include? p&.name
             p = p.previous_element
           end
-          DESIGNATOR.include?(p&.name) or
-            next
+          DESIGNATOR.include?(p&.name) or next
           related2pref(p) << t.remove
         end
       end

data/lib/metanorma/standoc/cleanup_text.rb

@@ -2,8 +2,8 @@ module Metanorma
   module Standoc
     module Cleanup
       def textcleanup(result)
-        text = result.flatten.map { |l| l.sub(/\s*\Z/, "") } * "\n"
-        text = text.gsub(/\s+<fn /, "<fn ")
+        text = result.flatten.map(&:rstrip) * "\n"
+        text = text.gsub(/(?<!\s)\s+<fn /, "<fn ")
         %w(passthrough passthrough-inline).each do |v|
           text.gsub!(%r{<#{v}\s+formats="metanorma">([^<]*)
                     </#{v}>}mx) { @c.decode($1) }

data/lib/metanorma/standoc/cleanup_xref.rb

@@ -176,7 +176,7 @@ module Metanorma
 
       def xref_compound_cleanup1(xref, locations)
         xref.children.empty? and xref.children = "<sentinel/>"
-        xref_parse_compound_locations(locations).reverse.each do |y|
+        xref_parse_compound_locations(locations).reverse_each do |y|
           xref.children.first.previous =
             "<xref target='#{y[1]}' connective='#{y[0]}'/>"
         end

data/lib/metanorma/standoc/datamodel/plantuml_renderer.rb

@@ -15,7 +15,7 @@ module Metanorma
       end
 
       def join_as_plantuml(*ary)
-        ary.compact.join("\n").sub(/\s+\Z/, "")
+        ary.compact.join("\n").sub(/(?<!\s)\s+\Z/, "")
       end
 
       def render

data/lib/metanorma/standoc/front.rb

@@ -74,7 +74,7 @@ module Metanorma
 
       def metadata_date1(node, xml, type)
         date = node.attr("#{type}-date")
-        date and xml.date type: type do |d|
+        date and xml.date(type:) do |d|
           d.on date
         end
       end
@@ -91,7 +91,7 @@ module Metanorma
           a == "date" || /^date_\d+$/.match(a) or next
           type, date = node.attr(a).split(/ /, 2)
           type or next
-          xml.date type: type do |d|
+          xml.date(type:) do |d|
             d.on date
           end
         end
@@ -139,7 +139,7 @@ module Metanorma
       def metadata_getrelation1(doc, xml, type, desc)
         id = doc.split(/,\s*/)
         xml.relation type: relation_normalise(type) do |r|
-          desc.nil? or r.description desc.gsub(/-/, " ")
+          desc.nil? or r.description desc.tr("-", " ")
           fetch_ref(r, doc, nil, **{}) or r.bibitem do |b|
             b.title id[1] || "--"
             b.docidentifier id[0]

data/lib/metanorma/standoc/init.rb

@@ -103,6 +103,7 @@ module Metanorma
       def init_biblio(node)
         @no_isobib_cache = node.attr("no-isobib-cache")
         @no_isobib = node.attr("no-isobib")
+        @flush_caches = node.attr("flush-caches")
         init_bib_log
         @bibdb = nil
         init_bib_caches(node)
@@ -123,6 +124,11 @@ module Metanorma
         @keepasciimath = node.attr("mn-keep-asciimath") &&
           node.attr("mn-keep-asciimath") != "false"
         @numberfmt_default = kv_parse(node.attr("number-presentation"))
+        @numberfmt_formula = node.attr("number-presentation-formula")
+        @numberfmt_formula == "number-presentation" and
+          @numberfmt_formula = node.attr("number-presentation")
+        @numberfmt_formula == "default" and
+          @numberfmt_formula = "notation='basic'"
         @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)

data/lib/metanorma/standoc/inline.rb

@@ -39,25 +39,30 @@ module Metanorma
         results.sub(%r{<math ([^>]+ )?display="block"}, "<math \\1")
       end
 
-      def stem_parse(text, xml, style, block)
+      def stem_parse(text, xml, style, node)
+        attr = stem_attrs(node)
         if /&lt;([^:>&]+:)?math(\s+[^>&]+)?&gt; |
           <([^:>&]+:)?math(\s+[^>&]+)?>/x.match? text
-          math = xml_encode(text)
-          xml.stem(type: "MathML", block:) do |s|
-            s << math
+          xml.stem **attr.merge(type: "MathML") do |s|
+            s << xml_encode(text)
           end
-        elsif style == :latexmath then latex_parse(text, xml, block)
+        elsif style == :latexmath then latex_parse(text, xml, attr)
         else
-          xml.stem text&.gsub("&amp;#", "&#"), type: "AsciiMath", block:
+          xml.stem text&.gsub("&amp;#", "&#"), **attr.merge(type: "AsciiMath")
         end
       end
 
-      def latex_parse(text, xml, block)
-        latex = latex_parse1(text, block) or
-          return xml.stem(type: "MathML", block:)
-        xml.stem(type: "MathML", block:) do |s|
+      def stem_attrs(node)
+        n = node.attr("number-format")
+        { block: node.block?, "number-format": n }.compact
+      end
+
+      def latex_parse(text, xml, attr)
+        latex = latex_parse1(text, attr[:block]) or
+          return xml.stem **attr.merge(type: "MathML")
+        xml.stem **attr.merge(type: "MathML") do |s|
           math = Nokogiri::XML.fragment(latex.sub(/<\?[^>]+>/, ""))
-              .elements[0]
+            .elements[0]
           math.delete("alttext")
           s.parent.children = math
           s << "<latexmath>#{text}</latexmath>"
@@ -78,8 +83,8 @@ module Metanorma
           when :single then xml << "'#{node.text}'"
           when :superscript then xml.sup { |s| s << node.text }
           when :subscript then xml.sub { |s| s << node.text }
-          when :asciimath then stem_parse(node.text, xml, :asciimath, false)
-          when :latexmath then stem_parse(node.text, xml, :latexmath, false)
+          when :asciimath then stem_parse(node.text, xml, :asciimath, node)
+          when :latexmath then stem_parse(node.text, xml, :latexmath, node)
           when :mark then highlight_parse(node.text, xml)
           else
             case node.role
@@ -123,7 +128,7 @@ module Metanorma
         end
         uri = node.image_uri (nodetarget)
         if Gem.win_platform? && /^\/[a-zA-Z]:/.match?(uri)
-          uri = uri[1..-1]
+          uri = uri[1..]
         end
         types = if /^data:/.match?(uri) then Vectory::Utils::datauri2mime(uri)
                 else MIME::Types.type_for(uri)

data/lib/metanorma/standoc/isodoc.rng

@@ -662,6 +662,9 @@
             <value>LatexMath</value>
           </choice>
         </attribute>
+        <optional>
+          <attribute name="number-format"/>
+        </optional>
         <attribute name="block">
           <data type="boolean"/>
         </attribute>

data/lib/metanorma/standoc/localbib.rb

@@ -23,7 +23,7 @@ module Metanorma
 
       def init_file_bibdb_config(defn, key)
         /=/.match?(defn) or defn = "file=#{defn}"
-        values = defn.split(",").map { |item| item.split /\s*=\s*/ }.to_h
+        values = defn.split(",").map { |item| item.split /(?<!\s)\s*=\s*/ }.to_h
         values["key"] = key
         values["format"] ||= "bibtex" # all we currently suppoort
         values

data/lib/metanorma/standoc/macros.rb

@@ -22,7 +22,7 @@ module Metanorma
       on_context :example, :sourcecode
 
       def init_indent(line)
-        /^(?<prefix>[ \t]*)(?<suffix>.*)$/ =~ line
+        /^(?<prefix>[ \t]*)(?![ \t])(?<suffix>.*)$/ =~ line
         prefix = prefix.gsub("\t", "\u00a0\u00a0\u00a0\u00a0")
           .tr(" ", "\u00a0")
         prefix + suffix

data/lib/metanorma/standoc/macros_inline.rb

@@ -178,10 +178,10 @@ module Metanorma
       def process(parent, target, attrs)
         out = Asciidoctor::Inline.new(parent, :quoted, attrs["text"]).convert
         fmt = format(out)
-        fmt.empty? and fmt = "notation='basic'"
-        fmt = %( data-metanorma-numberformat="#{fmt}")
+        fmt.empty? and fmt = "default"
+        fmt = %( number-format="#{fmt}")
         <<~OUTPUT
-          <stem type="MathML"><math xmlns='#{MATHML_NS}'><mn#{fmt}>#{number(target)}</mn></math></stem>
+          <stem type="MathML"#{fmt}><math xmlns='#{MATHML_NS}'><mn>#{number(target)}</mn></math></stem>
         OUTPUT
       end
     end

data/lib/metanorma/standoc/macros_plantuml.rb

@@ -71,7 +71,7 @@ module Metanorma
 
       def self.prep_source(reader)
         src = reader.source
-        reader.lines.first.sub(/\s+$/, "").match /^@startuml($| )/ or
+        reader.lines.first.sub(/(?<!\s)\s+$/, "").match /^@startuml($| )/ or
           src = "@startuml\n#{src}\n@enduml\n"
         %r{@enduml\s*$}m.match?(src) or
           raise "@startuml without matching @enduml in PlantUML!"

data/lib/metanorma/standoc/ref.rb

@@ -5,7 +5,7 @@ module Metanorma
   module Standoc
     module Refs
       def iso_publisher(bib, code)
-        code.sub(/ .*$/, "").split("/").each do |abbrev|
+        code.sub(/(?<! ) .*$/, "").split("/").each do |abbrev|
           bib.contributor do |c|
             c.role type: "publisher"
             c.organization do |org|

data/lib/metanorma/standoc/ref_queue.rb

@@ -228,7 +228,7 @@ module Metanorma
             @iev_globalname = global_ievcache_name
           @iev_localname = local_ievcache_name(node.attr("local-cache") ||
                                                node.attr("local-cache-only"))
-          if node.attr("flush-caches")
+          if @flush_caches
             FileUtils.rm_f @iev_globalname unless @iev_globalname.nil?
             FileUtils.rm_f @iev_localname unless @iev_localname.nil?
           end

data/lib/metanorma/standoc/ref_utility.rb

@@ -20,7 +20,7 @@ module Metanorma
       def norm_year(year)
         /^&\#821[12];$/.match(year) and return "--"
         /^\d\d\d\d-\d\d\d\d$/.match(year) and return year
-        year&.sub(/(?<=[0-9])-.*$/, "")
+        year&.sub(/^([0-9]+)-.*$/, "\\1")
       end
 
       def conditional_date(bib, match, noyr)
@@ -46,7 +46,7 @@ module Metanorma
                         @bibdb&.docid_type(code) || [nil, code]
                       end
         code1.sub!(/^nofetch\((.+)\)$/, "\\1")
-        bib.docidentifier **attr_code(type: type) do |d|
+        bib.docidentifier **attr_code(type:) do |d|
           d << code1
         end
       end
@@ -59,7 +59,7 @@ module Metanorma
       end
 
       def mn_code(code)
-        code.sub(/^\(/, "[").sub(/\).*$/, "]")
+        code.sub(/^\(/, "[").sub(/^([^)]+)\).*$/, "\\1]")
           .sub(/^dropid\((.+)\)$/, "\\1")
           .sub(/^hidden\((.+)\)$/, "\\1")
           .sub(/^nofetch\((.+)\)$/, "\\1")
@@ -67,7 +67,8 @@ module Metanorma
       end
 
       def analyse_ref_localfile(ret)
-        m = /^local-file\((?:(?<source>[^,]+),\s*)?(?<id>.+)\)$/.match(ret[:id])
+        m = /^local-file\((?:(?<source>[^,)]+),\s*)?(?<id>[^)]+)\)$/
+          .match(ret[:id])
         m or return ret
         ret.merge(id: m[:id], localfile: m[:source] || "default")
       end
@@ -88,7 +89,7 @@ module Metanorma
       end
 
       def analyse_ref_repo_path(ret)
-        m = /^(?<type>repo|path|attachment):\((?<key>[^,]+),?(?<id>[^)]*)\)$/
+        m = /^(?<type>repo|path|attachment):\((?<key>[^,)]+),?(?<id>[^)]*)\)$/
           .match(ret[:id]) or return ret
         id = if m[:id].empty?
                if m[:type] == "attachment"
@@ -96,7 +97,7 @@ module Metanorma
                else m[:key].sub(%r{^[^/]+/}, "")
                end
              else m[:id] end
-        ret.merge(id: id, type: m[:type], key: m[:key], nofetch: true)
+        ret.merge(id:, type: m[:type], key: m[:key], nofetch: true)
       end
 
       def analyse_ref_numeric(ret)

data/lib/metanorma/standoc/reqt.rng

@@ -66,6 +66,9 @@
         <ref name="MultilingualRenderingType"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="class"/>
+    </optional>
     <optional>
       <ref name="reqtitle"/>
     </optional>

data/lib/metanorma/standoc/section.rb

@@ -14,8 +14,8 @@ module Metanorma
         node.attr("heading")&.downcase ||
           node.title
             .gsub(%r{<index>.*?</index>}m, "")
-            .gsub(%r{<fn[^>]*>.*?</fn>}m, "")
-            .gsub(/<[^>]+>/, "")
+            .gsub(%r{<fn[^<>]*>.*?</fn>}m, "")
+            .gsub(/<[^<>]+>/, "")
             .strip.downcase.sub(/\.$/, "")
       end
 

data/lib/metanorma/standoc/term_lookup_cleanup.rb

@@ -4,7 +4,7 @@ module Metanorma
   module Standoc
     # Intelligent term lookup xml modifier
     class TermLookupCleanup
-      AUTO_GEN_ID_REGEXP = /\A_/.freeze
+      AUTO_GEN_ID_REGEXP = /\A_/
 
       attr_reader :xmldoc, :lookup, :log
 
@@ -130,7 +130,7 @@ module Metanorma
       end
 
       def remove_missing_ref_msg1(_node, target, ret)
-        target2 = "_#{target.downcase.gsub('-', '_')}"
+        target2 = "_#{target.downcase.tr('-', '_')}"
         if @terms_tags[target] || @terms_tags[target2]
           ret.strip!
           ret += ". Did you mean to point to a subterm?"

data/lib/metanorma/standoc/utils.rb

@@ -100,8 +100,9 @@ module Metanorma
       # wrapped in <sections>
       def adoc2xml(text, flavour)
         Nokogiri::XML(text).root and return text
+        f = @flush_caches ? ":flush-caches:\n" : ""
         c = Asciidoctor.convert("= X\nA\n:semantic-metadata-headless: true\n" \
-                                ":novalid:\n\n#{text}\n",
+                                ":no-isobib:\n#{f}:novalid:\n\n#{text}\n",
                                 backend: flavour, header_footer: true)
         Nokogiri::XML(c).at("//xmlns:sections")
       end

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "2.9.4".freeze
+    VERSION = "2.9.6".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 2.9.4
+  version: 2.9.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-19 00:00:00.000000000 Z
+date: 2024-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -528,6 +528,7 @@ files:
 - lib/metanorma/standoc/cleanup_image.rb
 - lib/metanorma/standoc/cleanup_inline.rb
 - lib/metanorma/standoc/cleanup_maths.rb
+- lib/metanorma/standoc/cleanup_mathvariant.rb
 - lib/metanorma/standoc/cleanup_ref.rb
 - lib/metanorma/standoc/cleanup_reqt.rb
 - lib/metanorma/standoc/cleanup_section.rb
@@ -535,6 +536,7 @@ files:
 - lib/metanorma/standoc/cleanup_symbols.rb
 - lib/metanorma/standoc/cleanup_table.rb
 - lib/metanorma/standoc/cleanup_terms.rb
+- lib/metanorma/standoc/cleanup_terms_boilerplate.rb
 - lib/metanorma/standoc/cleanup_terms_designations.rb
 - lib/metanorma/standoc/cleanup_text.rb
 - lib/metanorma/standoc/cleanup_toc.rb