metanorma-standoc 2.5.5 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffaa13eaacb9efa7c94a2e891d4e7a90b9306a729510f8f2c0b0110e68a4ec49
-  data.tar.gz: 63dc9c98c8a1657aa6d0871105d0e21b8720378d0606b8e819b7f75606763964
+  metadata.gz: 42b32b109ae4f5ac4505f2218a4d4c5768ad388ffb29d3ae292b61fab8923030
+  data.tar.gz: aafef4197f9d88913ef52f8effacb515e54e94f456757758e9ac0bfe41b2656d
 SHA512:
-  metadata.gz: 771694d3618c4d671d5ebf6006f502717d9c30c34e72b9385efcabcf9a5a504d4a47ca7a862dbcea7f5c7f7d3b8db18a73afba8d367bfc974fcc7b7981944967
-  data.tar.gz: 8c5ca650403236e66e3e6fff578889977f86812cd8127e0521257427c97e6a5425437cdc9f4f10208d865ee71fdbc26da1faff28430cb7633bc2829bc641058c
+  metadata.gz: 13a8345e82e041ebbefecddeea7ba719898b6997877891d76177872b672e9bce7d00c060bf98569b0acd49c0c3ba691a989032e3650066030cf99a86991b5cbb
+  data.tar.gz: 37c1b235d071bb2d7b4f5ff8e73e3f5a3ca668c726245ea75002152bbd9931b07e67869dee8b0b6b8685e4480054f50244ddfa492cdd12275e30d27ec2d389e2

data/lib/metanorma/standoc/base.rb

@@ -42,6 +42,7 @@ module Metanorma
       end
 
       def init_vars
+        @log = Metanorma::Utils::Log.new # for error reporting downstream
         @fn_number ||= 0
         @refids = Set.new
         @anchor_alias = {}
@@ -55,6 +56,7 @@ module Metanorma
       end
 
       def init_misc(node)
+        @doctype = doctype(node)
         @draft = node.attributes.has_key?("draft")
         @index_terms = node.attr("index-terms")
         @boilerplateauthority = node.attr("boilerplate-authority")
@@ -101,7 +103,6 @@ module Metanorma
 
       def init_output(node)
         @fontheader = default_fonts(node)
-        @log = Metanorma::Utils::Log.new
         @files_to_delete = []
         @filename = if node.attr("docfile")
                       File.basename(node.attr("docfile"))&.gsub(/\.adoc$/, "")
@@ -177,7 +178,7 @@ module Metanorma
       end
 
       def clean_exit
-        @novalid or @log.write("#{@output_dir}#{@filename}.err")
+        @novalid or @log.write("#{@output_dir}#{@filename}.err.html")
         @files_to_delete.each { |f| FileUtils.rm f }
       end
 

data/lib/metanorma/standoc/basicdoc.rng

@@ -346,6 +346,8 @@
           <ref name="keyword"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </oneOrMore>
     </element>
@@ -623,6 +625,8 @@
           <ref name="eref"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -636,6 +640,8 @@
           <ref name="eref"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -648,6 +654,8 @@
           <ref name="eref"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -655,7 +663,11 @@
   <define name="keyword">
     <element name="keyword">
       <zeroOrMore>
-        <ref name="PureTextElement"/>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
+        </choice>
       </zeroOrMore>
     </element>
   </define>
@@ -676,7 +688,11 @@
   <define name="strike">
     <element name="strike">
       <zeroOrMore>
-        <ref name="PureTextElement"/>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
+        </choice>
       </zeroOrMore>
     </element>
   </define>

data/lib/metanorma/standoc/biblio.rng

@@ -1283,7 +1283,7 @@
       <value>mergedInto</value>
       <value>splits</value>
       <value>splitInto</value>
-      <value>instance</value>
+      <value>instanceOf</value>
       <value>hasInstance</value>
       <value>exemplarOf</value>
       <value>hasExemplar</value>

data/lib/metanorma/standoc/cleanup.rb

@@ -25,6 +25,7 @@ module Metanorma
   module Standoc
     module Cleanup
       def cleanup(xmldoc)
