metanorma-standoc 2.6.0 → 2.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a9ee49a9aa313dae428fb537106a5da2c369f24da90074725e9e9a11bf4e75b
-  data.tar.gz: 6439d160874d60c6c7d41d5ed5bcc5480a842479b3b9e203db314360abf2063f
+  metadata.gz: bd044342634fd4dd1a67955a5f07785ae4762a0f63520e8254efe6e016853b1a
+  data.tar.gz: 89625dee3748cca3301727fc88650b0f916b8d2f60a258a9731ac09783c2465a
 SHA512:
-  metadata.gz: e7cfd27c5a9c81fbe673f9041b209ad691286a7ce217a647bde009eb1981b4cead8c89972bb7738f666bdd2c874db284d030329f9c64e952f176952ce62d44bc
-  data.tar.gz: 72e727e0016b53616c39dd22a66508b08d6f5a36044e7690670b05574a4632187c1e69ddd6ea09aa6238a8b934352ddfc653c1e79c026b62249369de51ec2be0
+  metadata.gz: 9958565ebd72f63b2a17af3f6cc89d5055d36f77ba15f4b80763ca64f3d45368b084e321ef05b0f49655943df029556a1ddd1c9cf27a7466299977b48aee57cc
+  data.tar.gz: 3979efde78ee18714f49a321ce89c51aa2039cc153863d118ddc788d610fae7788134688454bff075a9c95ace5bb097e5b24b169df9877f17a4321632b230b14

data/lib/metanorma/standoc/base.rb

@@ -178,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

@@ -45,7 +45,7 @@ module Metanorma
         element_name_cleanup(xmldoc)
         ref_cleanup(xmldoc) # feeds: bibitem_cleanup
         note_cleanup(xmldoc)
-        clausebefore_cleanup(xmldoc)
+        clausebefore_cleanup(xmldoc) # feeeds: floatingtitle_cleanup
         floatingtitle_cleanup(xmldoc)
         bibitem_cleanup(xmldoc) # feeds: normref_cleanup, biblio_cleanup,
         # reference_names, bpart_cleanup

data/lib/metanorma/standoc/cleanup_boilerplate.rb

@@ -86,16 +86,33 @@ module Metanorma
       end
 
       def termdef_boilerplate_insert(xmldoc, isodoc, once = false)
-        xmldoc.xpath(self.class::TERM_CLAUSE).each do |f|
-          f.at("./clause[@type = 'boilerplate'] | " \
-               "./note[@type = 'boilerplate']") and next
-          term_defs_boilerplate(f.at("./title"),
-                                xmldoc.xpath(".//termdocsource"),
-                                f.at(".//term"), f.at(".//p"), isodoc)
-          once and break
+        if once
+          f = termdef_boilerplate_insert_location(xmldoc) and
+            termdef_boilerplate_insert1(f, xmldoc, isodoc)
+        else
+          xmldoc.xpath(self.class::TERM_CLAUSE).each do |f|
+            termdef_boilerplate_insert1(f, xmldoc, isodoc)
+          end
         end
       end
 
+      def termdef_boilerplate_insert_location(xmldoc)
+        f = xmldoc.at(self.class::TERM_CLAUSE)
+        root = xmldoc.at("//sections/terms | //sections/clause[.//terms]")
+        !f || !root and return f || root
+        f.at("./following::terms") and return root
+        f.at("./preceding-sibling::clause") and return root
+        f
+      end
+
+      def termdef_boilerplate_insert1(sect, xmldoc, isodoc)
+        sect.at("./clause[@type = 'boilerplate'] | " \
+                "./note[@type = 'boilerplate']") and return
+        term_defs_boilerplate(sect.at("./title"),
+                              xmldoc.xpath(".//termdocsource"),
+                              sect.at(".//term"), sect.at(".//p"), isodoc)
+      end
+
       def boilerplate_cleanup(xmldoc)
         isodoc = boilerplate_isodoc(xmldoc)
         termdef_boilerplate_cleanup(xmldoc)

data/lib/metanorma/standoc/cleanup_section.rb

@@ -178,8 +178,8 @@ module Metanorma
       end
 
       def clausebefore_cleanup(xmldoc)
-        preface_clausebefore_cleanup(xmldoc)
         sections_clausebefore_cleanup(xmldoc)
+        preface_clausebefore_cleanup(xmldoc)
       end
 
       def preface_clausebefore_cleanup(xmldoc)
@@ -196,10 +196,20 @@ module Metanorma
       end
 
       def sections_clausebefore_cleanup(xmldoc)
-        return unless xmldoc.at("//sections")
-
+        xmldoc.at("//sections") or return
         ins = insert_before(xmldoc, "//sections")
