metanorma-standoc 2.9.6 → 2.9.7

data/lib/metanorma/standoc/cleanup_maths.rb

@@ -20,7 +20,7 @@ module Metanorma
       def asciimath2mathml_indiv(elem)
         elem["type"] = "MathML"
         expr = @c.decode(elem.text)
-        ret = asciimath_parse(expr, elem)
+        ret = asciimath_parse(expr, elem)&.strip
         ret += "<asciimath>#{@c.encode(expr, :basic)}</asciimath>"
         elem.children = ret
       rescue StandardError => e
@@ -102,7 +102,7 @@ module Metanorma
         ins
       end
 
-      def mathml_unitsML(xmldoc)
+      def mathml_unitsml(xmldoc)
         xmldoc.at(".//m:*", "m" => UNITSML_NS) or return
         misc = add_misc_container(xmldoc)
         unitsml = misc.add_child("<UnitsML xmlns='#{UNITSML_NS}'/>").first
@@ -131,7 +131,7 @@ module Metanorma
           profile = mathml_mn_profile(m)
           attr = profile.each_with_object([]) do |(k, v), acc|
             v == "nil" and next
-            acc << "#{k}='#{v}'"
+            acc << "#{k}='#{@c.decode v}'"
           end.join(",")
           attr.empty? or m["data-metanorma-numberformat"] = attr
         end
@@ -152,10 +152,10 @@ module Metanorma
         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]}'"
+          "#{m[1]}='#{@c.decode m[2]}'"
         end.join(",")
         stem.xpath(".//m:mn", "m" => MATHML_NS).each do |m|
-          m["data-metanorma-numberformat"] = attr
+          attr.empty? or m["data-metanorma-numberformat"] = attr
         end
       end
 
@@ -168,7 +168,7 @@ module Metanorma
         f == "default" or return f
         if @numberfmt_default.empty?
           "notation='basic'"
-        else @numberfmt_default&.map { |k, v| "#{k}=#{v}" }&.join(",")
+        else @numberfmt_default&.map { |k, v| "#{k}='#{v}'" }&.join(",")
         end
       end
 
@@ -179,15 +179,16 @@ module Metanorma
       end
 
       def mathml_cleanup(xmldoc)
-        unitsml = Asciimath2UnitsML::Conv.new(asciimath2unitsml_options)
+        a2u = Asciimath2UnitsML::Conv.new(asciimath2unitsml_options)
         xmldoc.xpath("//stem[@type = 'MathML'][not(@validate = 'false')]")
           .each do |x|
           mathml_xml_cleanup(x)
-          unitsml.MathML2UnitsML(x)
+          a2u.MathML2UnitsML(x)
           mathml_mathvariant(x)
-          mathml_number_format(x)
         end
-        mathml_unitsML(xmldoc)
+        xmldoc.xpath("//stem[@type = 'MathML']")
+          .each { |x| mathml_number_format(x) }
+        mathml_unitsml(xmldoc)
       end
     end
   end

data/lib/metanorma/standoc/cleanup_text.rb

@@ -40,14 +40,21 @@ module Metanorma
       def linebreak_cleanup_block(block)
         block.each_with_index do |e, i|
           e[:skip] and next
-          lines = e[:text].lines.map(&:rstrip)
-          e[:last] or lines << block[i + 1][:text].lines.first # next token context
+          lines = lines_strip_textspan(e, block[i + 1])
           out = Metanorma::Utils.line_sanitise(lines)
           e[:last] or out.pop
           e[:elem].replace(out.join)
         end
       end
 
