metanorma-standoc 3.1.1 → 3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0a69974476cfd73fd74d1072ae10647b54c1c9f55d3cfb3d3cf9151a3f8be12
-  data.tar.gz: ed1cb04fdc539fafe18e87c4f7b173e9394644425b3791fa56bca4eb6935cd48
+  metadata.gz: 0b781bd30313479321cf23297d77787c8500bda06c74a76028853f9b28d30510
+  data.tar.gz: bbdf82ad80d7a6b9f1f21582d7ab6eeb58b365d4aea706a49046d74b4e6309ad
 SHA512:
-  metadata.gz: 2a2306e053d66020cfc017e973c30770eb00db604e12bcdccfdccd303fe2b8ddc2c87d7783067665b666e1db49c6c11044a29ae8420b5d72793c5363a9524d04
-  data.tar.gz: eda982b66f7f780b1d8ef7a7d48d5063154446792a5e5f50e5e3bd1470036896bba1d6f8060858a498f01d55a06c4d9f2b4c87fe8cbb67aec2bb1b6fffeee699
+  metadata.gz: 398ae3eaa49e8d22a4612adecf703cc4d3d7ae1b4a056f29289e5e9517be690253a1fadabf67ef1d030763992c5d97b405cc8296275df5a98eb5fc40386b93da
+  data.tar.gz: 994a1d4820b1a68e2768ca5c189788f89a7487c1e9dd63f09178aed9c1dfd558f416a1c8521834c5e8d39b294f9a488a61778f3490e5e3aad04b10d7b5bcc386

data/README.adoc

@@ -2,7 +2,7 @@
 
 image:https://img.shields.io/gem/v/metanorma-standoc.svg["Gem Version", link="https://rubygems.org/gems/metanorma-standoc"]
 image:https://github.com/metanorma/metanorma-standoc/workflows/rake/badge.svg["Build Status", link="https://github.com/metanorma/metanorma-standoc/actions?workflow=rake"]
-image:https://codeclimate.com/github/metanorma/metanorma-standoc/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/metanorma-standoc"]
+// image:https://codeclimate.com/github/metanorma/metanorma-standoc/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/metanorma-standoc"]
 image:https://img.shields.io/github/issues-pr-raw/metanorma/metanorma-standoc.svg["Pull Requests", link="https://github.com/metanorma/metanorma-standoc/pulls"]
 image:https://img.shields.io/github/commits-since/metanorma/metanorma-standoc/latest.svg["Commits since latest",link="https://github.com/metanorma/metanorma-standoc/releases"]
 

data/lib/metanorma/standoc/base.rb

@@ -139,7 +139,7 @@ module Metanorma
           %w(presentation semantic).each do |t|
             /^#{t}-metadata-/.match?(k) or next
             k = k.sub(/^#{t}-metadata-/, "")
-            quoted_csv_split(v)&.each do |c|
+            quoted_csv_split(v.gsub("&#", "&#"))&.each do |c|
               ret << "<#{t}-metadata><#{k}>#{c}</#{k}></#{t}-metadata>"
             end
           end

data/lib/metanorma/standoc/basicdoc.rng

@@ -198,14 +198,14 @@ Applicable to modify and delete</a:documentation>
         </zeroOrMore>
       </element>
     </optional>
-    <optional>
+    <zeroOrMore>
       <element name="description">
-        <a:documentation>Description of the change described in this block</a:documentation>
-        <zeroOrMore>
+        <a:documentation>Description(s) of the change described in this block</a:documentation>
+        <oneOrMore>
           <ref name="BasicBlock"/>
-        </zeroOrMore>
+        </oneOrMore>
       </element>
-    </optional>
+    </zeroOrMore>
     <optional>
       <element name="newcontent">
         <a:documentation>New content to be added to the document; applicable to add and modify</a:documentation>
@@ -1291,13 +1291,13 @@ Restricted recursively to contain only other such inline elements with no identi
       <ref name="pure_strike"/>
       <ref name="pure_smallcap"/>
       <ref name="br"/>
+      <ref name="stem"/>
     </choice>
   </define>
   <define name="NestedTextElement">
     <a:documentation>Contents of TextElement tags: leaves out tags that should occur only at top level of block: bookmark image hr pagebreak</a:documentation>
     <choice>
       <ref name="PureTextElement"/>
-      <ref name="stem"/>
       <ref name="eref"/>
       <ref name="xref"/>
       <ref name="hyperlink"/>

data/lib/metanorma/standoc/blocks.rb

@@ -161,12 +161,15 @@ module Metanorma
                  type: node.attr("type"))))
       end
 
