metanorma-standoc 2.8.10 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc9017c5129df1275eedf83ba8816e29b96fc63ebef771adc4061ff2d3b12dc8
-  data.tar.gz: c318ba163f24eb061288262ea1045bb01604ff8dbe0f464985ec225fb37290e8
+  metadata.gz: 629fbf02985b771b385ed63f1ebcfecbd7f5031d1f476b5a5902e1b930b15a77
+  data.tar.gz: d89624a478853541b6cb07fe76b126f0e3e78001ac43ab63907d67481a3b05cf
 SHA512:
-  metadata.gz: 4484712af3ccd71b9910e2f702a62afcd63a3bcd29534679e576259b4f9d577ae18d1a98c03004de1a71cee21766ba33729c6167fd55d6cdc2ddadf45dc7c30b
-  data.tar.gz: 9f5cfeff766498b8b723d0f66292903cb7d9fee7297cfdcab952b9b2aa7e6db0820c6064358f4486aace8f25607a9569d870a068945d51c17e7bde1617eca822
+  metadata.gz: 6aa6a1c220c69aae4eb245b2d744d03356a30ed89bfe94c8c316415934041899fa0a68e2b86fe4b026ac294cede284f4d4ff1977eecb4272914ceb4ab2b7f87f
+  data.tar.gz: 26f1f58f773930cdf01d08c9c09aaa4e0f2e31392746cfb199cfb629299ec4500a9dd4e62bc999b9a5b65bea8ee568076431b82de79d323dfe654b891ffafc7f

data/.rubocop.yml

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

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_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/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,8 +45,6 @@ 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"
@@ -108,6 +109,16 @@ module Metanorma
           ::Metanorma::Standoc::LocalBiblio.new(node, @localdir, self)
       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/macros.rb

@@ -7,6 +7,7 @@ require_relative "macros_terms"
 require_relative "macros_form"
 require_relative "macros_note"
 require_relative "macros_embed"
+require_relative "macros_link"
 require_relative "datamodel/attributes_table_preprocessor"
 require_relative "datamodel/diagram_preprocessor"
 require "metanorma-plugin-datastruct"

data/lib/metanorma/standoc/macros_inline.rb

@@ -1,3 +1,5 @@
+require_relative "utils"
+
 module Metanorma
   module Standoc
     class InheritInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
@@ -12,49 +14,6 @@ module Metanorma
       end
     end
 
-    class IndexXrefInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
-      use_dsl
-      named :index
-
-      def preprocess_attrs(attrs)
-        ret = { primary: attrs[1], target: attrs[attrs.size] }
-        ret[:secondary] = attrs[2] if attrs.size > 2
-        ret[:tertiary] = attrs[3] if attrs.size > 3
-        ret
-      end
-
-      def validate(parent, target, attrs)
-        attrs.size > 1 && attrs.size < 5 and return true
-        e = "invalid index \"#{target}\" cross-reference: wrong number of " \
-            "attributes in `index:#{target}[#{attrs.values.join(',')}]`"
-        parent.converter.log.add("Crossreferences", parent, e, severity: 0)
-        false
-      end
-
-      def process(parent, target, attr)
-        validate(parent, target, attr) or return
-        args = preprocess_attrs(attr)
-        ret = "<index-xref also='#{target == 'also'}'>" \
-              "<primary>#{args[:primary]}</primary>"
-        ret += "<secondary>#{args[:secondary]}</secondary>" if args[:secondary]
-        ret += "<tertiary>#{args[:tertiary]}</tertiary>" if args[:tertiary]
-        ret + "<target>#{args[:target]}</target></index-xref>"
-      end
-    end
-
-    class IndexRangeInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
-      use_dsl
-      named :"index-range"
-      parse_content_as :text
-
-      def process(parent, target, attr)
-        text = attr["text"]
-        text = "((#{text}))" unless /^\(\(.+\)\)$/.match?(text)
-        out = parent.sub_macros(text)
-        out.sub("<index>", "<index to='#{target}'>")
-      end
-    end
-
     class HTML5RubyMacro < Asciidoctor::Extensions::InlineMacroProcessor
       use_dsl
       named :ruby
@@ -151,23 +110,6 @@ module Metanorma
       end
     end
 