+        @doctype = xmldoc.at("//bibdata/ext/doctype")&.text
         element_name_cleanup(xmldoc)
         passthrough_cleanup(xmldoc)
         unnumbered_blocks_cleanup(xmldoc)

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.2.4 -->
+<!-- VERSION v1.2.5 -->
 <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">
@@ -485,6 +485,8 @@
           <choice>
             <text/>
             <ref name="callout"/>
+            <ref name="xref"/>
+            <ref name="eref"/>
           </choice>
         </oneOrMore>
         <zeroOrMore>
@@ -865,6 +867,7 @@
             <ref name="PureTextElement"/>
             <ref name="stem"/>
             <ref name="index"/>
+            <ref name="index-xref"/>
             <ref name="eref"/>
             <ref name="erefstack"/>
             <ref name="xref"/>
@@ -880,6 +883,7 @@
             <ref name="PureTextElement"/>
             <ref name="stem"/>
             <ref name="index"/>
+            <ref name="index-xref"/>
             <ref name="eref"/>
             <ref name="erefstack"/>
             <ref name="xref"/>
@@ -894,6 +898,7 @@
           <choice>
             <ref name="PureTextElement"/>
             <ref name="index"/>
+            <ref name="index-xref"/>
             <ref name="eref"/>
             <ref name="erefstack"/>
             <ref name="xref"/>
@@ -908,6 +913,7 @@
           <choice>
             <ref name="PureTextElement"/>
             <ref name="index"/>
+            <ref name="index-xref"/>
           </choice>
         </zeroOrMore>
       </element>
@@ -918,6 +924,7 @@
           <choice>
             <ref name="PureTextElement"/>
             <ref name="index"/>
+            <ref name="index-xref"/>
           </choice>
         </zeroOrMore>
       </element>
@@ -928,6 +935,7 @@
           <choice>
             <ref name="PureTextElement"/>
             <ref name="index"/>
+            <ref name="index-xref"/>
           </choice>
         </zeroOrMore>
       </element>
@@ -938,6 +946,7 @@
           <choice>
             <ref name="PureTextElement"/>
             <ref name="index"/>
+            <ref name="index-xref"/>
           </choice>
         </zeroOrMore>
       </element>
@@ -1047,6 +1056,8 @@
         <ref name="keyword"/>
         <ref name="xref"/>
         <ref name="hyperlink"/>
+        <ref name="index"/>
+        <ref name="index-xref"/>
       </choice>
     </element>
   </define>
@@ -1060,6 +1071,8 @@
         <ref name="keyword"/>
         <ref name="xref"/>
         <ref name="hyperlink"/>
+        <ref name="index"/>
+        <ref name="index-xref"/>
       </choice>
     </element>
   </define>
@@ -1126,6 +1139,8 @@
             <choice>
               <ref name="PureTextElement"/>
               <ref name="stem"/>
+              <ref name="index"/>
+              <ref name="index-xref"/>
             </choice>
           </zeroOrMore>
         </element>
@@ -1136,6 +1151,8 @@
             <choice>
               <ref name="PureTextElement"/>
               <ref name="stem"/>
+              <ref name="index"/>
+              <ref name="index-xref"/>
             </choice>
           </zeroOrMore>
         </element>

data/lib/metanorma/standoc/merge_bibitems.rb

@@ -47,7 +47,7 @@ module Metanorma
         end
 
         def merge_simple(old, new, field)
-          new[field].blank? and return
+          (new[field].nil? || new[field].empty?) and return
           old[field] = new[field]
         end
 
@@ -77,12 +77,10 @@ module Metanorma
         # @old.field is an array, overwrite only those array elements
         # where @old.field[attribute] = @new.field[attribute]
         def merge_by_type(old, new, field, attributes, opt = {})
-          new.nil? || new[field].blank? and return
+          new.nil? || new[field].nil? || new[field].empty? and return
           old.nil? and return new[field]