-      # term sources occasionally turning up as "source source"?
+      # TODO: term sources occasionally turning up as "source source"?
       def paragraph(node)
         node.role&.sub(/ .*$/, "") == "source" and return termsource(node)
+        content = node.content
+        content.start_with?("TODO: ") and return todo_prefixed_para(node)
+        content.start_with?("EDITOR: ") and return editor_prefixed_para(node)
         noko do |xml|
           xml.p **para_attrs(node) do |xml_t|
-            xml_t << node.content
+            xml_t << content
           end
         end
       end

data/lib/metanorma/standoc/blocks_notes.rb

@@ -46,6 +46,20 @@ module Metanorma
         end
       end
 
+      # -TO-DO :
+      def todo_prefixed_para(node)
+        node.lines[0].sub!(/^TODO: /, "")
+        todo(node)
+      end
+
+      # EDITOR:
+      def editor_prefixed_para(node)
+        node.lines[0].sub!(/^EDITOR: /, "")
+        node.set_attr("type", "editorial")
+        node.assign_caption "EDITOR"
+        admonition(node)
+      end
+
       def termnote(node)
         noko do |xml|
           xml.termnote **termnote_attrs(node) do |ex|

data/lib/metanorma/standoc/cleanup_bibitem.rb

@@ -6,6 +6,9 @@ module Metanorma
           ret = new_bibitem_from_formattedref_spans(b)
           merge_bibitem_from_formattedref_spans(b, ret)
         end
+        xmldoc.xpath("//bibitem[@amend]").each do |b|
+          b.delete("amend")
+        end
       end
 
       def new_bibitem_from_formattedref_spans(bib)
@@ -18,9 +21,12 @@ module Metanorma
 
       def merge_bibitem_from_formattedref_spans(bib, new)
         new["type"] and bib["type"] = new["type"]
-        if bib.at("./title") # there already is a fetched record here: merge
+        if bib.at("./title") && bib["amend"]
+          # there already is a fetched record here: merge
           bib.children = MergeBibitems
             .new(bib.to_xml, new.to_xml).merge.to_noko.children
+        elsif bib.at("./title") # replace record
+          bib.children = new.children.to_xml
         else bib << new.children.to_xml
         end
       end

data/lib/metanorma/standoc/cleanup_block.rb

@@ -211,8 +211,8 @@ module Metanorma
       def para_index_cleanup1(para, prev, foll)
         if include_indexterm?(prev)
           prev << para.remove.children
-        elsif include_indexterm?(foll) && !foll.children.empty?
-          foll.children.first.previous = para.remove.children
+        elsif include_indexterm?(foll) # && !foll.children.empty?
+          foll.add_first_child para.remove.children
         end
       end
 

data/lib/metanorma/standoc/cleanup_boilerplate.rb

@@ -48,11 +48,9 @@ module Metanorma
         x = xmldoc.dup
         x.root.add_namespace(nil, xml_namespace)
         xml = Nokogiri::XML(x.to_xml)
-        #require "debug"; binding.b
         @isodoc ||= isodoc(@lang, @script, @locale)
         # initialise @isodoc.xrefs, for @isodoc.xrefs.info
         @isodoc.bibdata(xml) # do i18n
-        #@isodoc.info(xml, nil)
         @isodoc
       end
 
@@ -156,7 +154,7 @@ module Metanorma
         if user_add.at("./clause") then built_in << user_add.children
         else
           user_add.name = "clause"
