metanorma-standoc 2.9.5 → 2.9.7

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) }
@@ -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/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/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/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/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)
@@ -103,6 +116,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)
@@ -122,10 +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_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 = @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

@@ -39,25 +39,38 @@ 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)
+        attrs, text = stem_attrs(node, text)
         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 **attrs.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, attrs)
         else
-          xml.stem text&.gsub("&amp;#", "&#"), type: "AsciiMath", block:
+          xml.stem text&.gsub("&amp;#", "&#"), **attrs.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|
+      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)
+        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 +91,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 +136,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)