metanorma-standoc 2.9.0 → 2.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 629fbf02985b771b385ed63f1ebcfecbd7f5031d1f476b5a5902e1b930b15a77
-  data.tar.gz: d89624a478853541b6cb07fe76b126f0e3e78001ac43ab63907d67481a3b05cf
+  metadata.gz: afbcf21ea1b8e99868178616c755a4dcef811f631326c65f6835ad491d1f2835
+  data.tar.gz: 9d3499adf6025521d2683f4456e64b1cd27dd63722c231de8fab7aa47fe79973
 SHA512:
-  metadata.gz: 6aa6a1c220c69aae4eb245b2d744d03356a30ed89bfe94c8c316415934041899fa0a68e2b86fe4b026ac294cede284f4d4ff1977eecb4272914ceb4ab2b7f87f
-  data.tar.gz: 26f1f58f773930cdf01d08c9c09aaa4e0f2e31392746cfb199cfb629299ec4500a9dd4e62bc999b9a5b65bea8ee568076431b82de79d323dfe654b891ffafc7f
+  metadata.gz: 46a8beb31cb6230dccdcdb36352dd05e705a3114d0b1b6e04b46b1a445aa1fe30249426c81be8a441f615c95fe633cc078bd70c030616cdc25ff4c50eb45ab76
+  data.tar.gz: 300aeca29fa514e88535c4f60577f9a6e83446f195b76e7e15029ae912d0beb06c0f6f028b098e4662ab53fbf83fc8e675a920ef7c3269f1e501afa835ba127f

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_bibitem.rb

@@ -36,7 +36,7 @@ module Metanorma
 
       def extract_notes_from_biblio(refs)
         refs.xpath("./bibitem").each do |r|
-          r.xpath("./note[@appended]").reverse.each do |n|
+          r.xpath("./note[@appended]").reverse_each do |n|
             n.delete("appended")
             r.next = n
           end
@@ -147,34 +147,38 @@ module Metanorma
 
       def save_attachment(path, bib)
         init_attachments
+        path = File.join(@localdir, path)
         valid_attachment?(path, bib) or return ""
         f = File.basename(path)
         File.exist?(File.join(@attachmentsdir, f)) and
           f += "_#{UUIDTools::UUID.random_create}"
-        ret = File.join(@attachmentsdir, f)
-        FileUtils.cp(path, ret)
-        datauri_attachment(ret, bib.document)
-        ret
+        out_fld = File.join(@attachmentsdir, f)
+        FileUtils.cp(path, out_fld)
+        datauri_attachment(out_fld, bib.document)
+        File.join(@attachmentsfld, f)
       end
 
       def datauri_attachment(path, doc)
         @datauriattachment or return
-        n = add_misc_container(doc)
+        m = add_misc_container(doc)
         f = File.basename(path)
-        d = Vectory::Utils.datauri(path)
-        n << "<attachment name='#{f}'>#{d}</attachment>"
+        d = Vectory::Utils::datauri(path, @localdir)
+        m << "<attachment name='#{f}'/>"
+        m.last_element_child << d
       end
 
       def valid_attachment?(path, bib)
         File.exist?(path) and return true