-          if !old[field].is_a?(::Array) || old[field].empty?
+          !old[field].is_a?(::Array) || old[field].empty? and
             return old[field] = new[field]
-          end
-
           old[field] = merge_by_type1(old, new, field, attributes, opt)
         end
 

data/lib/metanorma/standoc/ref.rb

@@ -1,4 +1,5 @@
 require_relative "ref_utility"
+require_relative "ref_queue"
 
 module Metanorma
   module Standoc
@@ -226,42 +227,6 @@ module Metanorma
         when 3 then isorefmatches3out(item, xml)
         end
       end
-
-      def reference(node)
-        refs = node.items.each_with_object([]) do |b, m|
-          m << reference1code(b.text, node)
-        end
-        reference_populate(reference_normalise(refs))
-      end
-
-      def reference_normalise(refs)
-        refs.each do |r|
-          r[:code] = @c.decode(r[:code])
-            .gsub("\u2009\u2014\u2009", " -- ").strip
-        end
-      end
-
-      def reference_populate(refs)
-        results = refs.each_with_index.with_object(Queue.new) do |(ref, i), res|
-          fetch_ref_async(ref.merge(ord: i), i, res)
-        end
-        ret = reference_queue(refs, results)
-        noko do |xml|
-          ret.each { |b| reference1out(b, xml) }
-        end.join
-      end
-
-      def reference_queue(refs, results)
-        refs.each.with_object([]) do |_, m|
-          ref, i, doc = results.pop
-          m[i.to_i] = { ref: ref }
-          if doc.is_a?(RelatonBib::RequestError)
-            @log.add("Bibliography", nil, "Could not retrieve #{ref[:code]}: " \
-                                          "no access to online site")
-          else m[i.to_i][:doc] = doc
-          end
-        end
-      end
     end
   end
 end

data/lib/metanorma/standoc/ref_queue.rb