-          if user_add["id"].nil? || uuid?(user_add["id"])
+          if user_add["id"].nil? || Metanorma::Utils::guid_anchor?(user_add["id"])
             user_add["anchor"] = "_boilerplate-#{statement}-statement-append"
             add_id(user_add)
           end
@@ -167,11 +165,12 @@ module Metanorma
       # Asciidoc macro, e.g. span:publisher[...]
       # May contain one or more {{ }} in target, with spaces in them
       # Does not end in \]
-      ADOC_MACRO_START = '\S+:(?:[^\[\] ]+|\{\{[^{}]+\}\})*\[.*?(?<!\\\\)\]'.freeze
+      ADOC_MACRO_START =
+        '\S+:(?:[^\[\] ]+|\{\{[^{}]+\}\})*\[.*?(?<!\\\\)\]'.freeze
 
       # Replace {{ ... }} with {{ pass:[...]}} to preserve any XML markup
       # use pass:[...\] if {{}} is already inside an Asciidoc macro
-      # Do not use pass: if this is a macro target: mailto:{{x}}[] 
+      # Do not use pass: if this is a macro target: mailto:{{x}}[]
       # or body: mailto:[{{x}}]
       def boilerplate_read(file)
         ret = File.read(file, encoding: "UTF-8")

data/lib/metanorma/standoc/cleanup_image.rb

@@ -14,7 +14,7 @@ module Metanorma
         xmldoc.xpath("//svgmap").each do |s|
           f = s.at(".//figure") or next
           (t = s.at("./name")) && !f.at("./name") and
-            f.children.first.previous = t.remove
+            f.add_first_child t.remove
           if s["anchor"] # && Metanorma::Utils::guid_anchor?(f["id"])
             f["anchor"] = s["anchor"]
             s.delete("anchor")

data/lib/metanorma/standoc/cleanup_inline.rb

@@ -143,17 +143,12 @@ module Metanorma
         doc.xpath("//*[@id]").each_with_object({}) do |x, m|
           # should always be true
           Metanorma::Utils::guid_anchor?(x["id"]) or next
-          m[x["id"]] = contenthash(x)
+          m[x["id"]] = Metanorma::Utils::contenthash(x)
           x["anchor"] and m[x["anchor"]] = m[x["id"]]
           x["id"] = m[x["id"]]
         end
       end
 
-      def contenthash(elem)
-        Digest::MD5.hexdigest("#{elem.path}////#{elem.text}")
-          .sub(/^(.{8})(.{4})(.{4})(.{4})(.{12})$/, "_\\1-\\2-\\3-\\4-\\5")
-      end
-
       def passthrough_cleanup(doc)
         doc.xpath("//passthrough-inline").each do |p|
           p.name = "passthrough"

data/lib/metanorma/standoc/cleanup_maths.rb

@@ -179,6 +179,7 @@ module Metanorma
       end
 
       def mathml_cleanup(xmldoc)
+        mathml_number_to_mathml(xmldoc)
         xmldoc.xpath("//stem[@type = 'MathML'][not(@validate = 'false')]")
           .each do |x|
           mathml_xml_cleanup(x)
@@ -189,6 +190,15 @@ module Metanorma
         mathml_unitsml(xmldoc)
       end
 
+      def mathml_number_to_mathml(xmldoc)
+        xmldoc.xpath("//mathml-number").each do |n|
+          n.name = "stem"
+          n["type"] = "MathML"
+          n.children =
+            "<math xmlns='#{MATHML_NS}'><mn>#{n.children.to_xml}</mn></math>"
+        end
+      end
+
       include ::Metanorma::Standoc::Regex
     end
   end

data/lib/metanorma/standoc/cleanup_section_names.rb

@@ -2,13 +2,7 @@ module Metanorma
   module Standoc
     module Cleanup
       def get_or_make_title(node)
-        unless node.at("./title")
-          if node.children.empty?
-            node << "<title/>"
-          else
-            node.children.first.previous = "<title/>"
-          end
-        end
+        node.at("./title") or node.add_first_child "<title/>"
         ret = node.at("./title")
         add_id(ret)
         ret
