metanorma-standoc 1.10.4.1 → 1.10.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4de5b7f8779dae7c359b93ce364ffa7cc406156bf1437c7cdccb6595b7bd958a
-  data.tar.gz: c35902148b405e451af8487faff391b6eddbbd7b07cd2b6c8d565cd515e4515c
+  metadata.gz: 2cc836755aed6cfff989fdcbc9cf8123ccfda29418247d93fdd75ba71660cee7
+  data.tar.gz: d1c051429283a6e4153a6a3453b839786561c0975c2acda0586cb0ca787ae26a
 SHA512:
-  metadata.gz: 6e33b33321d6826a65257a3440c63218021d5d40b69fa58b268d0a2c5e8436aed951e05c7f44ab97c74b5ce916c25ad7040cc962cf38be15ee2ebaf0c6858529
-  data.tar.gz: f8f719f8062c3c71ebd2883617b984d7432134cb94da1be308e9ede34bf74def5be6267570c76ff9f248e628e443d6b71a60b9f71e1ba436b7c64eb2c2b25c13
+  metadata.gz: 1e17a3351bf46679b587a82498d5f58d97e43743bd2e6906c929aa8dcbb8ca29fdd6e38acb82252375b40e5fff520f7d6a001b023c9c79681ad61fea949c0799
+  data.tar.gz: 01dd1e74b7990b44c526616611155067c0725b0b0bcaeebe9d728c341d26acdab64c2c5be7519b22b94fd641015aec504c333c3b3da8cf6067c19999c20ab0ff

data/README.adoc

@@ -10,26 +10,24 @@ Gem for serialising the https://github.com/metanorma/metanorma-model-standoc[Met
 
 == Functionality
 