-        @log.add("Bibliography", bib, "Attachment #{path} does not exist",
+        p = Pathname.new(path).cleanpath
+        @log.add("Bibliography", bib, "Attachment #{p} does not exist",
                  severity: 0)
         false
       end
 
       def init_attachments
         @attachmentsdir and return
-        @attachmentsdir = File.join(@output_dir, "_#{@filename}_attachments")
+        @attachmentsfld = "_#{@filename}_attachments"
+        @attachmentsdir = File.join(@output_dir, @attachmentsfld)
         FileUtils.rm_rf(@attachmentsdir)
         FileUtils.mkdir_p(@attachmentsdir)
       end

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_ref.rb

@@ -1,4 +1,3 @@
-require "set"
 require "relaton_bib"
 require_relative "merge_bibitems"
 require_relative "spans_to_bibitem"
@@ -18,7 +17,7 @@ module Metanorma
         bib = sort_biblio(refs.xpath("./bibitem"))
         insert = refs.at("./bibitem")&.previous_element
         refs.xpath("./bibitem").each(&:remove)
-        bib.reverse.each do |b|
+        bib.reverse_each do |b|
           (insert and insert.next = b.to_xml) or
             refs.children.first.add_previous_sibling b.to_xml
         end

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_text.rb

@@ -35,7 +35,7 @@ module Metanorma
 
       IGNORE_QUOTES_ELEMENTS =
         %w(pre tt sourcecode stem asciimath figure bibdata passthrough
-           identifier presentation-metadata semantic-metadata).freeze
+           identifier metanorma-extension).freeze
 
       def uninterrupt_quotes_around_xml_skip(elem)
         !(/\A['"]/.match?(elem.text) &&

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/init.rb

@@ -49,6 +49,7 @@ module Metanorma
         @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
@@ -102,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)
@@ -109,6 +111,14 @@ 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"

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">

data/lib/metanorma/standoc/lists.rb

@@ -41,7 +41,7 @@ module Metanorma
             list_caption(node, xml_ul)
             node.items.each { |item| ul_li(xml_ul, item) }
           end
-        end.join("\n")
+        end.join("")
       end
 
       def olist_style(style)
@@ -67,7 +67,7 @@ module Metanorma
             list_caption(node, xml_ol)
             node.items.each { |item| li(xml_ol, item) }
           end
-        end.join("\n")
+        end.join("")
       end
 
       def dt(terms, xml_dl)
@@ -107,7 +107,7 @@ module Metanorma
               dd(dd, xml_dl)
             end
           end
-        end.join("\n")
+        end.join("")
       end
 
       def colist(node)
@@ -117,7 +117,7 @@ module Metanorma
               xml_li.p { |p| p << item.text }
             end
           end
-        end.join("\n")
+        end.join("")
       end
 
       def list_caption(node, out)

data/lib/metanorma/standoc/macros.rb

@@ -53,13 +53,19 @@ module Metanorma
     class NamedEscapePreprocessor < Asciidoctor::Extensions::Preprocessor
       def process(document, reader)
         c = HTMLEntities.new
+        p = Metanorma::Utils::LineStatus.new
         lines = reader.lines.map do |l|
-          l.split(/(&[A-Za-z][^&;]*;)/).map do |s|
-            /^&[A-Za-z]/.match?(s) ? c.encode(c.decode(s), :hexadecimal) : s
-          end.join
+          p.process(l)
+          p.pass ? l : convert(l, c)
         end
         ::Asciidoctor::PreprocessorReader.new document, lines
       end
+
+      def convert(line, esc)
+        line.split(/(&[A-Za-z][^&;]*;)/).map do |s|
+          /^&[A-Za-z]/.match?(s) ? esc.encode(esc.decode(s), :hexadecimal) : s
+        end.join
+      end
     end
 
     class ColumnBreakBlockMacro < Asciidoctor::Extensions::BlockMacroProcessor
@@ -75,51 +81,16 @@ module Metanorma
     # Not using TreeProcessor because that is still too close to
     # inline expressions being processed on access (e.g. titles)
     class LinkProtectPreprocessor < Asciidoctor::Extensions::Preprocessor
-      def init
-        pass = true # process as passthrough: init = true until
-        # hit end of doc header
-        is_delim = false # current line is a no-substititon block delimiter
-        pass_delim = false # current line is a passthrough delimiter
-        delimln = "" # delimiter line of current block(s);
-        # init value looks for end of doc header
-        { pass: pass, is_delim: is_delim, pass_delim: pass_delim,
-          delimln: delimln }
-      end
-
       def process(document, reader)
-        p = init
+        p = Metanorma::Utils::LineStatus.new
         lines = reader.lines.map do |t|
-          p = pass_status(p, t.rstrip)
-          !p[:pass] && t.include?(":") and t = inlinelinkmacro(inlinelink(t))
+          p.process(t)
+          !p.pass && t.include?(":") and t = inlinelinkmacro(inlinelink(t))
           t
         end
         ::Asciidoctor::PreprocessorReader.new document, lines
       end
 
-      def pass_status(status, text)
-        text == "++++" && !status[:delimln] and status[:pass] = !status[:pass]
-        status[:midline_docattr] && !/^:[^ :]+: /.match?(text) and
-          status[:midline_docattr] = false
-        if (status[:is_delim] && /^(-+|\*+|=+|_+)$/.match?(text)) ||
-            (!status[:is_delim] && !status[:delimln] && /^-----*$|^\.\.\.\.\.*$/.match?(text))
-          status[:delimln] = text
-          status[:pass] = true
-        elsif status[:pass_delim]
-          status[:delimln] = "" # end of paragraph for paragraph with [pass]
-        elsif status[:delimln] && text == status[:delimln]
-          status[:pass] = false
-          status[:delimln] = nil
-        elsif /^:[^ :]+: /.match?(text) &&
-            (status[:prev_line].empty? || status[:midline_docattr])
-          status[:pass] = true
-          status[:midline_docattr] = true
-        end
-        status[:is_delim] = /^\[(source|listing|literal|pass)\b/.match?(text)
-        status[:pass_delim] = /^\[(pass)\b/.match?(text)
-        status[:prev_line] = text.strip
-        status
-      end
-
       PASS_INLINE_MACROS = %w(pass pass-format identifier std-link stem)
         .join("|").freeze
 
@@ -133,7 +104,7 @@ module Metanorma
           \\[.*?(?<!\\\\)\\]                     # [ ... ] not preceded by \\
         )
       REGEX
-      PASS_INLINE_MACRO_RX = /#{PASS_INLINE_MACRO_STR}/xo.freeze
+      PASS_INLINE_MACRO_RX = /#{PASS_INLINE_MACRO_STR}/xo
 
       def pass_inline_split(text)
         text.split(PASS_INLINE_MACRO_RX).each.map do |x|
@@ -143,7 +114,7 @@ module Metanorma
 
       # InlineLinkRx = %r((^|link:|#{CG_BLANK}|&lt;|[>\(\)\[\];"'])(\\?(?:https?|file|ftp|irc)://)(?:([^\s\[\]]+)\[(|#{CC_ALL}*?[^\\])\]|([^\s\[\]<]*([^\s,.?!\[\]<\)]))))m
       #
-      InlineLinkRx = %r((^|(?<![-\\])\blink:(?!\+)|\p{Blank}|&lt;|[<>\(\)\[\];"'])((?:https?|file|ftp|irc)://)(?:([^\s\[\]]+)(?:(\[(|.*?[^\\])\])|([^\s\[\]<]*([^\s,.?!\[\]<\)])))))m.freeze
+      InlineLinkRx = %r((^|(?<![-\\])\blink:(?!\+)|\p{Blank}|&lt;|[<>\(\)\[\];"'])((?:https?|file|ftp|irc)://)(?:([^\s\[\]]+)(?:(\[(|.*?[^\\])\])|([^\s\[\]<]*([^\s,.?!\[\]<\)])))))m
 
       def inlinelink(text)
         text.include?("://") or return text
@@ -173,7 +144,7 @@ module Metanorma
         (|[^:\\s\\[][^\\s\\[]*)          # link: ... up to [
         (\\[(|.*?[^\\\\])\\])            # [ ... ], no ]
       REGEX
-      InlineLinkMacroRx = /#{InlineLinkMacroRx1}/x.freeze
+      InlineLinkMacroRx = /#{InlineLinkMacroRx1}/x
 
       def inlinelinkmacro(text)
         (text.include?("[") &&

data/lib/metanorma/standoc/macros_embed.rb

@@ -37,18 +37,19 @@ module Metanorma
       def process(doc, reader)
         reader.eof? and return reader
         r = ::Asciidoctor::PreprocessorNoIfdefsReader.new doc, reader.lines
+        p = Metanorma::Utils::LineStatus.new
         lines = r.readlines
         headings = lines.grep(/^== /).map(&:strip)
         ret = lines.each_with_object(embed_acc(doc, r)) do |line, m|
-          process_line(line, m, headings)
+          process_line(line, m, headings, p)
         end
         return_to_document(doc, ret)
       end
 
       def embed_acc(doc, reader)
         { lines: [], hdr: [], id: [],
-          orig: doc, doc: doc, file: nil, path: nil,
-          reader: reader, prev: nil }
+          orig: doc, doc:, file: nil, path: nil,
+          reader:, prev: nil }
       end
 
       # presupposes single embed
@@ -93,13 +94,14 @@ module Metanorma
 
       def update_embeds(lines, acc, emb)
         lines.empty? or
-          acc << { file: emb[:file], path: emb[:path], lines: lines }
+          acc << { file: emb[:file], path: emb[:path], lines: }
         [[], acc]
       end
 
-      def process_line(line, acc, headings)
-        if /^embed::/.match?(line)
-          e = embed(line, acc, headings)
+      def process_line(line, acc, headings, status)
+        status.process(line)
+        if !status.pass && /^embed::/.match?(line)
+          e = embed(line, acc, headings, status)
           acc = process_embed(acc, e, acc[:prev])
         else
           acc[:lines] << line
@@ -148,7 +150,7 @@ module Metanorma
         end
       end
 
-      def embed(line, acc, headings)
+      def embed(line, acc, headings, status)
         fname, inc_path = filename(line, acc)
         lines = filter_sections(read(inc_path), headings)
         n = Asciidoctor::Document
@@ -158,12 +160,12 @@ module Metanorma
           .merge(file: fname, path: inc_path, orig: acc[:orig])
         ret[:hdr] or
           raise "Embedding an incomplete document with no header: #{ret[:path]}"
-        embed_recurse(ret, n, r, headings)
+        embed_recurse(ret, n, r, headings, status)
       end
 
-      def embed_recurse(ret, doc, reader, headings)
+      def embed_recurse(ret, doc, reader, headings, status)
         ret1 = ret[:lines].each_with_object(embed_acc(doc, reader)) do |line, m|
-          process_line(line, m, headings)
+          process_line(line, m, headings, status)
         end
         ret.merge(
           { lines: ret1[:lines], id: ret[:id] + ret1[:id],
@@ -172,7 +174,7 @@ module Metanorma
       end
 
       def strip_header(lines)
-        return { lines: lines, hdr: nil } unless !lines.empty? &&
+        return { lines:, hdr: nil } unless !lines.empty? &&
           lines.first.start_with?("= ")
 
         skip = true

data/lib/metanorma/standoc/ref.rb

@@ -27,7 +27,7 @@ module Metanorma
       def isorefmatchescode(match, _item)
         code = analyse_ref_code(match[:code])
         yr = norm_year(match[:year])
-        { code: match[:code], year: yr, match: match,
+        { code: match[:code], year: yr, match:,
           title: match[:text], usrlbl: match[:usrlbl] || code[:usrlabel],
           analyse_code: code, lang: @lang || :all }
       end
@@ -47,7 +47,7 @@ module Metanorma
       def isorefmatches2code(match, _item)
         code = analyse_ref_code(match[:code])
         { code: match[:code], no_year: true, lang: @lang || :all,
-          note: match[:fn], year: nil, match: match, analyse_code: code,
+          note: match[:fn], year: nil, match:, analyse_code: code,
           title: match[:text], usrlbl: match[:usrlbl] || code[:usrlabel] }
       end
 
@@ -77,7 +77,7 @@ module Metanorma
         code = analyse_ref_code(match[:code])
         yr = norm_year(match[:year])
         hasyr = !yr.nil? && yr != "--"
-        { code: match[:code], match: match, yr: yr, hasyr: hasyr,
+        { code: match[:code], match:, yr:, hasyr:,
           year: hasyr ? yr : nil, lang: @lang || :all,
           all_parts: true, no_year: yr == "--",
           title: match[:text], usrlbl: match[:usrlbl] || code[:usrlabel] }
@@ -162,11 +162,11 @@ module Metanorma
       def refitem1code(_item, match)
         code = analyse_ref_code(match[:code])
         ((code[:id] && code[:numeric]) || code[:nofetch]) and
-          return { code: nil, match: match, analyse_code: code,
+          return { code: nil, match:, analyse_code: code,
                    hidden: code[:hidden] }
         { code: code[:id], analyse_code: code, localfile: code[:localfile],
           year: (m = refitem1yr(code[:id])) ? m[:year] : nil,
-          title: match[:text], match: match, hidden: code[:hidden],
+          title: match[:text], match:, hidden: code[:hidden],
           usrlbl: match[:usrlbl] || code[:usrlabel], lang: @lang || :all }
       end
 
@@ -187,29 +187,26 @@ module Metanorma
       ISO_REF =
         %r{^<ref\sid="(?<anchor>[^"]+)">
       \[(?<usrlbl>\([^)]+\))?(?<code>(?:ISO|IEC)[^0-9]*\s[0-9-]+|IEV)
-      (?::(?<year>[0-9][0-9-]+))?\]</ref>,?\s*(?<text>.*)$}xm.freeze
+      (?::(?<year>[0-9][0-9-]+))?\]</ref>,?\s*(?<text>.*)$}xm
 
       ISO_REF_NO_YEAR =
         %r{^<ref\sid="(?<anchor>[^"]+)">
       \[(?<usrlbl>\([^)]+\))?(?<code>(?:ISO|IEC)[^0-9]*\s[0-9-]+):
-      (?:--|&\#821[12];)\]</ref>,?\s*
+      (?:--|–|—|&\#821[12];)\]</ref>,?\s*
         (?:<fn[^>]*>\s*<p>(?<fn>[^\]]+)</p>\s*</fn>)?,?\s?(?<text>.*)$}xm
-          .freeze
 
       ISO_REF_ALL_PARTS =
         %r{^<ref\sid="(?<anchor>[^"]+)">
       \[(?<usrlbl>\([^)]+\))?(?<code>(?:ISO|IEC)[^0-9]*\s[0-9]+)
-      (?::(?<year>--|&\#821[12];|[0-9][0-9-]+))?\s
+      (?::(?<year>--|–|—|&\#821[12];|[0-9][0-9-]+))?\s
       \(all\sparts\)\]</ref>,?\s*
-        (?:<fn[^>]*>\s*<p>(?<fn>[^\]]+)</p>\s*</fn>,?\s?)?(?<text>.*)$}xm.freeze
+        (?:<fn[^>]*>\s*<p>(?<fn>[^\]]+)</p>\s*</fn>,?\s?)?(?<text>.*)$}xm
 
       NON_ISO_REF = %r{^<ref\sid="(?<anchor>[^"]+)">
       \[(?<usrlbl>\([^)]+\))?(?<code>.+?)\]</ref>,?\s*(?<text>.*)$}xm
-        .freeze
 
       NON_ISO_REF1 = %r{^<ref\sid="(?<anchor>[^"]+)">
       (?<usrlbl>\([^)]+\))?(?<code>.+?)</ref>,?\s*(?<text>.*)$}xm
-        .freeze
 
       def reference1_matches(item)
         matched = ISO_REF.match item

data/lib/metanorma/standoc/ref_queue.rb

@@ -40,7 +40,7 @@ module Metanorma
       def reference_queue(results, size)
         (1..size).each.with_object([]) do |_, m|
           ref, i, doc = results.pop
-          m[i.to_i] = { ref: ref }
+          m[i.to_i] = { ref: }
           if doc.is_a?(RelatonBib::RequestError)
             @log.add("Bibliography", nil, "Could not retrieve #{ref[:code]}: " \
                                           "no access to online site", severity: 1)
@@ -69,7 +69,7 @@ module Metanorma
 
       def merge_publishers(base, add)
         ins = base.at("//contributor[last()]") || base.children[-1]
-        add.xpath("//contributor[role/@type = 'publisher']").reverse.each do |p|
+        add.xpath("//contributor[role/@type = 'publisher']").reverse_each do |p|
           ins.next = p
         end
       end
@@ -80,14 +80,14 @@ module Metanorma
           v.at("//docidentifier[@primary = 'true']") or
             v.at("//docidentifier")["primary"] = true
         end
-        add.xpath("//docidentifier").reverse.each do |p|
+        add.xpath("//docidentifier").reverse_each do |p|
           ins.next = p
         end
       end
 
       def merge_urls(base, add)
         ins = base.at("./uri[last()]") || base.at("./title[last()]")
-        add.xpath("./uri").reverse.each do |p|
+        add.xpath("./uri").reverse_each do |p|
           ins.next = p
         end
       end
@@ -122,16 +122,14 @@ module Metanorma
       end
 
       def local_ievcache_name(cachename)
-        return nil if cachename.nil?
-
+        cachename.nil? and return nil
         cachename += "_iev" unless cachename.empty?
         cachename = "iev" if cachename.empty?
         "#{cachename}/cache"
       end
 
       def fetch_ref(xml, code, year, **opts)
-        return nil if opts[:no_year]
-
+        opts[:no_year] and return nil
         code = code.sub(/^\([^)]+\)/, "")
         hit = fetch_ref1(code, year, opts) or return nil
         xml.parent.add_child(smart_render_xml(hit, code, opts))

