metanorma-standoc 1.10.6 → 1.11.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5982aeb8f67b56ccf4da3cf8589b3855fda38e646650074f8804d8e94de9a791
-  data.tar.gz: 6efa1a3eb9fce06dfcce893c835152a2ee642418cd35f06981d4a3d7e4408832
+  metadata.gz: 7cb09afdb6668a003d8ef2b58d6260631b7b8e068d3ca16baeee26535c8186d0
+  data.tar.gz: 76b254bc985ef940d8224c85202f001cd8660a681386b8b1e774bde626314ff5
 SHA512:
-  metadata.gz: 4d4cd2f1c480899fe9221482e53bff2702d96cc1688937b15b993eddcddbca80cb7c5d931913ceaa5e06f9c0b6a70723fc3a84c275a259c5a9bb21fb8b3d42fe
-  data.tar.gz: 61cf1ff021b2f6365ad83311478732ed431dc2f3328e11ec1a96ebfa264c463ded7198779a86928bb3a82ce4153f4934b96aeccccff5d136d3018cd9b6025173
+  metadata.gz: 893626c5998b7853394c39a0e4249f1a11346d0beb5cc00a9f76edc8ce129cf591ba6819ed6974b34a115f89b82c64b8acccf3c2dfcd71dcb20226c90653e62a
+  data.tar.gz: c10c585b0274e9be19b848c9dcc175a1ef9325ee0dc875bc1b1aafb057c3fcea1c235488c986093980bc5ce6710d293c053a68d3954aae40365def0071d244e6

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/Rakefile

@@ -1,6 +1,6 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
-require 'isodoc/gem_tasks'
+require "isodoc/gem_tasks"
 
 IsoDoc::GemTasks.install
 RSpec::Core::RakeTask.new(:spec)

data/lib/asciidoctor/standoc/base.rb

@@ -14,6 +14,7 @@ module Asciidoctor
     module Base
       XML_ROOT_TAG = "standard-document".freeze
       XML_NAMESPACE = "https://www.metanorma.org/ns/standoc".freeze
+      FONTS_MANIFEST = "fonts-manifest".freeze
 
       def xml_root_tag
         self.class::XML_ROOT_TAG
@@ -23,17 +24,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"),
@@ -49,13 +39,15 @@ module Asciidoctor
           scripts: node.attr("scripts"),
           scripts_override: node.attr("scripts-override"),
           scripts_pdf: node.attr("scripts-pdf"),
-          datauriimage: node.attr("data-uri-image"),
+          datauriimage: node.attr("data-uri-image") != "false",
           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
 
@@ -90,11 +82,13 @@ module Asciidoctor
           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")
+        if fonts_manifest = node.attr(FONTS_MANIFEST)
           attrs[IsoDoc::XslfoPdfConvert::MN2PDF_OPTIONS] = {
-            IsoDoc::XslfoPdfConvert::MN2PDF_FONT_MANIFEST => font_manifest_file,
+            IsoDoc::XslfoPdfConvert::MN2PDF_FONT_MANIFEST => fonts_manifest,
           }
         end
 
@@ -124,8 +118,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
@@ -135,7 +128,7 @@ module Asciidoctor
         @sourcecode_markup_end = node.attr("sourcecode-markup-end") || "}}}"
         @bibdb = nil
         @seen_headers = []
-        @datauriimage = node.attr("data-uri-image")
+        @datauriimage = node.attr("data-uri-image") != "false"
         @boilerplateauthority = node.attr("boilerplate-authority")
         @sourcecode_markup_start = node.attr("sourcecode-markup-start") || "{{{"
         @sourcecode_markup_end = node.attr("sourcecode-markup-end") || "}}}"

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)
@@ -43,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
@@ -78,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")
@@ -100,10 +102,11 @@ module Asciidoctor
       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
 
@@ -162,11 +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"),
                  variant_title: node.role == "variant-title" ? true : nil,
-                 type: node.attr("type"),
-                 id: Metanorma::Utils::anchor_or_uuid(node)))
+                 type: node.attr("type"))))
       end
 
       def paragraph(node)
@@ -180,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)
@@ -206,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,12 +2,15 @@ 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_symbols"
+require_relative "./cleanup_xref"
 require_relative "./cleanup_inline"
 require_relative "./cleanup_amend"
 require_relative "./cleanup_maths"