@@ -0,0 +1,237 @@
+module Metanorma
+  module Standoc
+    module Refs
+      def reference(node)
+        refs = node.items.each_with_object([]) do |b, m|
+          m << reference1code(b.text, node)
+        end
+        reference_populate(reference_normalise(refs))
+      end
+
+      def reference_normalise(refs)
+        refs.each do |r|
+          r[:code] = @c.decode(r[:code])
+            .gsub("\u2009\u2014\u2009", " -- ").strip
+        end
+      end
+
+      def reference_populate(refs)
+        ret = reference_queue(*references_fetch(refs))
+        joint_prep = joint_entries_prep(ret)
+        out = references2xml(ret)
+        joint_entries(out, joint_prep).compact.map { |x| to_xml(x) }.join
+      end
+
+      def references2xml(ret)
+        out = ret.map do |b|
+          b.nil? ? nil : noko { |xml| reference1out(b, xml) }.join
+        end
+        out.map { |x| x.nil? ? nil : Nokogiri::XML(x).root }
+      end
+
+      def references_fetch(refs)
+        i = 0
+        ret = refs.each_with_object(Queue.new) do |ref, res|
+          i = fetch_ref_async(ref.merge(ord: i), i, res)
+        end
+        [ret, i]
+      end
+
+      def reference_queue(results, size)
+        (1..size).each.with_object([]) do |_, m|
+          ref, i, doc = results.pop
+          m[i.to_i] = { ref: ref }
+          if doc.is_a?(RelatonBib::RequestError)
+            @log.add("Bibliography", nil, "Could not retrieve #{ref[:code]}: " \
+                                          "no access to online site")
+          else m[i.to_i][:doc] = doc end
+        end
+      end
+
+      def joint_entries(out, joint_prep)
+        joint_prep.each do |k, v|
+          v[:merge]&.each do |i|
+            merge_entries(out[k], out[i]) and out[i] = nil
+          end
+          v[:dual]&.each do |i|
+            dual_entries(out[k], out[i]) and out[i] = nil
+          end
+        end
+        out
+      end
+
+      # append publishers docids of add to base
+      def merge_entries(base, add)
+        merge_publishers(base, add)
+        merge_docids(base, add)
+        merge_urls(base, add)
+      end
+
+      def merge_publishers(base, add)
+        ins = base.at("//contributor[last()]") || base.children[-1]
+        add.xpath("//contributor[role/@type = 'publisher']").reverse.each do |p|
+          ins.next = p
+        end
+      end
+
+      def merge_docids(base, add)
+        ins = base.at("//docidentifier[last()]")
+        [ins, add].each do |v|
+          v.at("//docidentifier[@primary = 'true']") or
+            v.at("//docidentifier")["primary"] = true
+        end
+        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|
+          ins.next = p
+        end
+      end
+
+      def dual_entries(base, add)
+        ins = docrelation_insert(base)
+        ins.next = "<relation type='hasReproduction'>#{to_xml(add)}</relation>"
+      end
+
+      def docrelation_insert(base)
+        %w(relation copyright status abstract locale language note version
+           edition contributor date docnumber docidentifier).each do |v|
+          r = base.at("//#{v}[last()]") and return r
+        end
+      end
+
+      JOINT_REFS = %i(merge dual).freeze
+
+      def joint_entries_prep(out)
+        out.each_with_object({}) do |r, m|
+          JOINT_REFS.each do |v|
+            if i = r&.dig(:ref, "#{v}_into".to_sym)
+              m[i] ||= { "#{v}": [] }
+              m[i][v][r[:ref][:merge_order]] = r[:ref][:ord]
+            end
+          end
+        end
+      end
+
+      def global_ievcache_name
+        "#{Dir.home}/.iev/cache"
+      end
+
+      def local_ievcache_name(cachename)
+        return nil if cachename.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]
+
+        code = code.sub(/^\([^)]+\)/, "")
+        hit = fetch_ref1(code, year, opts) or return nil
+        xml.parent.add_child(smart_render_xml(hit, code, opts))
+        xml
+      rescue RelatonBib::RequestError
+        @log.add("Bibliography", nil, "Could not retrieve #{code}: " \
+                                      "no access to online site")
+        nil
+      end
+
+      def fetch_ref1(code, year, opts)
+        if opts[:localfile]
+          @local_bibdb.get(code, opts[:localfile])
+        else @bibdb&.fetch(code, year, opts)
+        end
+      end
+
+      def unfetchable_ref_code?(ref)
+        ref[:code].nil? || ref[:code].empty? || ref[:no_year] ||
+          /^\(.+\)$/.match?(ref[:code]) ||
+          (@bibdb.nil? && !ref[:localfile])
+      end
+
+      def fetch_ref_async(ref, idx, res)
+        if unfetchable_ref_code?(ref)
+          res << [ref, idx, nil]
+          idx += 1
+        elsif ref[:localfile]
+          res << [ref, idx, @local_bibdb.get(ref[:code], ref[:localfile])]
+          idx += 1
+        else idx = fetch_ref_async1(ref, idx, res)
+        end
+        idx
+      end
+
+      def fetch_ref_async1(ref, idx, res)
+        @bibdb.fetch_async(ref[:code], ref[:year], ref) do |doc|
+          res << [ref, idx, doc]
+        end
+        fetch_ref_async_dual(ref, idx, idx + 1, res)
+      end
+
+      def fetch_ref_async_dual(ref, orig, idx, res)
+        JOINT_REFS.each do |m|
+          ref.dig(:analyse_code, m)&.each_with_index do |code, i|
+            @bibdb.fetch_async(code, nil, ref.merge(ord: idx)) do |doc|
+              res << [ref.merge("#{m}_into": orig, merge_order: i, ord: idx),
+                      idx, doc]
+            end
+            idx += 1
+          end
+        end
+        idx
+      end
+
+      def smart_render_xml(xml, code, opts)
+        xml.respond_to? :to_xml or return nil
+        xml = Nokogiri::XML(xml.to_xml(lang: opts[:lang]))
+        emend_biblio(xml, code, opts[:title], opts[:usrlbl])
+        xml.xpath("//date").each { |d| Metanorma::Utils::endash_date(d) }
+        xml.traverse do |n|
+          n.text? and n.replace(Metanorma::Utils::smartformat(n.text))
+        end
+        xml.to_xml.sub(/<\?[^>]+>/, "")
+      end
+
+      def use_retrieved_relaton(item, xml)
+        xml.parent.add_child(smart_render_xml(item[:doc], item[:ref][:code],
+                                              item[:ref]))
+        use_my_anchor(xml, item[:ref][:match][:anchor],
+                      hidden: item.dig(:ref, :analyse_code, :hidden),
+                      dropid: item.dig(:ref, :analyse_code, :dropid))
+      end
+
+      def init_bib_caches(node)
+        return if @no_isobib
+
+        global = !@no_isobib_cache && !node.attr("local-cache-only")
+        local = node.attr("local-cache") || node.attr("local-cache-only")
+        local = nil if @no_isobib_cache
+        @bibdb = Relaton::Db.init_bib_caches(
+          local_cache: local,
+          flush_caches: node.attr("flush-caches"),
+          global_cache: global,
+        )
+      end
+
+      def init_iev_caches(node)
+        unless @no_isobib_cache || @no_isobib
+          node.attr("local-cache-only") or
+            @iev_globalname = global_ievcache_name
+          @iev_localname = local_ievcache_name(node.attr("local-cache") ||
+                                               node.attr("local-cache-only"))
+          if node.attr("flush-caches")
+            FileUtils.rm_f @iev_globalname unless @iev_globalname.nil?
+            FileUtils.rm_f @iev_localname unless @iev_localname.nil?
+          end
+        end
+        # @iev = Iev::Db.new(globalname, localname) unless @no_isobib
+      end
+    end
+  end
+end