data/lib/metanorma/standoc/ref_utility.rb

@@ -200,8 +200,8 @@ module Metanorma
 
       MALFORMED_REF = <<~REF.freeze
         no anchor on reference, markup may be malformed: see
-        https://www.metanorma.com/author/topics/document-format/bibliography/ ,
-        https://www.metanorma.com/author/iso/topics/markup/#bibliographies
+        https://www.metanorma.org/author/topics/sections/bibliography/ ,
+        https://www.metanorma.org/author/iso/topics/markup/#bibliographies
       REF
 
       def ref_normalise(ref)

data/lib/metanorma/standoc/section.rb

@@ -16,8 +16,7 @@ module Metanorma
             .gsub(%r{<index>.*?</index>}m, "")
             .gsub(%r{<fn[^>]*>.*?</fn>}m, "")
             .gsub(/<[^>]+>/, "")
-            .strip.downcase
-            .sub(/\.$/, "")
+            .strip.downcase.sub(/\.$/, "")
       end
 
       def sectiontype(node, level = true)
@@ -41,7 +40,8 @@ module Metanorma
           "terms, definitions and abbreviated terms"
           "terms and definitions"
         when "symbols and abbreviated terms",
-          "symbols", "abbreviated terms", "abbreviations"
+          "symbols", "abbreviated terms", "abbreviations",
+          "symbols and abbreviations"
           "symbols and abbreviated terms"
         when "acknowledgements", "acknowledgments"
           "acknowledgements"