+      def lines_strip_textspan(span, nextspan)
+        lines = span[:text].lines[0..-2].map(&:rstrip) <<
+          span[:text].lines[-1]&.sub(/\n$/, "")
+        # no final line rstrip: can be space linking to next line
+        span[:last] or lines << nextspan[:text].lines.first # next token context
+        lines
+      end
+
       def gather_text_for_linebreak_cleanup(block)
         x = block.xpath(".//text()").map do |e|
           { elem: e, text: e.text,

data/lib/metanorma/standoc/converter.rb

@@ -25,6 +25,7 @@ module Metanorma
         preprocessor Metanorma::Plugin::Lutaml::LutamlPreprocessor
         preprocessor Metanorma::Plugin::Lutaml::LutamlUmlAttributesTablePreprocessor
         preprocessor Metanorma::Plugin::Lutaml::LutamlUmlDatamodelDescriptionPreprocessor
+        preprocessor Metanorma::Plugin::Lutaml::LutamlEaXmiPreprocessor
         preprocessor Metanorma::Plugin::Lutaml::LutamlUmlClassPreprocessor
         inline_macro Metanorma::Plugin::Lutaml::LutamlFigureInlineMacro
         inline_macro Metanorma::Plugin::Lutaml::LutamlTableInlineMacro
@@ -33,6 +34,7 @@ module Metanorma
         block Metanorma::Plugin::Lutaml::LutamlDiagramBlock
         block_macro Metanorma::Plugin::Lutaml::LutamlGmlDictionaryBlockMacro
         block Metanorma::Plugin::Lutaml::LutamlGmlDictionaryBlock
+        block_macro Metanorma::Plugin::Lutaml::LutamlKlassTableBlockMacro
         preprocessor Metanorma::Standoc::EmbedIncludeProcessor
         preprocessor Metanorma::Standoc::LinkProtectPreprocessor
         preprocessor Metanorma::Standoc::Datamodel::AttributesTablePreprocessor

data/lib/metanorma/standoc/init.rb

@@ -7,6 +7,8 @@ module Metanorma
         init_vars
         init_misc(node)
         init_processing(node)
+        init_log(node)
+        init_image(node)
         init_reqt(node)
         init_toc(node)
         init_output(node) # feeds init_biblio
@@ -47,11 +49,22 @@ module Metanorma
         @smartquotes = node.attr("smartquotes") != "false"
         @sourcecode_markup_start = node.attr("sourcecode-markup-start") || "{{{"
         @sourcecode_markup_end = node.attr("sourcecode-markup-end") || "}}}"
+        @blockunnumbered = (node.attr("block-unnumbered") || "").split(",")
+          .map(&:strip)
+      end
+
+      def init_log(node)
+        @log or return
+        severity = node.attr("log-filter-severity")&.to_i || 4
+        category = node.attr("log-filter-category") || ""
+        category = category.split(",").map(&:strip)
+        @log.suppress_log = { severity:, category: }
+      end
+
+      def init_image(node)
         @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
 
       def init_reqt(node)
@@ -123,15 +136,15 @@ module Metanorma
       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_formula = node.attr("number-presentation-formula")
+        @numberfmt_default = kv_parse(@c.decode(node.attr("number-presentation")))
+        @numberfmt_formula = @c.decode(node.attr("number-presentation-formula"))
         @numberfmt_formula == "number-presentation" and
-          @numberfmt_formula = node.attr("number-presentation")
+          @numberfmt_formula = @c.decode(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)
+          m[p[1]] = kv_parse(@c.decode(v))
         end
       end
 

data/lib/metanorma/standoc/inline.rb

@@ -40,21 +40,29 @@ module Metanorma
       end
 
       def stem_parse(text, xml, style, node)
-        attr = stem_attrs(node)
+        attrs, text = stem_attrs(node, text)
         if /<([^:>&]+:)?math(\s+[^>&]+)?> |
           <([^:>&]+:)?math(\s+[^>&]+)?>/x.match? text
-          xml.stem **attr.merge(type: "MathML") do |s|
+          xml.stem **attrs.merge(type: "MathML") do |s|
             s << xml_encode(text)
           end
-        elsif style == :latexmath then latex_parse(text, xml, attr)
+        elsif style == :latexmath then latex_parse(text, xml, attrs)
         else
-          xml.stem text&.gsub("&amp;#", "&#"), **attr.merge(type: "AsciiMath")
+          xml.stem text&.gsub("&amp;#", "&#"), **attrs.merge(type: "AsciiMath")
         end
       end
 
-      def stem_attrs(node)
-        n = node.attr("number-format")
-        { block: node.block?, "number-format": n }.compact
+      STEM_ATTRS = "number-format".freeze
+
+      def stem_attrs(node, text)
+        attrs = STEM_ATTRS.split("|").each_with_object({}) do |k, m|
+          n = node.attr(k) and m[k.to_sym] = n
+        end
+        while m = /^(#{STEM_ATTRS})(=[^%]+)?%(.*)$/o.match(text)
+          text = m[3]
+          attrs[m[1].to_sym] = m[2]&.sub(/^=/, "")
+        end
+        [{ block: node.block? }.merge(attrs), text]
       end
 
       def latex_parse(text, xml, attr)