-This gem processes Metanorma documents following a template for generating standards documents, according
-to a range of standards classes. This gem provides underlying generic functionality; behaviour specific
-to each standards class is refined in the gem specific to that standards class (e.g. https://github.com/metanorma/metanorma-iso).
-The following outputs are generated.
-
-* Metanorma XML representation of the document, intended as a document model for 
-Standards. The Metanorma XML representation is processed in turn, to generate one or more of 
-the following outputs as end deliverables, depending on each standards class gem:
-* Microsoft Word output (`.doc`)
-* HTML output (`.html`)
-* PDF (`.pdf`)
+This gem processes Metanorma AsciiDoc input into the Metanorma document model.
+This gem provides underlying generic functionality; behaviour specific
+to each standards class is refined in the gem specific to that standards class
+(e.g. https://github.com/metanorma/metanorma-iso[Metanorma ISO]).
+
+The following outputs are generated:
+
+* Metanorma semantic XML
+* Metanorma presentation XML
+
+These Metanorma XML representations are processed downstream by the `isodoc` gem
+to generate other end deliverables, depending on each standards class.
 
 The following input formats are supported:
 
-* http://asciidoctor.org/[Asciidoctor]
+* Metanorma AsciiDoc
 
-This README provides an overview of the functionality of the gem; see also
-https://github.com/metanorma/metanorma-iso/blob/master/docs/guidance.adoc[Guidance for authoring].
-https://github.com/metanorma/metanorma-iso/blob/master/docs/quickstart.adoc[Quickstart guide]
-gives a summary overview.
+See the https://www.metanorma.org[Metanorma website] for more information.
 
 NOTE: http://asciimath.org[AsciiMathML] is used for mathematical formatting.
 The gem uses the https://github.com/asciidoctor/asciimath[Ruby AsciiMath parser],
@@ -39,21 +37,19 @@ expressions.
 
 === Installation
 
-If you are using a Mac, the https://github.com/metanorma/metanorma-macos-setup
-repository has instructions on setting up your machine to run Metanorma
-scripts such as this one. You need only run the following in a Terminal console:
+See the https://www.metanorma.org[Metanorma website] for instructions.
+
+In the terminal:
 
 [source,console]
 ----
-$ bash <(curl -s https://raw.githubusercontent.com/metanorma/metanorma-macos-setup/master/metanorma-setup)
 $ gem install metanorma-standoc
 $ gem install metanorma-cli 
 ----
 
-The metanorma-cli gem is the command-line interface for the Metanorma tool suite
+`metanorma-cli` is the command-line interface for the Metanorma suite
 (incorporating the `metanorma` executable seen above).
 
 == Documentation
 
-See http://metanorma.com[]
-
+See the https://www.metanorma.org[Metanorma website] for details.

data/lib/asciidoctor/standoc/base.rb

@@ -23,17 +23,6 @@ module Asciidoctor
         self.class::XML_NAMESPACE
       end
 
-      def content(node)
-        node.content
-      end
-
-      def skip(node, name = nil)
-        name = name || node.node_name
-        w = "converter missing for #{name} node in Metanorma backend"
-        @log.add("AsciiDoc Input", node, w)
-        nil
-      end
-
       def html_extract_attributes(node)
         {
           script: node.attr("script"),
@@ -53,8 +42,11 @@ module Asciidoctor
           htmltoclevels: node.attr("htmltoclevels") || node.attr("toclevels"),
           doctoclevels: node.attr("doctoclevels") || node.attr("toclevels"),
           break_up_urls_in_tables: node.attr("break-up-urls-in-tables"),
+          suppressasciimathdup: node.attr("suppress-asciimath-dup"),
           bare: node.attr("bare"),
           sectionsplit: node.attr("sectionsplit"),
+          baseassetpath: node.attr("base-asset-path"),
+          aligncrosselements: node.attr("align-cross-elements"),
         }
       end
 
@@ -87,7 +79,10 @@ module Asciidoctor
           htmltoclevels: node.attr("htmltoclevels") || node.attr("toclevels"),
           doctoclevels: node.attr("doctoclevels") || node.attr("toclevels"),
           break_up_urls_in_tables: node.attr("break-up-urls-in-tables"),
+          suppressasciimathdup: node.attr("suppress-asciimath-dup"),
           bare: node.attr("bare"),
+          baseassetpath: node.attr("base-asset-path"),
+          aligncrosselements: node.attr("align-cross-elements"),
         }
 
         if font_manifest_file = node.attr("mn2pdf-font-manifest-file")
@@ -122,8 +117,7 @@ module Asciidoctor
         @files_to_delete = []
         @filename = if node.attr("docfile")
                       File.basename(node.attr("docfile"))&.gsub(/\.adoc$/, "")
-                    else
-                      ""
+                    else ""
                     end
         @localdir = Metanorma::Utils::localdir(node)
         @output_dir = outputdir node
@@ -172,6 +166,10 @@ module Asciidoctor
         outputs(node, ret) unless node.attr("nodoc") || !node.attr("docfile")
         clean_exit
         ret
+      rescue StandardError => e
+        @log.add("Fatal Error", nil, e.message)
+        clean_exit
+        raise e
       end
 
       def version

data/lib/asciidoctor/standoc/basicdoc.rng

@@ -624,6 +624,9 @@
         <choice>
           <ref name="PureTextElement"/>
           <ref name="stem"/>
+          <ref name="eref"/>
+          <ref name="xref"/>
+          <ref name="hyperlink"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -634,6 +637,9 @@
         <choice>
           <ref name="PureTextElement"/>
           <ref name="stem"/>
+          <ref name="eref"/>
+          <ref name="xref"/>
+          <ref name="hyperlink"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -641,7 +647,12 @@
   <define name="tt">
     <element name="tt">
       <zeroOrMore>
-        <ref name="PureTextElement"/>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="eref"/>
+          <ref name="xref"/>
+          <ref name="hyperlink"/>
+        </choice>
       </zeroOrMore>
     </element>
   </define>
@@ -822,7 +833,9 @@
       <attribute name="alt"/>
     </optional>
     <ref name="CitationType"/>
-    <text/>
+    <oneOrMore>
+      <ref name="PureTextElement"/>
+    </oneOrMore>
   </define>
   <define name="hyperlink">
     <element name="link">
@@ -835,7 +848,9 @@
       <optional>
         <attribute name="alt"/>
       </optional>
-      <text/>
+      <oneOrMore>
+        <ref name="PureTextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="xref">
@@ -849,7 +864,9 @@
       <optional>
         <attribute name="alt"/>
       </optional>
-      <text/>
+      <oneOrMore>
+        <ref name="PureTextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="fn">

data/lib/asciidoctor/standoc/blocks.rb

@@ -6,14 +6,17 @@ module Asciidoctor
   module Standoc
     module Blocks
       def id_attr(node = nil)
-        { id: Metanorma::Utils::anchor_or_uuid(node) }
+        { id: Metanorma::Utils::anchor_or_uuid(node),
+          tag: node&.attr("tag"),
+          "multilingual-rendering": node&.attr("multilingual-rendering") }
       end
 
       def id_unnum_attrs(node)
-        attr_code(id: Metanorma::Utils::anchor_or_uuid(node),
-                  unnumbered: node.option?("unnumbered") ? "true" : nil,
-                  number: node.attr("number"),
-                  subsequence: node.attr("subsequence"))
+        attr_code(id_attr(node).merge(
+                    unnumbered: node.option?("unnumbered") ? "true" : nil,
+                    number: node.attr("number"),
+                    subsequence: node.attr("subsequence"),
+                  ))
       end
 
       def formula_attrs(node)
@@ -33,6 +36,7 @@ module Asciidoctor
         role = node.role || node.attr("style")
         reqt_subpart(role) and return requirement_subpart(node)
         role == "form" and return form(node)
+        role == "definition" and return termdefinition(node)
         result = []
         node.blocks.each do |b|
           result << send(b.context, b)
@@ -42,10 +46,9 @@ module Asciidoctor
 
       def form(node)
         noko do |xml|
-          xml.form **attr_code(
-            id: Metanorma::Utils::anchor_or_uuid, class: node.attr("class"),
-            name: node.attr("name"), action: node.attr("action")
-          ) do |f|
+          xml.form **attr_code(id_attr(node)
+            .merge(class: node.attr("class"),
+                   name: node.attr("name"), action: node.attr("action"))) do |f|
             f << node.content
           end
         end
@@ -77,7 +80,7 @@ module Asciidoctor
 
       def term_example(node)
         noko do |xml|
-          xml.termexample **id_attr(node) do |ex|
+          xml.termexample **attr_code(id_attr(node)) do |ex|
             wrap_in_para(node, ex)
           end
         end.join("\n")
@@ -92,15 +95,18 @@ module Asciidoctor
         return pseudocode_example(node) if role == "pseudocode"
         return svgmap_example(node) if role == "svgmap"
         return form(node) if role == "form"
+        return termdefinition(node) if role == "definition"
 
+        reqt_subpart(role) and return requirement_subpart(node)
         example_proper(node)
       end
 
       def svgmap_attrs(node)
-        attr_code({ id: node.id,
-                    unnumbered: node.option?("unnumbered") ? "true" : nil,
-                    number: node.attr("number"),
-                    subsequence: node.attr("subsequence") }
+        attr_code(id_attr(node)
+          .merge(id: node.id,
+                 unnumbered: node.option?("unnumbered") ? "true" : nil,
+                 number: node.attr("number"),
+                 subsequence: node.attr("subsequence"))
         .merge(keep_attrs(node)))
       end
 
@@ -159,9 +165,10 @@ module Asciidoctor
       end
 
       def para_attrs(node)
-        attr_code(keep_attrs(node)
+        attr_code(id_attr(node).merge(keep_attrs(node)
           .merge(align: node.attr("align"),
-                 id: Metanorma::Utils::anchor_or_uuid(node)))
+                 variant_title: node.role == "variant-title" ? true : nil,
+                 type: node.attr("type"))))
       end
 
       def paragraph(node)
@@ -175,9 +182,8 @@ module Asciidoctor
       end
 
       def quote_attrs(node)
-        attr_code(keep_attrs(node)
-          .merge(align: node.attr("align"),
-                 id: Metanorma::Utils::anchor_or_uuid(node)))
+        attr_code(id_attr(node).merge(keep_attrs(node))
+          .merge(align: node.attr("align")))
       end
 
       def quote_attribution(node, out)
@@ -201,12 +207,11 @@ module Asciidoctor
       end
 
       def listing_attrs(node)
-        attr_code(keep_attrs(node)
+        attr_code(id_attr(node).merge(keep_attrs(node)
                   .merge(lang: node.attr("language"),
-                         id: Metanorma::Utils::anchor_or_uuid(node),
                          unnumbered: node.option?("unnumbered") ? "true" : nil,
                          number: node.attr("number"),
-                         filename: node.attr("filename")))
+                         filename: node.attr("filename"))))
       end
 
       # NOTE: html escaping is performed by Nokogiri

data/lib/asciidoctor/standoc/blocks_notes.rb

@@ -2,24 +2,21 @@ module Asciidoctor
   module Standoc
     module Blocks
       def termnote_attrs(node)
-        attr_code(
-          id_attr(node).merge(
+        attr_code(id_attr(node).merge(keep_attrs(node)
+          .merge(
             unnumbered: node.attr("unnumbered"),
             number: node.attr("number"),
             subsequence: node.attr("subsequence"),
-            "keep-with-next": node.attr("keep-with-next"),
-            "keep-lines-together": node.attr("keep-with-next"),
-            "keep-separate": node.attr("keep-separate")
-          )
-        )
+            "keep-separate": node.attr("keep-separate"),
+          )))
       end
 
       def note_attrs(node)
         attr_code(
           termnote_attrs(node).merge(
             type: node.attr("type"),
-            beforeclauses: node.attr("beforeclauses") == "true" ? "true" : nil
-          )
+            beforeclauses: node.attr("beforeclauses") == "true" ? "true" : nil,
+          ),
         )
       end
 