@@ -154,7 +148,7 @@ module Metanorma
           p.delete("variant_title")
           p.xpath("(#{path})[last()]").each do |sect|
             (ins = sect.at("./title") and ins.next = p) or
-              sect.children.first.previous = p
+              sect.add_first_child(p)
           end
         end
       end
@@ -180,8 +174,7 @@ module Metanorma
       def floating_title_preface2sections(xmldoc)
         t = xmldoc.at("//preface/floating-title") or return
         s = xmldoc.at("//sections")
-        t.next_element or
-          s.children.first.previous = t.remove
+        t.next_element or s.add_first_child(t.remove)
       end
     end
   end

data/lib/metanorma/standoc/cleanup_terms_designations.rb

@@ -168,7 +168,7 @@ module Metanorma
           end.reverse
           t << " "
           des.each do |x|
-            t.children.first.previous = x
+            t.add_first_child(x)
           end
         end
       end

data/lib/metanorma/standoc/cleanup_text.rb

@@ -3,13 +3,7 @@ module Metanorma
     module Cleanup
       def textcleanup(result)
         text = result.flatten.map(&:rstrip) * "\n"
-        text = text.gsub(/(?<!\s)\s+<fn /, "<fn ")
-        #@semantic_headless and return text
-        #%w(passthrough passthrough-inline).each do |v|
-          #text.gsub!(%r{<#{v}\s+formats="metanorma">([^<]*)
-                    #</#{v}>}mx) { @c.decode($1) }
-        #end
-        text
+        text.gsub(/(?<!\s)\s+<fn /, "<fn ")
       end
 
       def ancestor_include?(elem, ancestors)
@@ -133,8 +127,7 @@ module Metanorma
         prev.content = "#{prev.text}#{m[1]}"
       end
 
-      IGNORE_TEXT_ELEMENTS =
-        %w(index fn).freeze
+      IGNORE_TEXT_ELEMENTS = %w(index fn).freeze
 
       def ignoretext?(elem)
         IGNORE_TEXT_ELEMENTS.include? elem.name

data/lib/metanorma/standoc/cleanup_xref.rb

@@ -150,8 +150,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.children.first.previous =
-            "<xref target='#{y[1]}' connective='#{y[0]}'/>"
+          xref.add_first_child "<xref target='#{y[1]}' connective='#{y[0]}'/>"
         end
         xref&.at("./sentinel")&.remove
       end

data/lib/metanorma/standoc/converter.rb

@@ -80,8 +80,6 @@ module Metanorma
         inline_macro Metanorma::Standoc::SourceIncludeInlineMacro
         block Metanorma::Standoc::ToDoAdmonitionBlock
         block Metanorma::Standoc::EditorAdmonitionBlock
-        treeprocessor Metanorma::Standoc::EditorInlineAdmonitionBlock
-        treeprocessor Metanorma::Standoc::ToDoInlineAdmonitionBlock
         block Metanorma::Standoc::PlantUMLBlockMacro
         block Metanorma::Standoc::PseudocodeBlockMacro
         block_macro Metanorma::Standoc::ColumnBreakBlockMacro

data/lib/metanorma/standoc/isodoc.rng

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
-<!-- VERSION v2.0.8 -->
+<!-- VERSION v2.1.0 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -42,36 +42,6 @@ All IdRefType instances point not to `@id` in Semantic XML, which is the Content
 but to `@anchor`, the user-supplied cross-reference</a:documentation>
       <text/>
     </define>
-    <define name="index-primary">
-      <element name="primary">
-        <oneOrMore>
-          <choice>
-            <ref name="PureTextElement"/>
-            <ref name="stem"/>
-          </choice>
-        </oneOrMore>
-      </element>
-    </define>
-    <define name="index-secondary">
-      <element name="secondary">
-        <oneOrMore>
-          <choice>
-            <ref name="PureTextElement"/>
-            <ref name="stem"/>
-          </choice>
-        </oneOrMore>
-      </element>
-    </define>
-    <define name="index-tertiary">
-      <element name="tertiary">
-        <oneOrMore>
-          <choice>
-            <ref name="PureTextElement"/>
-            <ref name="stem"/>
-          </choice>
-        </oneOrMore>
-      </element>
-    </define>
     <define name="review">
       <a:documentation>Generalise BasicDoc element from just review comments, to general annotations;
 the type attribute defaults to `review` for reviews</a:documentation>