data/lib/metanorma/standoc/ref_sect.rb

@@ -53,59 +53,6 @@ module Metanorma
         end
       end
 
-      def global_ievcache_name
-        "#{Dir.home}/.iev/cache"
-      end
-
-      def local_ievcache_name(cachename)
-        return nil if cachename.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]
-
-        code = code.sub(/^\([^)]+\)/, "")
-        hit = fetch_ref1(code, year, opts) or return nil
-        xml.parent.add_child(smart_render_xml(hit, code, opts))
-        xml
-      rescue RelatonBib::RequestError
-        @log.add("Bibliography", nil, "Could not retrieve #{code}: " \
-                                      "no access to online site")
-        nil
-      end
-
-      def fetch_ref1(code, year, opts)
-        if opts[:localfile]
-          @local_bibdb.get(code, opts[:localfile])
-        else @bibdb&.fetch(code, year, opts)
-        end
-      end
-
-      def unfetchable_ref_code?(ref)
-        ref[:code].nil? || ref[:code].empty? || ref[:no_year] || 
-          /^\(.+\)$/.match?(ref[:code]) ||
-          (@bibdb.nil? && !ref[:localfile])
-      end
-
-      def fetch_ref_async(ref, idx, res)
-        if unfetchable_ref_code?(ref)
-          res << [ref, idx, nil]
-        elsif ref[:localfile]
-          res << [ref, idx, @local_bibdb.get(ref[:code], ref[:localfile])]
-        else fetch_ref_async1(ref, idx, res)
-        end
-      end
-
-      def fetch_ref_async1(ref, idx, res)
-        @bibdb.fetch_async(ref[:code], ref[:year], ref) do |doc|
-          res << [ref, idx, doc]
-        end
-      end
-
       def emend_biblio(xml, code, title, usrlbl)
         emend_biblio_id(xml, code)
         emend_biblio_title(xml, code, title)
@@ -138,52 +85,6 @@ module Metanorma
         xml.at("/bibitem/docidentifier").next =
           "<docidentifier type='metanorma'>#{mn_code(usrlbl)}</docidentifier>"
       end