data/lib/metanorma/standoc/terms.rb

@@ -170,7 +170,7 @@ module Metanorma
             seen_xref = Nokogiri::XML.fragment(matched[:xref])
             add_term_source(node, xml_t, seen_xref, matched)
           end
-        end.join("\n")
+        end.join("")
       end
 
       def termdefinition(node)
@@ -178,7 +178,7 @@ module Metanorma
           xml.definition **attr_code(type: node.attr("type")) do |d|
             d << node.content
           end
-        end.join("\n")
+        end.join("")
       end
     end
   end

data/lib/metanorma/standoc/validate.rb

@@ -48,7 +48,6 @@ module Metanorma
       def mathml_sanitise(math)
         math.to_xml(encoding: "US-ASCII").gsub(/ xmlns=["'][^"']+["']/, "")
           .gsub(%r{<[^:/>]+:}, "<").gsub(%r{</[^:/>]+:}, "</")
-        # .gsub(/&#([^;]+);/) { |x| "&#x#{$1.to_i.to_s(16)};" }
       end
 
       def math_validate_error(math, elem, error)
@@ -133,7 +132,7 @@ module Metanorma
         doc.xpath(WILDCARD_ATTRS, "m" => SVG_NS).each do |n|
           n.elements.each do |e|
             e.traverse do |e1|