@@ -27,8 +24,8 @@ module Asciidoctor
         todo_attrs(node).merge(
           attr_code(
             from: node.attr("from"),
-            to: node.attr("to") || node.attr("from")
-          )
+            to: node.attr("to") || node.attr("from"),
+          ),
         )
       end
 
@@ -45,11 +42,10 @@ module Asciidoctor
       def todo_attrs(node)
         date = node.attr("date") || Date.today.iso8601.gsub(/\+.*$/, "")
         date += "T00:00:00Z" unless /T/.match? date
-        attr_code(
-          id: ::Metanorma::Utils::anchor_or_uuid(node),
-          reviewer: node.attr("reviewer") || node.attr("source") || "(Unknown)",
-          date: date
-        )
+        attr_code(id_attr(node)
+          .merge(reviewer: node.attr("reviewer") || node.attr("source") ||
+                 "(Unknown)",
+                 date: date))
       end
 
       def todo(node)
@@ -81,12 +77,11 @@ module Asciidoctor
         a = node.attr("type") and ["danger", "safety precautions"].each do |t|
           name = t if a.casecmp(t).zero?
         end
-        attr_code(
-          keep_attrs(node).merge(
-            id: Metanorma::Utils::anchor_or_uuid(node), type: name,
-            beforeclauses: node.attr("beforeclauses") == "true" ? "true" : nil
-          )
-        )
+        attr_code(keep_attrs(node).merge(id_attr(node)
+          .merge(
+            type: name,
+            beforeclauses: node.attr("beforeclauses") == "true" ? "true" : nil,
+          )))
       end
 
       def admonition(node)