-        xmldoc.xpath("//sections//*[@beforeclauses = 'true']").each do |x|
+        xmldoc.xpath("//sections//*[@beforeclauses = 'true']").reverse.each do |x|
+          x.delete("beforeclauses")
+          ins.previous = x.remove
+        end
+        endofpreface_clausebefore(xmldoc, ins)
+      end
+
+      # only move clausebefore notes at the very end of preface
+      def endofpreface_clausebefore(xmldoc, ins)
+        xmldoc.xpath("//preface//*[@beforeclauses = 'true']").reverse.each do |x|
+          textafternote = xmldoc.xpath("//preface//*") & x.xpath("./following::*")
+          textafternote.text.strip.empty? or break
           x.delete("beforeclauses")
           ins.previous = x.remove
         end
@@ -214,6 +224,7 @@ module Metanorma
       end
 
       def floatingtitle_cleanup(xmldoc)
+        pop_floating_title(xmldoc) # done again, after endofpreface_clausebefore
         floating_title_preface2sections(xmldoc)
       end
 

data/lib/metanorma/standoc/cleanup_section_names.rb

@@ -50,10 +50,30 @@ module Metanorma
                   "[not(.//definitions[@type = 'symbols'])]".freeze
 
       def section_names_terms_cleanup(xml)
-        replace_title(xml, "//definitions[@type = 'symbols']", @i18n&.symbols)
+        section_names_definitions(xml)
+        section_names_terms1_cleanup(xml)
+      end
+
+      def section_names_definitions(xml)
+        auto_name_definitions(xml) or return
+        replace_title(xml, "//definitions[@type = 'symbols']",
+                      @i18n&.symbols)
         replace_title(xml, "//definitions[@type = 'abbreviated_terms']",
                       @i18n&.abbrev)
-        replace_title(xml, "//definitions[not(@type)]", @i18n&.symbolsabbrev)
+        replace_title(xml, "//definitions[not(@type)]",
+                      @i18n&.symbolsabbrev)
+      end
+
+      def auto_name_definitions(xml)
+        xml.xpath("//definitions[@type = 'symbols']").size > 1 and return false
+        xml.xpath("//definitions[@type = 'abbreviated_terms']").size > 1 and
+          return false
+        xml.xpath("//definitions[not(@type)]").size > 1 and return false
+        true
+      end
+
+      def section_names_terms1_cleanup(xml)
+        auto_name_terms(xml) or return
         replace_title(xml, "//terms#{SYMnoABBR} | //clause[.//terms]#{SYMnoABBR}",
                       @i18n&.termsdefsymbols, true)
         replace_title(xml, "//terms#{ABBRnoSYM} | //clause[.//terms]#{ABBRnoSYM}",
@@ -69,6 +89,54 @@ module Metanorma
         )
       end
 
+      # do not auto-name terms sections if there are terms subclauses
+      # not covered by the auto titles,
+      # or if more than one title is covered by an auto title
+      def auto_name_terms(xml)
+        n = xml.at("//terms | //clause[.//terms]")
+        out = terms_subclauses(n)
+          .each_with_object({ term: 0, sna: 0, ans: 0, sa: 0, nsa: 0,
+                              tsna: 0, tans: 0, tsa: 0, tnsa: 0,
+                              termdef: 0, other: 0 }) do |x, m|
+          terms_subclause_type_tally(x, m, n)
+        end
+        out.delete(:parent)
+        !out.values.detect { |x| x > 1 } && out[:other].zero?
+      end
+
+      def terms_subclauses(node)
+        legal = %w(terms definitions clause)
+        [node, node&.elements].compact.flatten
+          .select do |x|
+            legal.include?(x.name) &&
+              !(x.name == "clause" && x["type"] == "boilerplate")
+          end
+      end
+
+      def terms_subclause_type_tally(node, m, parent)
+        sym = if (node.at(".//term") && !node.at(".//definitions")) ||
+            (node.name == "terms" && !node.at(".//term"))
+                unless m[:parent] == :term # don't count Term > Term twice
+                  :term
+                end
+              elsif node.at(".//term") && node.at("./self::*#{SYMnoABBR}") then :tsna
+              elsif node.at(".//term") && node.at("./self::*#{ABBRnoSYM}") then :tans
+              elsif node.at(".//term") && node.at("./self::*#{SYMABBR}") then :tsa
+              elsif node.at(".//term") && node.at("./self::*#{NO_SYMABBR}") then :tnsa
+              elsif node.at("./self::*#{SYMnoABBR}") then :sna
+              elsif node.at("./self::*#{ABBRnoSYM}") then :ans
+              elsif node.at("./self::*#{SYMABBR}") then :sa
+              elsif node.at("./self::*#{NO_SYMABBR}") then :nsa
+              elsif node.name == "definitions" # ignore
+              elsif node == parent && node.at(".//term") &&
+                  node.at(".//definitions")
+                :termdef
+              else :other
+              end
+        node == parent and m[:parent] = sym
+        sym and m[sym] += 1
+      end
+
       SECTION_CONTAINERS = %w(foreword introduction acknowledgements abstract
                               clause clause references terms definitions annex
                               appendix).freeze