-              e1.element? and e1.each { |k, _v| e1.delete(k) }
+              e1.element? and e1.each { |k, _v| e1.delete(k) } # rubocop:disable Style/HashEachMethods
             end
           end
         end
@@ -143,6 +142,7 @@ module Metanorma
 
       def image_validate(doc)
         image_exists(doc)
+        image_toobig(doc)
         png_validate(doc)
       end
 
@@ -183,6 +183,18 @@ module Metanorma
                  "Corrupt PNG image detected: #{e.message}")
       end
 
+      TOO_BIG_IMG_ERR = <<~ERR.freeze
+        Image too large for Data URI encoding: disable Data URI encoding (`:data-uri-image: false`), or set `:data-uri-maxsize: 0`
+      ERR
+
+      def image_toobig(doc)
+        @dataurimaxsize.zero? and return
+        doc.xpath("//image").each do |i|
+          i["src"].size > @dataurimaxsize and
+            @log.add("Images", i.parent, TOO_BIG_IMG_ERR, severity: 0)
+        end
+      end
+
       def validate(doc)
         content_validate(doc)
         schema_validate(formattedstr_strip(doc.dup),

data/lib/metanorma/standoc/version.rb

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

data/metanorma-standoc.gemspec

@@ -32,11 +32,12 @@ Gem::Specification.new do |spec|
   spec.add_dependency "asciidoctor", "~> 2.0.0"
   spec.add_dependency "crass", "~> 1.0.0"
   spec.add_dependency "iev", "~> 0.3.0"
-  spec.add_dependency "isodoc", "~> 2.10.2"
+  spec.add_dependency "isodoc", "~> 2.10.5"
   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.7.0"
+  spec.add_dependency "metanorma-utils", "~> 1.9.0"
   spec.add_dependency "ruby-jing"
   # relaton-cli not just relaton, to avoid circular reference in metanorma
   spec.add_dependency "asciimath2unitsml", "~> 0.4.0"
@@ -58,5 +59,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "timecop", "~> 0.9"
   spec.add_development_dependency "vcr", "~> 6.1.0"
   spec.add_development_dependency "webmock"
+  spec.add_development_dependency "xml-c14n"
   # spec.metadata["rubygems_mfa_required"] = "true"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.9.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-08 00:00:00.000000000 Z
+date: 2024-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.10.2
+        version: 2.10.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.10.2
+        version: 2.10.5
 - !ruby/object:Gem::Dependency
   name: metanorma
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.0
+- !ruby/object:Gem::Dependency
+  name: metanorma-utils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.9.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: ruby-jing
   requirement: !ruby/object:Gem::Requirement
@@ -402,6 +416,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: xml-c14n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |
   metanorma-standoc realises standards following the Metanorma standoc model