data/lib/asciidoctor/standoc/cleanup.rb

@@ -2,30 +2,25 @@ require "nokogiri"
 require "pathname"
 require "html2doc"
 require_relative "./cleanup_block"
+require_relative "./cleanup_table"
 require_relative "./cleanup_footnotes"
 require_relative "./cleanup_ref"
 require_relative "./cleanup_ref_dl"
 require_relative "./cleanup_boilerplate"
 require_relative "./cleanup_section"
 require_relative "./cleanup_terms"
+require_relative "./cleanup_xref"
 require_relative "./cleanup_inline"
 require_relative "./cleanup_amend"
 require_relative "./cleanup_maths"
 require_relative "./cleanup_image"
 require_relative "./cleanup_reqt"
+require_relative "./cleanup_text"
 require "relaton_iev"
 
 module Asciidoctor
   module Standoc
     module Cleanup
-      def textcleanup(result)
-        text = result.flatten.map { |l| l.sub(/\s*$/, "") } * "\n"
-        !@keepasciimath and text = asciimath2mathml(text)
-        text = text.gsub(/\s+<fn /, "<fn ")
-        text.gsub(%r{<passthrough\s+formats="metanorma">([^<]*)
-                  </passthrough>}mx) { HTMLEntities.new.decode($1) }
-      end
-
       def cleanup(xmldoc)
         element_name_cleanup(xmldoc)
         sections_cleanup(xmldoc)
@@ -72,63 +67,6 @@ module Asciidoctor
         xmldoc
       end
 