@@ -39,6 +42,7 @@ module Asciidoctor
         symbols_cleanup(xmldoc)
         xref_cleanup(xmldoc)
         concept_cleanup(xmldoc)
+        related_cleanup(xmldoc)
         origin_cleanup(xmldoc)
         bookmark_cleanup(xmldoc)
         termdef_cleanup(xmldoc)
@@ -71,7 +75,8 @@ module Asciidoctor
         %w{status language script version author name callout phone email
            street city state country postcode identifier referenceFrom surname
            referenceTo docidentifier docnumber prefix initial addition forename
-           title draft secretariat title-main title-intro title-part}.freeze
+           title draft secretariat title-main title-intro title-part
+           verbaldefinition nonverbalrepresentation}.freeze
 
       # it seems Nokogiri::XML is treating the content of <script> as cdata,
       # because of its use in HTML. Bad nokogiri. Undoing that, since we use
@@ -81,7 +86,9 @@ module Asciidoctor
       end
 
       def empty_element_cleanup(xmldoc)
-        xmldoc.xpath("//" + TEXT_ELEMS.join(" | //")).each do |x|
+        xmldoc.xpath("//#{TEXT_ELEMS.join(' | //')}").each do |x|
+          next if x.name == "name" && x.parent.name == "expression"
+
           x.remove if x.children.empty?
         end
       end
@@ -106,19 +113,23 @@ module Asciidoctor
             n.name != "variant" && (!n.text? || !n.text.gsub(/\s/, "").empty?)
           end
 
-          c.xpath("./variant").each do |n|
-            if n.at_xpath("preceding-sibling::node()"\
-                          "[not(self::text()[not(normalize-space())])][1]"\
-                          "[self::variantwrap]")
-              n.previous_element << n
-            else
-              n.replace("<variantwrap/>").first << n
-            end
-          end
+          variant_cleanup1(c)
         end
         xmldoc.xpath("//variantwrap").each { |n| n.name = "variant" }
       end
 
+      def variant_cleanup1(elem)
+        elem.xpath("./variant").each do |n|
+          if n.at_xpath("preceding-sibling::node()"\
+                        "[not(self::text()[not(normalize-space())])][1]"\
+                        "[self::variantwrap]")
+            n.previous_element << n
+          else
+            n.replace("<variantwrap/>").first << n
+          end
+        end
+      end
+
       def variant_space_cleanup(xmldoc)
         xmldoc.xpath("//*[variant]").each do |c|
           if c&.next&.text? && c&.next&.next&.name == "variant"
@@ -129,13 +140,18 @@ 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)
@@ -169,6 +185,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

@@ -9,9 +9,7 @@ module Asciidoctor
          "//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
-          )
+          inject_id(xmldoc, w)
         end
       end
 
@@ -21,70 +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[not(@keep-separate = 'true')]]"
-          nomatches = true
-          xmldoc.xpath(q).each do |n|
-            n.delete("keep-separate")
-            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)
@@ -216,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)

data/lib/asciidoctor/standoc/cleanup_image.rb

@@ -15,9 +15,8 @@ module Asciidoctor
       def svgmap_moveattrs(xmldoc)
         xmldoc.xpath("//svgmap").each do |s|
           f = s.at(".//figure") or next
-          if (t = s.at("./name")) && !f.at("./name")
+          (t = s.at("./name")) && !f.at("./name") and
             f.children.first.previous = t.remove
-          end
           if s["id"] && guid?(f["id"])
             f["id"] = s["id"]
             s.delete("id")
@@ -26,13 +25,13 @@ module Asciidoctor
         end
       end
 
-      def svgmap_moveattrs1(s, f)
+      def svgmap_moveattrs1(svgmap, figure)
         %w(unnumbered number subsequence keep-with-next
-           keep-lines-together).each do |a|
-          next if f[a] || !s[a]
+           keep-lines-together tag multilingual-rendering).each do |a|
+          next if figure[a] || !svgmap[a]
 
-          f[a] = s[a]
-          s.delete(a)
+          figure[a] = svgmap[a]
+          svgmap.delete(a)
         end
       end