@@ -592,28 +562,6 @@ normative or informative references, some split references into sections organiz
         </oneOrMore>
       </element>
     </define>
-    <define name="sub">
-      <a:documentation>Subscript text. Corresponds to HTML `sub</a:documentation>
-      <element name="sub">
-        <zeroOrMore>
-          <choice>
-            <ref name="PureTextElement"/>
-            <ref name="stem"/>
-          </choice>
-        </zeroOrMore>
-      </element>
-    </define>
-    <define name="sup">
-      <a:documentation>Superscript text. Corresponds to HTML `sup`</a:documentation>
-      <element name="sup">
-        <zeroOrMore>
-          <choice>
-            <ref name="PureTextElement"/>
-            <ref name="stem"/>
-          </choice>
-        </zeroOrMore>
-      </element>
-    </define>
     <define name="pagebreak">
       <a:documentation>Page break. Only applicable in paged layouts (e.g. PDF, Word), and not flow layouts (e.g. HTML)</a:documentation>
       <element name="pagebreak">
@@ -735,6 +683,12 @@ titlecase, or lowercase</a:documentation>
     <ref name="BlockAttributes"/>
   </define>
   <define name="TableAttributes" combine="interleave">
+    <optional>
+      <attribute name="plain">
+        <a:documentation>Render as a plain attribute, with no shading or borders</a:documentation>
+        <data type="boolean"/>
+      </attribute>
+    </optional>
     <optional>
       <attribute name="width">
         <a:documentation>Width of the table block in rendering</a:documentation>
@@ -1088,7 +1042,6 @@ That concept may be defined as a term within the current document, or it may be
           <zeroOrMore>
             <choice>
               <ref name="PureTextElement"/>
-              <ref name="stem"/>
               <ref name="index"/>
               <ref name="index-xref"/>
             </choice>
@@ -1101,7 +1054,6 @@ That concept may be defined as a term within the current document, or it may be
           <zeroOrMore>
             <choice>
               <ref name="PureTextElement"/>
-              <ref name="stem"/>
               <ref name="index"/>
               <ref name="index-xref"/>
             </choice>
@@ -2019,10 +1971,7 @@ used in document amendments</a:documentation>
       <element name="name">
         <a:documentation>The symbolic form of the designation</a:documentation>
         <oneOrMore>
-          <choice>
-            <ref name="PureTextElement"/>
-            <ref name="stem"/>
-          </choice>
+          <ref name="PureTextElement"/>
         </oneOrMore>
       </element>
     </element>
@@ -2075,7 +2024,6 @@ used in document amendments</a:documentation>
         <zeroOrMore>
           <choice>
             <ref name="PureTextElement"/>
-            <ref name="stem"/>
             <ref name="index"/>
             <ref name="index-xref"/>
           </choice>

data/lib/metanorma/standoc/macros_inline.rb

@@ -233,9 +233,7 @@ module Metanorma
         fmt = format(out, target)
         fmt.empty? and fmt = "default"
         fmt = %( number-format="#{fmt}")
-        <<~OUTPUT.strip
-          <stem type="MathML"#{fmt}><math xmlns='#{MATHML_NS}'><mn>#{number(target)}</mn></math></stem>
-        OUTPUT
+        "<mathml-number#{fmt}>#{number(target)}</mathml-number>"
       end
     end
   end

data/lib/metanorma/standoc/macros_note.rb

@@ -14,20 +14,6 @@ module Metanorma
       end
     end
 
-    class ToDoInlineAdmonitionBlock < Asciidoctor::Extensions::Treeprocessor
-      def process(document)
-        (document.find_by context: :paragraph).each do |para|
-          next unless /^TODO: /.match? para.lines[0]
-
-          para.set_attr("name", "todo")
-          para.set_attr("caption", "TODO")
-          para.lines[0].sub!(/^TODO: /, "")
-          # these will be converted from admonition to annotation downstream
-          para.context = :admonition
-        end
-      end
-    end
-
     class FootnoteBlockInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
       use_dsl
       named :footnoteblock

data/lib/metanorma/standoc/ref.rb

@@ -130,10 +130,7 @@ module Metanorma
       end
 
       def refitem_render(xml, match, code)
-        xml.bibitem **attr_code(
-          anchor: match[:anchor], suppress_identifier: code[:dropid],
-          hidden: code[:hidden], id: "_#{UUIDTools::UUID.random_create}"
-        ) do |t|
+        xml.bibitem **refitem_render_attrs(match, code) do |t|
           refitem_render_formattedref(t, match[:text])
           yr_match = refitem1yr(code[:id])
           refitem_render1(match, code, t)
@@ -143,6 +140,12 @@ module Metanorma
         end
       end
 
+      def refitem_render_attrs(match, code)
+        attr_code(anchor: match[:anchor], suppress_identifier: code[:dropid],
+                  amend: code[:amend], hidden: code[:hidden],
+                  id: "_#{UUIDTools::UUID.random_create}")
+      end
+
       def refitem_render_formattedref(bibitem, title)
         (title.nil? || title.empty?) and title = @i18n.no_information_available
         bibitem.formattedref format: "application/x-isodoc+xml" do |i|

data/lib/metanorma/standoc/ref_queue.rb

@@ -42,8 +42,9 @@ module Metanorma
           ref, i, doc = results.pop
           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)
+            @log.add("Bibliography", nil,
+                     "Could not retrieve #{ref[:code]}: " \
+                     "no access to online site", severity: 1)
           else m[i.to_i][:doc] = doc end
         end
       end
@@ -206,6 +207,7 @@ module Metanorma
         xml.parent.add_child(smart_render_xml(item[:doc], item[:ref][:code],
                                               item[:ref]))
         use_my_anchor(xml, item[:ref][:match][:anchor],
+                      amend: item.dig(:ref, :analyse_code, :amend),
                       hidden: item.dig(:ref, :analyse_code, :hidden),
                       dropid: item.dig(:ref, :analyse_code, :dropid))
       end

data/lib/metanorma/standoc/ref_utility.rb

@@ -32,11 +32,12 @@ module Metanorma
       end
 
       def use_my_anchor(ref, id, opt)
-        ref.parent.elements.last["anchor"] = id
-        add_id(ref.parent.elements.last)
-        a = opt[:hidden] and ref.parent.elements.last["hidden"] = a
-        a = opt[:dropid] and
-          ref.parent.elements.last["suppress_identifier"] = a
+        elem = ref.parent.elements.last
+        elem["anchor"] = id
+        add_id(elem)
+        a = opt[:hidden] and elem["hidden"] = a
+        a = opt[:amend] and elem["amend"] = a
+        a = opt[:dropid] and elem["suppress_identifier"] = a
         ref
       end
 
@@ -66,40 +67,20 @@ module Metanorma
           .sub(/^hidden\((.+)\)$/, "\\1")
           .sub(/^nofetch\((.+)\)$/, "\\1")
           .sub(/^local-file\((.+)\)$/, "\\1")
-      end
-
-      def analyse_ref_localfile(ret)
-        m = /^local-file\((?:(?<source>[^,)]+),\s*)?(?<id>[^)]+)\)$/
-          .match(ret[:id])
-        m or return ret
-        ret.merge(id: m[:id], localfile: m[:source] || "default")
-      end
-
-      def analyse_ref_nofetch(ret)
-        m = /^nofetch\((?<id>.+)\)$/.match(ret[:id]) or return ret
-        ret.merge(id: m[:id], nofetch: true)
-      end
-
-      def analyse_ref_hidden(ret)
-        m = /^hidden\((?<id>.+)\)$/.match(ret[:id]) or return ret
-        ret.merge(id: m[:id], hidden: true)
-      end
-
-      def analyse_ref_dropid(ret)
-        m = /^dropid\((?<id>.+)\)$/.match(ret[:id]) or return ret
-        ret.merge(id: m[:id], dropid: true)
+          .sub(/^amend\((.+)\)$/, "\\1")
       end
 
       def analyse_ref_repo_path(ret)
-        m = /^(?<type>repo|path|attachment):\((?<key>[^,)]+),?(?<id>[^)]*)\)$/
-          .match(ret[:id]) or return ret
-        id = if m[:id].empty?
-               if m[:type] == "attachment"
-                 "(#{m[:key]})"
-               else m[:key].sub(%r{^[^/]+/}, "")
-               end
-             else m[:id] end
-        ret.merge(id:, type: m[:type], key: m[:key], nofetch: true)
+        %i(repo path attachment).each do |type|
+          ret[type] or next
+          id = if ret[:id].empty?
+                 if type == :attachment then "(#{ret[type]})"
+                 else ret[type].sub(%r{^[^/]+/}, "")
+                 end
+               else ret[:id] end
+          ret.merge!(id: id, type: type.to_s, key: ret[type], nofetch: true)
+        end
+        ret
       end
 
       def analyse_ref_numeric(ret)
@@ -107,16 +88,6 @@ module Metanorma
         ret.merge(numeric: true)
       end
 
-      def analyse_ref_dual(ret)
-        m = /^(?<type>merge|dual)\((?<keys>.+)\)$/.match(ret[:id]) or
-          return ret
-        line = CSV.parse_line(m[:keys], liberal_parsing: true) or return ret
-        line.size > 1 or return ret
-        ret[:id] = line.first
-        ret[m[:type].to_sym] = line[1..].map(&:strip)
-        ret
-      end
-
       def analyse_ref_code(code)
         ret = { id: code }
         code.nil? || code.empty? and return ret
@@ -166,23 +137,49 @@ module Metanorma
         end
       end
 
+      def analyse_ref_code_nested(ret)
+        opts, id = parse_ref_code_nested({}, ret[:id])
+        ret[:id] = id
+        ret.merge!(opts)
+        analyse_ref_numeric(ret)
+        analyse_ref_repo_path(ret)
+        ret
+      end
+
       # ref id = (usrlbl)code[:-]year
       # code = \[? number \]? | ident | nofetch(code) | hidden(code) |
-      # dropid(code) | # (repo|path|attachment):(key,code) |
+      # dropid(code) | amend(code) | (repo|path|attachment):(key,code) |
       # local-file(source,? key) |
       # merge(code, code) | dual(code, code)
-      def analyse_ref_code_nested(ret)
-        analyse_ref_dual(
-          analyse_ref_numeric(
-            analyse_ref_repo_path(
-              analyse_ref_dropid(
-                analyse_ref_hidden(
-                  analyse_ref_nofetch(analyse_ref_localfile(ret)),
-                ),
-              ),
-            ),
-          ),
-        )
+      def parse_ref_code_nested(ret, ident)
+        keys = %w(nofetch hidden dropid local-file repo path attachment merge
+                  dual amend)
+        if (m = /^(?<key>[a-z-]+):?\((?<val>.*)\)$/.match(ident)) &&
+            keys.include?(m[:key])
+          case m[:key]
+          when "nofetch", "hidden", "dropid", "amend"
+            ret[m[:key].to_sym] = true
+            parse_ref_code_nested(ret, m[:val])
+          when "repo", "path", "attachment"
+            kv = m[:val].split(",", 2).map(&:strip)
+            ret[m[:key].to_sym] = kv[0]
+            parse_ref_code_nested(ret, kv.size == 1 ? "" : kv[1])
+          when "local-file"
+            kv = m[:val].split(",", 2).map(&:strip)
+            source = kv.size == 1 ? "default" : kv[0]
+            ret[:localfile] = source
+            parse_ref_code_nested(ret, kv[-1])
+          when "merge", "dual"
+            line = CSV.parse_line(m[:val],
+                                  liberal_parsing: true) or return [ret, ident]
+            line.size > 1 or return [ret, ident]
+            ret[:id] = line.first
+            ret[m[:key].to_sym] = line[1..].map(&:strip)
+            [ret, ret[:id]]
+          end
+
+        else [ret, ident]
+        end
       end
 
       # if no year is supplied, interpret as no_year reference

data/lib/metanorma/standoc/render.rb

@@ -12,7 +12,7 @@ module Metanorma
           scope: node.attr("scope"),
           htmlstylesheet: node.attr("htmlstylesheet") || node.attr("html-stylesheet"),
           htmlstylesheet_override: node.attr("htmlstylesheet-override") || node.attr("html-stylesheet-override"),
-          htmlcoverpage: node.attr("htmlcoverpage") || node.attr("htmlcoverpage"),
+          htmlcoverpage: node.attr("htmlcoverpage") || node.attr("html-coverpage"),
           htmlintropage: node.attr("htmlintropage") || node.attr("html-intropage"),
           scripts: node.attr("scripts"),
           scripts_override: node.attr("scripts-override"),

data/lib/metanorma/standoc/spans_to_bibitem.rb

@@ -58,7 +58,7 @@ module Metanorma
         end
 
         def spans_to_bibitem_host(spans)
-          spans[:in].empty? and return ""
+          spans[:in].nil? || spans[:in].empty? and return ""
           ret =
             "<relation type='includedIn'><bibitem type='#{spans[:in][:type]}'>"
           spans[:in].delete(:type)
@@ -67,9 +67,9 @@ module Metanorma
 
         def spans_to_bibitem_docid(spans)
           ret = ""
-          spans[:uri].each { |s| ret += span_to_docid(s, "uri") }
-          spans[:docid].each { |s| ret += span_to_docid(s, "docidentifier") }
-          spans[:date].each { |s| ret += span_to_date(s) }
+          spans[:uri]&.each { |s| ret += span_to_docid(s, "uri") }
+          spans[:docid]&.each { |s| ret += span_to_docid(s, "docidentifier") }
+          spans[:date]&.each { |s| ret += span_to_date(s) }
           ret
         end
 
@@ -84,6 +84,7 @@ module Metanorma
         end
 
         def spans_to_bibitem_extent(spans)
+          spans.nil? and return ""
           ret = ""
           { volume: "volume", issue: "issue", pages: "page" }.each do |k, v|
             spans[k]&.each { |s| ret += span_to_extent(s, v) }
@@ -120,7 +121,7 @@ module Metanorma
 
         def spans_to_contribs(spans)
           ret = ""
-          spans[:contrib].each do |s|
+          spans[:contrib]&.each do |s|
             ret += span_to_contrib(s, spans[:title])
           end
           ret

data/lib/metanorma/standoc/table.rb

@@ -6,6 +6,7 @@ module Metanorma
           .merge(id_unnum_attrs(node))
           .merge(headerrows: node.attr("headerrows"),
                  alt: node.attr("alt"),
+                 plain: node.option?("plain") ? "true" : nil,
                  style: node.attr("css-style"),
                  summary: node.attr("summary"),
                  width: node.attr("width"))

data/lib/metanorma/standoc/utils.rb

@@ -87,8 +87,10 @@ module Metanorma
         conv = presentation_xml_converter(EmptyAttr.new)
         i18n = conv.i18n_init(lang, script, locale, i18nyaml)
         conv.metadata_init(lang, script, locale, i18n)
+        conv.meta.localdir = @localdir
         conv.xref_init(lang, script, nil, i18n, {})
         conv.xrefs.klass.meta = conv.meta
+        conv.xrefs.klass.localdir = @localdir
         conv
       end
 
@@ -178,11 +180,6 @@ module Metanorma
         @refids.include? ref
       end
 
-      def uuid?(ref)
-        /^_[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/
-          .match?(ref)
-      end
-
       module_function :adoc2xml
 
       class EmptyAttr

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "3.1.1".freeze
+    VERSION = "3.1.3".freeze
   end
 end

data/metanorma-standoc.gemspec

@@ -57,6 +57,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.add_development_dependency "canon"
   # 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: 3.1.1
+  version: 3.1.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-05 00:00:00.000000000 Z
+date: 2025-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -389,7 +389,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: xml-c14n
+  name: canon
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="