-      IGNORE_DUMBQUOTES = "//pre | //pre//* | //tt | //tt//* | "\
-        "//sourcecode | //sourcecode//* | //bibdata//* | //stem | "\
-        "//stem//* | //figure[@class = 'pseudocode'] | "\
-        "//figure[@class = 'pseudocode']//*".freeze
-
-      def smartquotes_cleanup(xmldoc)
-        xmldoc.xpath("//date").each { |d| Metanorma::Utils::endash_date(d) }
-        if @smartquotes then smartquotes_cleanup1(xmldoc)
-        else dumbquote_cleanup(xmldoc)
-        end
-      end
-
-      def smartquotes_cleanup1(xmldoc)
-        uninterrupt_quotes_around_xml(xmldoc)
-        dumb2smart_quotes(xmldoc)
-      end
-
-      # "abc<tag/>", def => "abc",<tag/> def
-      def uninterrupt_quotes_around_xml(xmldoc)
-        xmldoc.xpath("//*[following::text()[1]"\
-                     "[starts-with(., '\"') or starts-with(., \"'\")]]")
-          .each do |x|
-          next if !x.ancestors("pre, tt, sourcecode, stem, figure").empty?
-          uninterrupt_quotes_around_xml1(x)
-        end
-      end
-
-      def uninterrupt_quotes_around_xml1(elem)
-        prev = elem.at(".//preceding::text()[1]") or return
-        /\S$/.match?(prev.text) or return
-        foll = elem.at(".//following::text()[1]")
-        m = /^(["'][[:punct:]]*)(\s|$)/.match(HTMLEntities.new.decode(foll&.text)) or return
-        foll.content = foll.text.sub(/^(["'][[:punct:]]*)/, "")
-        prev.content = "#{prev.text}#{m[1]}"
-      end
-
-      def dumb2smart_quotes(xmldoc)
-        (xmldoc.xpath("//*[child::text()]") - xmldoc.xpath(IGNORE_DUMBQUOTES))
-          .each do |x|
-          x.children.each do |n|
-            next unless n.text?
-
-            /[-'"(<>]|\.\.|\dx/.match(n) or next
-
-            n.replace(Metanorma::Utils::smartformat(n.text))
-          end
-        end
-      end
-
-      def dumbquote_cleanup(xmldoc)
-        xmldoc.traverse do |n|
-          next unless n.text?
-
-          n.replace(n.text.gsub(/(?<=\p{Alnum})\u2019(?=\p{Alpha})/, "'")) # .
-        end
-      end
-
       def docidentifier_cleanup(xmldoc); end
 
       TEXT_ELEMS =
@@ -172,8 +110,8 @@ module Asciidoctor
 
           c.xpath("./variant").each do |n|
             if n.at_xpath("preceding-sibling::node()"\
-                "[not(self::text()[not(normalize-space())])][1]"\
-                "[self::variantwrap]")
+                          "[not(self::text()[not(normalize-space())])][1]"\
+                          "[self::variantwrap]")
               n.previous_element << n
             else
               n.replace("<variantwrap/>").first << n
@@ -193,21 +131,26 @@ module Asciidoctor
       end
 
       def toc_cleanup(xmldoc)
+        toc_cleanup_para(xmldoc)
+        xmldoc.xpath("//toc").each { |t| toc_cleanup1(t, xmldoc) }
+        toc_cleanup_clause(xmldoc)
+      end
+
+      def toc_cleanup_para(xmldoc)
         xmldoc.xpath("//p[toc]").each do |x|
           x.xpath("./toc").reverse.each do |t|
             x.next = t
           end
           x.remove if x.text.strip.empty?
         end
-        xmldoc.xpath("//toc").each { |t| toc_cleanup1(t, xmldoc) }
       end
 
       def toc_index(toc, xmldoc)
-        depths = toc.xpath("./toc-xpath").each_with_object({}) do |x, m|
-          m[x.text] = x["depth"]
-        end
+        depths = toc_index_depths(toc)
         depths.keys.each_with_object([]) do |key, arr|
           xmldoc.xpath(key).each do |x|
+            t = x.at("./following-sibling::variant-title[@type = 'toc']") and
+              x = t
             arr << { text: x.children.to_xml, depth: depths[key].to_i,
                      target: x.xpath("(./ancestor-or-self::*/@id)[last()]")[0].text,
                      line: x.line }
@@ -215,6 +158,12 @@ module Asciidoctor
         end.sort_by { |a| a[:line] }
       end
 
+      def toc_index_depths(toc)
+        toc.xpath("./toc-xpath").each_with_object({}) do |x, m|
+          m[x.text] = x["depth"]
+        end
+      end
+
       def toc_cleanup1(toc, xmldoc)
         depth = 1
         ret = ""
@@ -227,6 +176,24 @@ module Asciidoctor
         end
         toc.children = "<ul>#{ret}</ul>"
       end
+
+      def toc_cleanup_clause(xmldoc)
+        xmldoc
+          .xpath("//clause[@type = 'toc'] | //annex[@type = 'toc']").each do |c|
+          c.xpath(".//ul[not(ancestor::ul)]").each do |ul|
+            toc_cleanup_clause_entry(xmldoc, ul)
+            ul.replace("<toc>#{ul.to_xml}</toc>")
+          end
+        end
+      end
+
+      def toc_cleanup_clause_entry(xmldoc, list)
+        list.xpath(".//xref[not(text())]").each do |x|
+          c1 = xmldoc.at("//*[@id = '#{x['target']}']")
+          t = c1.at("./variant-title[@type = 'toc']") || c1.at("./title")
+          x << t.dup.children
+        end
+      end
     end
   end
 end

data/lib/asciidoctor/standoc/cleanup_block.rb

@@ -7,10 +7,9 @@ module Asciidoctor
       def para_cleanup(xmldoc)
         ["//p[not(ancestor::bibdata)]", "//ol[not(ancestor::bibdata)]",
          "//ul[not(ancestor::bibdata)]", "//quote[not(ancestor::bibdata)]",
-         "//note[not(ancestor::bibitem or ancestor::table or ancestor::bibdata)]"].each do |w|
-          inject_id(
-            xmldoc, w
-          )
+         "//note[not(ancestor::bibitem or "\
+         "ancestor::table or ancestor::bibdata)]"].each do |w|
+          inject_id(xmldoc, w)
         end
       end
 
@@ -20,68 +19,6 @@ module Asciidoctor
         end
       end
 
-      def dl1_table_cleanup(xmldoc)
-        q = "//table/following-sibling::*[1][self::dl]"
-        xmldoc.xpath(q).each do |s|
-          s["key"] == "true" and s.previous_element << s.remove
-        end
-      end
-
-      # move Key dl after table footer
-      def dl2_table_cleanup(xmldoc)
-        q = "//table/following-sibling::*[1][self::p]"
-        xmldoc.xpath(q).each do |s|
-          if s.text =~ /^\s*key[^a-z]*$/i && s&.next_element&.name == "dl"
-            s.next_element["key"] = "true"
-            s.previous_element << s.next_element.remove
-            s.remove
-          end
-        end
-      end
-
-      def insert_thead(table)
-        thead = table.at("./thead")
-        return thead unless thead.nil?
-
-        if tname = table.at("./name")
-          thead = tname.add_next_sibling("<thead/>").first
-          return thead
-        end
-        table.children.first.add_previous_sibling("<thead/>").first
-      end
-
-      def header_rows_cleanup(xmldoc)
-        xmldoc.xpath("//table[@headerrows]").each do |s|
-          thead = insert_thead(s)
-          (thead.xpath("./tr").size...s["headerrows"].to_i).each do
-            row = s.at("./tbody/tr")
-            row.parent = thead
-          end
-          thead.xpath(".//td").each { |n| n.name = "th" }
-          s.delete("headerrows")
-        end
-      end
-
-      def table_cleanup(xmldoc)
-        dl1_table_cleanup(xmldoc)
-        dl2_table_cleanup(xmldoc)
-        notes_table_cleanup(xmldoc)
-        header_rows_cleanup(xmldoc)
-      end
-
-      # move notes into table
-      def notes_table_cleanup(xmldoc)
-        nomatches = false
-        until nomatches
-          q = "//table/following-sibling::*[1][self::note]"
-          nomatches = true
-          xmldoc.xpath(q).each do |n|
-            n.previous_element << n.remove
-            nomatches = false
-          end
-        end
-      end
-
       # include where definition list inside stem block
       def formula_cleanup(formula)
         formula_cleanup_where1(formula)
@@ -213,18 +150,16 @@ module Asciidoctor
       end
 
       def sourcecode_markup(node)
-        acc = []
         node.text.split(/(#{Regexp.escape(@sourcecode_markup_start)}|
                           #{Regexp.escape(@sourcecode_markup_end)})/x)
-          .each_slice(4).map do |a|
+          .each_slice(4).map.with_object([]) do |a, acc|
           acc << safe_noko(a[0], node.document)
           next unless a.size == 4
 
           acc << Asciidoctor.convert(
             a[2], doctype: :inline, backend: (self&.backend&.to_sym || :standoc)
           )
-        end
-        acc.join
+        end.join
       end
 
       def form_cleanup(xmldoc)