data/lib/metanorma/standoc/converter.rb

@@ -63,6 +63,7 @@ module Metanorma
         treeprocessor Metanorma::Standoc::ToDoInlineAdmonitionBlock
         block Metanorma::Standoc::PlantUMLBlockMacro
         block Metanorma::Standoc::PseudocodeBlockMacro
+        block_macro Metanorma::Standoc::ColumnBreakBlockMacro
       end
 
       include ::Asciidoctor::Converter

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.6 -->
 <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>
@@ -1004,6 +1013,14 @@
       </oneOrMore>
     </element>
   </define>
+  <define name="BasicBlock" combine="choice">
+    <ref name="columnbreak"/>
+  </define>
+  <define name="columnbreak">
+    <element name="columnbreak">
+      <empty/>
+    </element>
+  </define>
   <define name="MultilingualRenderingType">
     <choice>
       <value>common</value>
@@ -1047,6 +1064,8 @@
         <ref name="keyword"/>
         <ref name="xref"/>
         <ref name="hyperlink"/>
+        <ref name="index"/>
+        <ref name="index-xref"/>
       </choice>
     </element>
   </define>
@@ -1060,6 +1079,8 @@
         <ref name="keyword"/>
         <ref name="xref"/>
         <ref name="hyperlink"/>
+        <ref name="index"/>
+        <ref name="index-xref"/>
       </choice>
     </element>
   </define>
@@ -1126,6 +1147,8 @@
             <choice>
               <ref name="PureTextElement"/>
               <ref name="stem"/>
+              <ref name="index"/>
+              <ref name="index-xref"/>
             </choice>
           </zeroOrMore>
         </element>
@@ -1136,6 +1159,8 @@
             <choice>
               <ref name="PureTextElement"/>
               <ref name="stem"/>
+              <ref name="index"/>
+              <ref name="index-xref"/>
             </choice>
           </zeroOrMore>
         </element>

data/lib/metanorma/standoc/macros.rb

@@ -61,6 +61,15 @@ module Metanorma
       end
     end
 
+    class ColumnBreakBlockMacro < Asciidoctor::Extensions::BlockMacroProcessor
+      use_dsl
+      named :columnbreak
+
+      def process(parent, _reader, _attrs)
+        create_pass_block parent, "<columnbreak/>", {}, subs: nil
+      end
+    end
+
     # refer https://github.com/asciidoctor/asciidoctor/blob/main/lib/asciidoctor/substitutors.rb
     # Not using TreeProcessor because that is still too close to
     # inline expressions being processed on access (e.g. titles)

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

@@ -32,6 +32,7 @@ module Metanorma
       end
 
       def output(isodoc_node, inname, outname, format, options = {})
+        options_preprocess(options)
         case format
         when :html
           options = options

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,243 @@
+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 supply_ref_prefix(ret)
+        ret
+      end
+
+      def fetch_ref1(code, year, opts)
+        code = supply_ref_prefix(code)
+        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)
+        ref[:code] &&= supply_ref_prefix(ref[:code])
+        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/render.rb

@@ -91,7 +91,7 @@ module Metanorma
                          pdf-allow-print pdf-allow-print-hq
                          pdf-allow-access-content pdf-encrypt-metadata fonts
                          font-license-agreement).each_with_object({}) do |x, m|
-          m[x.gsub(/-/, "").to_i] = node.attr(x)
+          m[x.gsub("-", "").to_i] = node.attr(x)
         end
 
         pdf_options.merge(fonts_manifest_option(node) || {})
@@ -102,7 +102,9 @@ module Metanorma
       end
 
       def presentation_xml_converter(node)
-        IsoDoc::PresentationXMLConvert.new(html_extract_attributes(node))
+        IsoDoc::PresentationXMLConvert
+          .new(html_extract_attributes(node)
+          .merge(output_formats: ::Metanorma::Standoc::Processor.new.output_formats)                                )
       end
 
       def default_fonts(node)

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "2.6.0".freeze
+    VERSION = "2.6.2".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-11 00:00:00.000000000 Z
+date: 2023-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -514,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