use a single instance of relaton-render (bibrender variable), so that…

lib/isodoc/convert.rb

@@ -10,7 +10,7 @@
 module IsoDoc
   class Convert < ::IsoDoc::Common
     attr_accessor :options, :i18n, :meta, :xrefs, :reqt_models,
-                  :requirements_processor, :doctype
+                  :requirements_processor, :doctype, :bibrender
 
     # htmlstylesheet: Generic stylesheet for HTML
     # htmlstylesheet_override: Override stylesheet for HTML
@@ -86,7 +86,7 @@ def requirements_processor
 
     def bibrenderer(options = {})
       ::Relaton::Render::IsoDoc::General.new(options.merge(language: @lang,
-                                                          i18nhash: @i18n.get))
+                                                           i18nhash: @i18n.get))
     end
 
     def convert1(docxml, filename, dir)
@@ -108,7 +108,8 @@ def convert_init(file, input_filename, debug)
       docxml.root.default_namespace = ""
       convert_i18n_init(docxml)
       metadata_init(@lang, @script, @locale, @i18n)
-      xref_init(@lang, @script, self, @i18n, { locale: @locale })
+      xref_init(@lang, @script, self, @i18n,
+                { locale: @locale, bibrender: @bibrender })
       docxml = preprocess_xslt(docxml)
       toc_init(docxml)
       [docxml, filename, dir]
@@ -121,7 +122,8 @@ def preprocess_xslt(docxml)
       end
       docxml
     rescue ::Error => e
-      require "debug"; binding.b
+      require "debug"
+      binding.b
     end
 
     def extract_preprocess_xslt(docxml)
@@ -136,6 +138,7 @@ def extract_preprocess_xslt(docxml)
     def convert_i18n_init(docxml)
       convert_i18n_init1(docxml)
       i18n_init(@lang, @script, @locale)
+      @bibrender ||= bibrenderer
       @reqt_models = requirements_processor
         .new({ default: "default", lang: @lang, script: @script,
                locale: @locale, labels: @i18n.get,

lib/isodoc/function/references.rb

@@ -32,8 +32,18 @@ def std_bibitem_entry(list, bib, _ordinal, biblio)
 
       def pref_ref_code(bib)
         bib["suppress_identifier"] == "true" and return nil
-        @bibrenderer ||= bibrenderer
-        data, = @bibrenderer.parse(bib)
+        ret = bib.xpath(ns("./docidentifier[@scope = 'biblio-tag']"))
+        ret.empty? or return ret.map(&:text)
+        ret = pref_ref_code_parse(bib) or return nil
+        ins = bib.at(ns("./docidentifier[last()]"))
+        ret.reverse.each do |r|
+          ins.next = "<docidentifier scope='biblio-tag'>#{docid_l10n(r)}</docidentifier>"
+        end
+        ret
+      end
+
+      def pref_ref_code_parse(bib)
+        data, = @bibrender.parse(bib)
         ret = data[:authoritative_identifier] or return nil
         ret.empty? and return nil
         ret

lib/isodoc/presentation_function/bibdata.rb

@@ -3,7 +3,6 @@
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
     def bibdata(docxml)
-      docid_prefixes(docxml)
       a = bibdata_current(docxml) or return
       address_precompose(a)
       bibdata_i18n(a)

lib/isodoc/presentation_function/refs.rb

@@ -37,8 +37,8 @@ def references_render(docxml)
         prep_for_rendering(b)
         m << to_xml(b)
       end.join
-      @xrefs.klass.bibrenderer.render_all("<references>#{refs}</references>",
-                             type: citestyle)
+      @bibrender.render_all("<references>#{refs}</references>",
+                                        type: citestyle)
     end
 
     def prep_for_rendering(bib)

lib/isodoc/presentation_xml_convert.rb

@@ -19,6 +19,7 @@ def initialize(options)
     end
 
     def convert1(docxml, _filename, _dir)
+      docid_prefixes(docxml) # feeds @xrefs.parse citation processing
       @xrefs.parse docxml
       bibitem_lookup(docxml)
       info docxml, nil

lib/isodoc/xref.rb

@@ -24,6 +24,7 @@ def initialize(lang, script, klass, i18n, options = {})
       @i18n = i18n
       @labels = @i18n.get
       @klass.i18n = @i18n
+      @klass.bibrender ||= options[:bibrender]
       @locale = options[:locale]
       @reqt_models = @klass.requirements_processor
         .new({