-
-      def smart_render_xml(xml, code, opts)
-        xml.respond_to? :to_xml or return nil
-        xml = Nokogiri::XML(xml.to_xml(lang: opts[:lang]))
-        emend_biblio(xml, code, opts[:title], opts[:usrlbl])
-        xml.xpath("//date").each { |d| Metanorma::Utils::endash_date(d) }
-        xml.traverse do |n|
-          n.text? and n.replace(Metanorma::Utils::smartformat(n.text))
-        end
-        xml.to_xml.sub(/<\?[^>]+>/, "")
-      end
-
-      def use_retrieved_relaton(item, xml)
-        xml.parent.add_child(smart_render_xml(item[:doc], item[:ref][:code],
-                                              item[:ref]))
-        use_my_anchor(xml, item[:ref][:match][:anchor],
-                      hidden: item.dig(:ref, :analyse_code, :hidden),
-                      dropid: item.dig(:ref, :analyse_code, :dropid))
-      end
-
-      def init_bib_caches(node)
-        return if @no_isobib
-
-        global = !@no_isobib_cache && !node.attr("local-cache-only")
-        local = node.attr("local-cache") || node.attr("local-cache-only")
-        local = nil if @no_isobib_cache
-        @bibdb = Relaton::Db.init_bib_caches(
-          local_cache: local,
-          flush_caches: node.attr("flush-caches"),
-          global_cache: global,
-        )
-      end
-
-      def init_iev_caches(node)
-        unless @no_isobib_cache || @no_isobib
-          node.attr("local-cache-only") or
-            @iev_globalname = global_ievcache_name
-          @iev_localname = local_ievcache_name(node.attr("local-cache") ||
-                                               node.attr("local-cache-only"))
-          if node.attr("flush-caches")
-            FileUtils.rm_f @iev_globalname unless @iev_globalname.nil?
-            FileUtils.rm_f @iev_localname unless @iev_localname.nil?
-          end
-        end
-        # @iev = Iev::Db.new(globalname, localname) unless @no_isobib
-      end
     end
   end
 end

data/lib/metanorma/standoc/ref_utility.rb

@@ -69,43 +69,46 @@ module Metanorma
       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)
-        return ret unless m = /^nofetch\((?<id>.+)\)$/.match(ret[:id])
-
+        m = /^nofetch\((?<id>.+)\)$/.match(ret[:id]) or return ret
         ret.merge(id: m[:id], nofetch: true)
       end
 
       def analyse_ref_hidden(ret)
-        return ret unless m = /^hidden\((?<id>.+)\)$/.match(ret[:id])
-
+        m = /^hidden\((?<id>.+)\)$/.match(ret[:id]) or return ret
         ret.merge(id: m[:id], hidden: true)
       end
 
       def analyse_ref_dropid(ret)
-        return ret unless m = /^dropid\((?<id>.+)\)$/.match(ret[:id])
-
+        m = /^dropid\((?<id>.+)\)$/.match(ret[:id]) or return ret
         ret.merge(id: m[:id], dropid: true)
       end
 
       def analyse_ref_repo_path(ret)
-        return ret unless m =
-                            /^(?<type>repo|path):\((?<key>[^,]+),?(?<id>.*)\)$/
-                              .match(ret[:id])
-
+        m = /^(?<type>repo|path):\((?<key>[^,]+),?(?<id>.*)\)$/
+          .match(ret[:id]) or return ret
         id = m[:id].empty? ? m[:key].sub(%r{^[^/]+/}, "") : m[:id]
         ret.merge(id: id, type: m[:type], key: m[:key], nofetch: true)
       end
 
       def analyse_ref_numeric(ret)
-        return ret unless /^\d+$/.match?(ret[:id])
-
+        /^\d+$/.match?(ret[:id]) or return ret
         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..-1].map(&:strip)
+        ret
+      end
+
       def analyse_ref_code(code)
         ret = { id: code }
         code.nil? || code.empty? and return ret
@@ -157,13 +160,16 @@ module Metanorma
 
       # ref id = (usrlbl)code[:-]year
       # code = \[? number \]? | ident | nofetch(code) | hidden(code) |
-      # dropid(code) | # (repo|path):(key,code) | local-file(source,? key)
+      # dropid(code) | # (repo|path):(key,code) | local-file(source,? key) |
+      # merge(code, code) | dual(code, code)
       def analyse_ref_code_nested(ret)