-    class ToCInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
-      use_dsl
-      named :toc
-      parse_content_as :text
-      using_format :short
-
-      def process(parent, _target, attrs)
-        out = Asciidoctor::Inline.new(parent, :quoted, attrs["text"]).convert
-        content = CSV.parse_line(out).map do |x|
-          x.sub!(/^(["'])(.+)\1/, "\\2")
-          m = /^(.*?)(:\d+)?$/.match(x)
-          %{<toc-xpath depth='#{m[2]&.sub(':', '') || 1}'>#{m[1]}</toc-xpath>}
-        end.join
-        "<toc>#{content}</toc>"
-      end
-    end
-
     # inject ZWNJ to prevent Asciidoctor from attempting regex substitutions
     class PassInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
       use_dsl
@@ -194,32 +136,53 @@ module Metanorma
       end
     end
 
-    class StdLinkInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
+    class SpanInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
       use_dsl
-      named :"std-link"
+      named :span
       parse_content_as :text
-      using_format :short
 
-      def process(parent, _target, attrs)
-        t = attrs["text"]
-        t = if /,/.match?(t)
-              t.sub(/,/, "%")
-            else
-              "#{t}%"
-            end
-        create_anchor(parent, "hidden=#{t}",
-                      type: :xref, target: "_#{UUIDTools::UUID.random_create}")
+      def process(parent, target, attrs)
+        out = Asciidoctor::Inline.new(parent, :quoted, attrs["text"]).convert
+        %{<span class="#{target}">#{out}</span>}
       end
     end
 
-    class SpanInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
+    class NumberInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
+      include ::Metanorma::Standoc::Utils
+
       use_dsl
-      named :span
+      named :number
       parse_content_as :text
 
+      MATHML_NS = "http://www.w3.org/1998/Math/MathML".freeze
+
+      def unquote(str)
+        str.sub(/^(["'])(.+)\1$/, "\\2")
+      end
+
+      def format(attrs)
+        # a="," => "a=,"
+        quoted_csv_split(attrs || "", ",").map do |x|
+          m = /^(.+?)=(.+)?$/.match(x) or next
+          "#{m[1]}='#{m[2]}'"
+        end.join(",")
+      end
+
+      def number(text)
+        n = BigDecimal(text)
+        trailing_zeroes = 0
+        m = /\.[1-9]*(0+)/.match(text) and trailing_zeroes += m[1].size
+        n.to_s("E").sub("e", "0" * trailing_zeroes + "e")
+      end
+
       def process(parent, target, attrs)
         out = Asciidoctor::Inline.new(parent, :quoted, attrs["text"]).convert
-        %{<span class="#{target}">#{out}</span>}
+        fmt = format(out)
+        fmt.empty? and fmt = "notation='basic'"
+        fmt = %( data-metanorma-numberformat="#{fmt}")
+        <<~OUTPUT
+          <stem type="MathML"><math xmlns='#{MATHML_NS}'><mn#{fmt}>#{number(target)}</mn></math></stem>
+        OUTPUT
       end
     end
   end

data/lib/metanorma/standoc/macros_link.rb

@@ -0,0 +1,81 @@
+module Metanorma
+  module Standoc
+    class IndexXrefInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
+      use_dsl
+      named :index
+
+      def preprocess_attrs(attrs)
+        ret = { primary: attrs[1], target: attrs[attrs.size] }
+        ret[:secondary] = attrs[2] if attrs.size > 2
+        ret[:tertiary] = attrs[3] if attrs.size > 3
+        ret
+      end
+
+      def validate(parent, target, attrs)
+        attrs.size > 1 && attrs.size < 5 and return true
+        e = "invalid index \"#{target}\" cross-reference: wrong number of " \
+            "attributes in `index:#{target}[#{attrs.values.join(',')}]`"
+        parent.converter.log.add("Crossreferences", parent, e, severity: 0)
+        false
+      end
+
+      def process(parent, target, attr)
+        validate(parent, target, attr) or return
+        args = preprocess_attrs(attr)
+        ret = "<index-xref also='#{target == 'also'}'>" \
+              "<primary>#{args[:primary]}</primary>"
+        ret += "<secondary>#{args[:secondary]}</secondary>" if args[:secondary]
+        ret += "<tertiary>#{args[:tertiary]}</tertiary>" if args[:tertiary]
+        ret + "<target>#{args[:target]}</target></index-xref>"
+      end
+    end
+
+    class IndexRangeInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
+      use_dsl
+      named :"index-range"
+      parse_content_as :text
+
+      def process(parent, target, attr)
+        text = attr["text"]
+        text = "((#{text}))" unless /^\(\(.+\)\)$/.match?(text)
+        out = parent.sub_macros(text)
+        out.sub("<index>", "<index to='#{target}'>")
+      end
+    end
+
+    class ToCInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
+      use_dsl
+      named :toc
+      parse_content_as :text
+      using_format :short
+
+      def process(parent, _target, attrs)
+        out = Asciidoctor::Inline.new(parent, :quoted, attrs["text"]).convert
+        content = CSV.parse_line(out).map do |x|
+          x.sub!(/^(["'])(.+)\1/, "\\2")
+          m = /^(.*?)(:\d+)?$/.match(x)
+          %{<toc-xpath depth='#{m[2]&.sub(':', '') || 1}'>#{m[1]}</toc-xpath>}
+        end.join
+        "<toc>#{content}</toc>"
+      end
+    end
+
+    class StdLinkInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
+      use_dsl
+      named :"std-link"
+      parse_content_as :text
+      using_format :short
+
+      def process(parent, _target, attrs)
+        t = attrs["text"]
+        t = if /,/.match?(t)
+              t.sub(/,/, "%")
+            else
+              "#{t}%"
+            end
+        create_anchor(parent, "hidden=#{t}",
+                      type: :xref, target: "_#{UUIDTools::UUID.random_create}")
+      end
+    end
+  end
+end

data/lib/metanorma/standoc/utils.rb

@@ -17,8 +17,8 @@ module Metanorma
         nil
       end
 
-      def noko(&block)
-        Metanorma::Utils::noko(@script, &block)
+      def noko(&)
+        Metanorma::Utils::noko(@script, &)
       end
 
       def attr_code(attributes)
@@ -30,6 +30,26 @@ module Metanorma
           .map { |x| @c.encode(x, :basic, :hexadecimal) }
       end
 
+      def quoted_csv_split(text, delim = ",", eql = "=")
+        # quoted strings: key="va,lue",
+        c = HTMLEntities.new
+        text = c.decode(text).gsub(/([a-zA-Z_]+)#{eql}(["'])(.+?)\2/,
+                                   %("\\1#{eql}\\3"))
+        Metanorma::Utils::csv_split(text, delim)
+          .map do |x|
+            c.encode(x.sub(/^(["'])(.+)\1$/, "\\2"), :basic, :hexadecimal)
+          end
+      end
+
+      def kv_parse(text, delim = ",", eql = "=")
+        text or return {}
+        c = HTMLEntities.new
+        quoted_csv_split(text, delim).each_with_object({}) do |k, m|
+          x = k.split(eql, 2)
+          m[x[0]] = c.decode(x[1])
+        end
+      end
+
       def wrap_in_para(node, out)
         Metanorma::Utils::wrap_in_para(node, out)
       end

data/lib/metanorma/standoc/validate_table.rb

@@ -2,6 +2,7 @@ module Metanorma
   module Standoc
     module Validate
       def table_validate(doc)
+        empty_table_validate(doc)
         doc.xpath("//table[colgroup]").each do |t|
           maxrowcols_validate(t, t.xpath("./colgroup/col").size)
         end
@@ -13,6 +14,12 @@ module Metanorma
         end
       end
 
+      def empty_table_validate(doc)
+        doc.xpath("//table[not(.//tr)]").each do |t|
+          @log.add("Table", t, "Empty table", severity: 0)
+        end
+      end
+
       def max_td_count(table)
         max = 0
         table.xpath("./tr").each do |tr|

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "2.8.10".freeze
+    VERSION = "2.9.0".freeze
   end
 end

data/metanorma-standoc.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
     f.match(%r{^(test|spec|features|bin|.github)/}) \
     || f.match(%r{Rakefile|bin/rspec})
   end
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
 
   spec.add_dependency "addressable", "~> 2.8.0"
   spec.add_dependency "asciidoctor", "~> 2.0.0"
@@ -36,13 +36,13 @@ Gem::Specification.new do |spec|
   spec.add_dependency "metanorma", ">= 1.6.0"
   spec.add_dependency "metanorma-plugin-datastruct", "~> 0.3.0"
   spec.add_dependency "metanorma-plugin-glossarist", "~> 0.2.0"
-  spec.add_dependency "metanorma-plugin-lutaml", "~> 0.6.0"
+  spec.add_dependency "metanorma-plugin-lutaml", "~> 0.7.0"
   spec.add_dependency "ruby-jing"
   # relaton-cli not just relaton, to avoid circular reference in metanorma
   spec.add_dependency "asciimath2unitsml", "~> 0.4.0"
   spec.add_dependency "concurrent-ruby"
   spec.add_dependency "pngcheck"
-  spec.add_dependency "relaton-cli", "~> 1.18.0"
+  spec.add_dependency "relaton-cli", "~> 1.19.0"
   spec.add_dependency "relaton-iev", "~> 1.2.0"
   spec.add_dependency "unicode2latex", "~> 0.0.1"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 2.8.10
+  version: 2.9.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-03 00:00:00.000000000 Z
+date: 2024-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: ruby-jing
   requirement: !ruby/object:Gem::Requirement
@@ -198,14 +198,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.18.0
+        version: 1.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.18.0
+        version: 1.19.0
 - !ruby/object:Gem::Dependency
   name: relaton-iev
   requirement: !ruby/object:Gem::Requirement
@@ -528,6 +528,7 @@ files:
 - lib/metanorma/standoc/macros_embed.rb
 - lib/metanorma/standoc/macros_form.rb
 - lib/metanorma/standoc/macros_inline.rb
+- lib/metanorma/standoc/macros_link.rb
 - lib/metanorma/standoc/macros_note.rb
 - lib/metanorma/standoc/macros_plantuml.rb
 - lib/metanorma/standoc/macros_terms.rb
@@ -567,7 +568,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="