-        analyse_ref_numeric(
-          analyse_ref_repo_path(
-            analyse_ref_dropid(
-              analyse_ref_hidden(
-                analyse_ref_nofetch(analyse_ref_localfile(ret)),
+        analyse_ref_dual(
+          analyse_ref_numeric(
+            analyse_ref_repo_path(
+              analyse_ref_dropid(
+                analyse_ref_hidden(
+                  analyse_ref_nofetch(analyse_ref_localfile(ret)),
+                ),
               ),
             ),
           ),
@@ -193,12 +199,12 @@ module Metanorma
       REF
 
       def ref_normalise(ref)
-        ref.gsub(/&amp;amp;/, "&amp;").gsub(%r{^<em>(.*)</em>}, "\\1")
+        ref.gsub("&amp;amp;", "&amp;").gsub(%r{^<em>(.*)</em>}, "\\1")
       end
 
       def ref_normalise_no_format(ref)
-        ref.gsub(/&amp;amp;/, "&amp;")
-          .gsub(/>\n/, "> \n")
+        ref.gsub("&amp;amp;", "&amp;")
+          .gsub(">\n", "> \n")
       end
 
       def skip_docid

data/lib/metanorma/standoc/validate.rb

@@ -11,6 +11,7 @@ module Metanorma
   module Standoc
     module Validate
       def content_validate(doc)
+        @doctype = doc.at("//bibdata/ext/doctype")&.text
         repeat_id_validate(doc.root) # feeds xref_validate
         xref_validate(doc) # feeds nested_asset_validate
         nested_asset_validate(doc)

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "2.5.5".freeze
+    VERSION = "2.6.1".freeze
   end
 end

data/metanorma-standoc.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "addressable", "~> 2.8.0"
   spec.add_dependency "asciidoctor", "~> 2.0.0"
   spec.add_dependency "iev", "~> 0.3.0"
-  spec.add_dependency "isodoc", "~> 2.6.1"
+  spec.add_dependency "isodoc", "~> 2.6.3"
   spec.add_dependency "metanorma", ">= 1.6.0"
   spec.add_dependency "metanorma-plugin-datastruct", "~> 0.2.0"
   spec.add_dependency "metanorma-plugin-glossarist", "~> 0.1.1"
@@ -40,9 +40,8 @@ Gem::Specification.new do |spec|
   # relaton-cli not just relaton, to avoid circular reference in metanorma
   spec.add_dependency "asciimath2unitsml", "~> 0.4.0"
   spec.add_dependency "concurrent-ruby"
-  spec.add_dependency "plurimath"
   spec.add_dependency "pngcheck"
-  spec.add_dependency "relaton-cli", "~> 1.15.0"
+  spec.add_dependency "relaton-cli", "~> 1.16.0"
   spec.add_dependency "relaton-iev", "~> 1.1.5"
   spec.add_dependency "unicode2latex", "~> 0.0.1"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 2.5.5
+  version: 2.6.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-06 00:00:00.000000000 Z
+date: 2023-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.1
+        version: 2.6.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.1
+        version: 2.6.3
 - !ruby/object:Gem::Dependency
   name: metanorma
   requirement: !ruby/object:Gem::Requirement
@@ -164,20 +164,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: plurimath
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: pngcheck
   requirement: !ruby/object:Gem::Requirement
@@ -198,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: 1.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: 1.16.0
 - !ruby/object:Gem::Dependency
   name: relaton-iev
   requirement: !ruby/object:Gem::Requirement
@@ -528,6 +514,7 @@ files:
 - lib/metanorma/standoc/merge_bibitems.rb
 - lib/metanorma/standoc/processor.rb
 - lib/metanorma/standoc/ref.rb
+- lib/metanorma/standoc/ref_queue.rb
 - lib/metanorma/standoc/ref_sect.rb
 - lib/metanorma/standoc/ref_utility.rb
 - lib/metanorma/standoc/render.rb