metanorma-standoc 1.3.14 → 1.3.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f57016af79feef706f7aa6f7ed25429151d28a991a1256d18a7c7f360398a57
-  data.tar.gz: deb09cc891267c6e447284b92cb4a62681ec2663c80be7ff6e1e6c9c6b0e58ef
+  metadata.gz: 1acc5a77f96ed36aad7d5c2aeb90ffc1e36e90e19d4b2c65ef42786a4b92b034
+  data.tar.gz: a7705016544389de2276b5aa684acbe9c62251cdb332c92bb24326622ab6712c
 SHA512:
-  metadata.gz: 6f28f65b3aa564d8fba875a77237fe4841920cf05823cfc849a65c24b582ced8037ff719e6463526e673ee151f3f00898884141f395ac3ad996ef3e225e081b4
-  data.tar.gz: 44124272721075937694660b04f7bb1ad3b3348069aa2f56a4353befdd8311f49575686db43a27006b84a5e95173c8a9a4eaf763475baf803f7ffb663f393b4c
+  metadata.gz: 5e4e53308b8066826879c486043238acf677be55aead2eeb080a58c006597da3d80e5238979ecf232552d2b0f87d3ca4294b71ad60615423de15ad3207deb741
+  data.tar.gz: 64a900f4af17327afd98276f8626130a82c773625bc1fdc8a62ef5d9448a90112084ac9d6f64462883a4a8600342b603e3f7e6260387b454b36840fa9f360c3e

data/lib/asciidoctor/standoc/base.rb

@@ -102,6 +102,7 @@ module Asciidoctor
         @bibdb = nil
         @seen_headers = []
         @datauriimage = node.attr("data-uri-image")
+        @boilerplateauthority = node.attr("boilerplate-authority")
         init_bib_caches(node)
         init_iev_caches(node)
         lang = (node.attr("language") || "en")

data/lib/asciidoctor/standoc/cleanup.rb

@@ -57,10 +57,10 @@ module Asciidoctor
         script_cleanup(xmldoc)
         docidentifier_cleanup(xmldoc)
         bookmark_cleanup(xmldoc)
-        smartquotes_cleanup(xmldoc)
         requirement_cleanup(xmldoc)
         bibdata_cleanup(xmldoc)
         boilerplate_cleanup(xmldoc)
+        smartquotes_cleanup(xmldoc)
         para_cleanup(xmldoc)
         xmldoc
       end

data/lib/asciidoctor/standoc/cleanup_boilerplate.rb

@@ -49,17 +49,57 @@ module Asciidoctor
       NORM_REF = "//bibliography/references[title = 'Normative References' or "\
         "title = 'Normative references']".freeze
 
-      def boilerplate_cleanup(xmldoc)
-        isodoc = IsoDoc::Convert.new({})
+      def boilerplate_isodoc(xmldoc)
+        x = xmldoc.dup
+        # TODO variable
+        x.root.add_namespace(nil, "http://riboseinc.com/isoxml")
+        xml = Nokogiri::XML(x.to_xml)
+        conv = html_converter(EmptyAttr.new)
         @lang = xmldoc&.at("//bibdata/language")&.text
         @script = xmldoc&.at("//bibdata/script")&.text
-        isodoc.i18n_init(@lang, @script)
+        conv.i18n_init(@lang, @script)
+        conv.metadata_init(@lang, @script, {})
+        conv.info(xml, nil)
+        conv
+      end
+
+      def boilerplate_cleanup(xmldoc)
+        isodoc = boilerplate_isodoc(xmldoc)
         f = xmldoc.at(self.class::TERM_CLAUSE) and
           term_defs_boilerplate(f.at("./title"),
                                 xmldoc.xpath(".//termdocsource"),
                                 f.at(".//term"), f.at(".//p"), isodoc)
         f = xmldoc.at(self.class::NORM_REF) and
-        norm_ref_preface(f)
+          norm_ref_preface(f)
+        initial_boilerplate(xmldoc, isodoc)
+      end
+
+      def initial_boilerplate(x, isodoc)
+        return if x.at("//boilerplate")
+        preface = x.at("//preface") || x.at("//sections") || x.at("//annex") ||
+          x.at("//references") || return
+        b = boilerplate(x, isodoc) or return
+        preface.previous = b
+      end
+
+      class EmptyAttr
+        def attr(_x)
+          nil
+        end
+        def attributes
+          {}
+        end
+      end
+
+      def boilerplate_file(xmldoc)
+          File.join(@libdir, "boilerplate.xml")
+      end
+
+      def boilerplate(xml, conv)
+        file = boilerplate_file(xml)
+        file = File.join(@localdir, @boilerplateauthority) if @boilerplateauthority
+        !file.nil? and File.exists?(file) or return
+          conv.populate_template((File.read(file, encoding: "UTF-8")), nil)
       end
 
       def bibdata_cleanup(xmldoc)

data/lib/asciidoctor/standoc/converter.rb

@@ -43,7 +43,16 @@ module Asciidoctor
         super
         basebackend "html"
         outfilesuffix ".xml"
-        @libdir = File.dirname(__FILE__)
+        #@libdir = File.dirname(__FILE__)
+        @libdir = File.dirname(self.class::_file || __FILE__)
+      end
+
+      class << self
+        attr_accessor :_file
+      end
+
+      def self.inherited( k )
+        k._file = caller.first[/^[^:]+/]
       end
 
       # path to isodoc assets in child gems

data/lib/asciidoctor/standoc/inline.rb

@@ -88,7 +88,7 @@ module Asciidoctor
         end.join
       end
 
-      def page_break(_node)
+      def page_break(node)
         noko { |xml| xml.pagebreak }.join
       end
 

data/lib/asciidoctor/standoc/ref.rb

@@ -42,8 +42,8 @@ module Asciidoctor
       end
 
       def docid(t, code)
-        type, code1 = /^\[\d+\]$|^\(.+\)$/.match(code) ?
-          ["metanorma", code.sub(/^\(/, "[").sub(/\)$/, "]")] :
+        type, code1 = /^\[\d+\]$|^\([^)]+\).*$/.match(code) ?
+          ["metanorma", Utils::mn_code(code)] :
           @bibdb&.docid_type(code) || [nil, code]
         code1.sub!(/^nofetch\((.+)\)$/, "\\1")
         t.docidentifier code1, **attr_code(type: type)
@@ -56,10 +56,11 @@ module Asciidoctor
 
       def isorefmatches(xml, m)
         yr = norm_year(m[:year])
-        ref = fetch_ref xml, m[:code], yr, title: m[:text]
+        ref = fetch_ref xml, m[:code], yr, title: m[:text], usrlbl: m[:usrlbl]
         return use_my_anchor(ref, m[:anchor]) if ref
         xml.bibitem **attr_code(ref_attributes(m)) do |t|
           t.title(**plaintxt) { |i| i << ref_normalise(m[:text]) }
+          docid(t, m[:usrlbl]) if m[:usrlbl]
           docid(t, id_and_year(m[:code], yr))
           yr and t.date **{ type: "published" } do |d|
             set_date_range(d, yr)
@@ -70,10 +71,12 @@ module Asciidoctor
 
       def isorefmatches2(xml, m)
         ref = fetch_ref xml, m[:code], nil, no_year: true, note: m[:fn],
-          title: m[:text]
+          title: m[:text], usrlbl: m[:usrlbl]
         return use_my_anchor(ref, m[:anchor]) if ref
+
         xml.bibitem **attr_code(ref_attributes(m)) do |t|
           t.title(**plaintxt) { |i| i << ref_normalise(m[:text]) }
+          docid(t, m[:usrlbl]) if m[:usrlbl]
           docid(t, id_and_year(m[:code], "--"))
           t.date **{ type: "published" } do |d|
             d.on "--"
@@ -98,10 +101,12 @@ module Asciidoctor
         hasyr =  m.names.include?("year") && yr != "--"
         noyr =  m.names.include?("year") && yr == "--"
         ref = fetch_ref xml, m[:code], hasyr ? yr : nil,
-          all_parts: true, no_year: noyr, text: m[:text]
+          all_parts: true, no_year: noyr, text: m[:text], usrlbl: m[:usrlbl]
         return use_my_anchor(ref, m[:anchor]) if ref
+
         xml.bibitem(**attr_code(ref_attributes(m))) do |t|
           t.title(**plaintxt) { |i| i << ref_normalise(m[:text]) }
+          docid(t, m[:usrlbl]) if m[:usrlbl]
           docid(t, id_and_year(m[:code], yr) + " (all parts)")
           conditional_date(t, m, noyr)
           iso_publisher(t, m[:code])
@@ -115,9 +120,10 @@ module Asciidoctor
 
       def fetch_ref(xml, code, year, **opts)
         return nil if opts[:no_year]
+        code = code.sub(/^\([^)]+\)/, "")
         hit = @bibdb&.fetch(code, year, opts)
         return nil if hit.nil?
-        xml.parent.add_child(Utils::smart_render_xml(hit, code, opts[:title]))
+        xml.parent.add_child(Utils::smart_render_xml(hit, code, opts[:title], opts[:usrlbl]))
         xml
       rescue RelatonBib::RequestError
         warn "Could not retrieve #{code}: no access to online site"
@@ -129,6 +135,7 @@ module Asciidoctor
           t.formattedref **{ format: "application/x-isodoc+xml" } do |i|
             i << ref_normalise_no_format(m[:text])
           end
+          docid(t, m[:usrlbl]) if m[:usrlbl]
           docid(t, /^\d+$/.match(m[:code]) ? "[#{m[:code]}]" : m[:code])
         end
       end
@@ -146,7 +153,7 @@ module Asciidoctor
         end
         unless m[:code] && /^\d+$/.match(m[:code])
           ref = fetch_ref xml, m[:code],
-            m.names.include?("year") ? m[:year] : nil, { title: m[:text] }
+            m.names.include?("year") ? m[:year] : nil, title: m[:text], usrlbl: m[:usrlbl]
           return use_my_anchor(ref, m[:anchor]) if ref
         end
         refitem_render(xml, m)
@@ -154,33 +161,31 @@ module Asciidoctor
 
       def ref_normalise(ref)
         ref.
-          # gsub(/&#8201;&#8212;&#8201;/, " -- ").
           gsub(/&amp;amp;/, "&amp;").
           gsub(%r{^<em>(.*)</em>}, "\\1")
       end
 
       def ref_normalise_no_format(ref)
         ref.
-          # gsub(/&#8201;&#8212;&#8201;/, " -- ").
           gsub(/&amp;amp;/, "&amp;")
       end
 
       ISO_REF = %r{^<ref\sid="(?<anchor>[^"]+)">
-      \[(?<code>(ISO|IEC)[^0-9]*\s[0-9-]+|IEV)
+      \[(?<usrlbl>\([^)]+\))?(?<code>(ISO|IEC)[^0-9]*\s[0-9-]+|IEV)
       (:(?<year>[0-9][0-9-]+))?\]</ref>,?\s*
         (?<text>.*)$}xm
 
         ISO_REF_NO_YEAR = %r{^<ref\sid="(?<anchor>[^"]+)">
-      \[(?<code>(ISO|IEC)[^0-9]*\s[0-9-]+):(--|\&\#821[12]\;)\]</ref>,?\s*
+      \[(?<usrlbl>\([^)]+\))?(?<code>(ISO|IEC)[^0-9]*\s[0-9-]+):(--|\&\#821[12]\;)\]</ref>,?\s*
         (<fn[^>]*>\s*<p>(?<fn>[^\]]+)</p>\s*</fn>)?,?\s?(?<text>.*)$}xm
 
         ISO_REF_ALL_PARTS = %r{^<ref\sid="(?<anchor>[^"]+)">
-        \[(?<code>(ISO|IEC)[^0-9]*\s[0-9]+)(:(?<year>--|\&\#821[12]\;|[0-9][0-9-]+))?\s
+        \[(?<usrlbl>\([^)]+\))?(?<code>(ISO|IEC)[^0-9]*\s[0-9]+)(:(?<year>--|\&\#821[12]\;|[0-9][0-9-]+))?\s
         \(all\sparts\)\]</ref>,?\s*
           (<fn[^>]*>\s*<p>(?<fn>[^\]]+)</p>\s*</fn>,?\s?)?(?<text>.*)$}xm
 
           NON_ISO_REF = %r{^<ref\sid="(?<anchor>[^"]+)">
-        \[(?<code>[^\]]+?)([:-](?<year>(19|20)[0-9][0-9]))?\]</ref>,?\s*
+        \[(?<usrlbl>\([^)]+\))?(?<code>[^\]]+?)([:-](?<year>(19|20)[0-9][0-9]))?\]</ref>,?\s*
           (?<text>.*)$}xm
 
           # @param item [String]
@@ -199,7 +204,6 @@ module Asciidoctor
           matched, matched2, matched3 = reference1_matches(item)
           if matched3.nil? && matched2.nil? && matched.nil?
             refitem(xml, item, node)
-            # elsif fetch_ref(matched3 || matched2 || matched, xml)
           elsif !matched.nil? then isorefmatches(xml, matched)
           elsif !matched2.nil? then isorefmatches2(xml, matched2)
           elsif !matched3.nil? then isorefmatches3(xml, matched3)

data/lib/asciidoctor/standoc/utils.rb

@@ -76,7 +76,11 @@ module Asciidoctor
           end
         end
 
-        def emend_biblio(xml, code, title)
+        def mn_code(code)
+        code.sub(/^\(/, "[").sub(/\).*$/, "]").sub(/^nofetch\((.+)\)$/, "\\1")
+      end
+
+        def emend_biblio(xml, code, title, usrlbl)
           unless xml.at("/bibitem/docidentifier[not(@type = 'DOI')][text()]")
             warn "ERROR: No document identifier retrieved for #{code}"
             xml.root << "<docidentifier>#{code}</docidentifier>"
@@ -85,6 +89,8 @@ module Asciidoctor
             warn "ERROR: No title retrieved for #{code}"
             xml.root << "<title>#{title || "(MISSING TITLE)"}</title>"
           end
+          usrlbl and xml.at("/bibitem/docidentifier").next = 
+            "<docidentifier type='metanorma'>#{mn_code(usrlbl)}</docidentifier>"
         end
 
         def endash_date(elem)
@@ -93,10 +99,10 @@ module Asciidoctor
           end
         end
 
-        def smart_render_xml(x, code, title)
+        def smart_render_xml(x, code, title, usrlbl)
           xstr = x.to_xml if x.respond_to? :to_xml
           xml = Nokogiri::XML(xstr)
-          emend_biblio(xml, code, title)
+          emend_biblio(xml, code, title, usrlbl)
           xml.xpath("//date").each { |d| endash_date(d) }
           xml.traverse do |n|
             n.text? and n.replace(smartformat(n.text))

data/lib/metanorma/standoc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Standoc
-    VERSION = "1.3.14".freeze
+    VERSION = "1.3.15".freeze
   end
 end

data/spec/asciidoctor-standoc/cleanup_spec.rb

@@ -1434,6 +1434,47 @@ it "removes bibdata bibitem IDs" do
 OUTPUT
 end
 
+it "imports boilerplate file" do
+  expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    = Document title
+    Author
+    :docfile: test.adoc
+    :nodoc:
+    :novalid:
+    :no-isobib:
+    :docstage: 10
+    :boilerplate-authority: spec/assets/boilerplate.xml
+
+    == Clause 1
+
+    INPUT
+    <standard-document xmlns='http://riboseinc.com/isoxml'>
+  <bibdata type='standard'>
+    <title language='en' format='text/plain'>Document title</title>
+    <language>en</language>
+    <script>Latn</script>
+    <status>
+      <stage>10</stage>
+    </status>
+    <copyright>
+      <from>#{Date.today.year}</from>
+    </copyright>
+    <ext>
+      <doctype>article</doctype>
+    </ext>
+  </bibdata>
+  <boilerplate>
+    <text>10</text>
+  </boilerplate>
+  <sections>
+    <clause id='_' inline-header='false' obligation='normative'>
+      <title>Clause 1</title>
+    </clause>
+  </sections>
+</standard-document>
+    OUTPUT
+end
+
 
   private
 

data/spec/asciidoctor-standoc/isobib_cache_spec.rb

@@ -687,19 +687,19 @@ EOS
 private
 
   def mock_isobib_get_123
-    expect(RelatonIso::IsoBibliography).to receive(:get).with("ISO 123", "2001", {:title=>"<em>Standard</em>"}).and_return(RelatonIsoBib::XMLParser.from_xml(ISO_123_DATED))
+    expect(RelatonIso::IsoBibliography).to receive(:get).with("ISO 123", "2001", {:title=>"<em>Standard</em>", :usrlbl=>nil}).and_return(RelatonIsoBib::XMLParser.from_xml(ISO_123_DATED))
   end
 
   def mock_isobib_get_123_undated
-    expect(RelatonIso::IsoBibliography).to receive(:get).with("ISO 123", nil, {:title=>"<em>Standard</em>"}).and_return(RelatonIsoBib::XMLParser.from_xml(ISO_123_UNDATED))
+    expect(RelatonIso::IsoBibliography).to receive(:get).with("ISO 123", nil, {:title=>"<em>Standard</em>", :usrlbl=>nil}).and_return(RelatonIsoBib::XMLParser.from_xml(ISO_123_UNDATED))
   end
 
   def mock_isobib_get_124
-    expect(RelatonIso::IsoBibliography).to receive(:get).with("ISO 124", "2014", {:title=>"<em>Standard</em>"}).and_return(RelatonIsoBib::XMLParser.from_xml(ISO_124_DATED))
+    expect(RelatonIso::IsoBibliography).to receive(:get).with("ISO 124", "2014", {:title=>"<em>Standard</em>", :usrlbl=>nil}).and_return(RelatonIsoBib::XMLParser.from_xml(ISO_124_DATED))
   end
 
   def mock_ietfbib_get_123
-    expect(RelatonIetf::IetfBibliography).to receive(:get).with("RFC 123", nil, {:title=>"<em>Standard</em>"}).and_return(RelatonIsoBib::XMLParser.from_xml(IETF_123_SHORT))
+    expect(RelatonIetf::IetfBibliography).to receive(:get).with("RFC 123", nil, {:title=>"<em>Standard</em>", :usrlbl=>nil}).and_return(RelatonIsoBib::XMLParser.from_xml(IETF_123_SHORT))
   end
 
 end

data/spec/asciidoctor-standoc/refs_spec.rb

@@ -10,6 +10,7 @@ RSpec.describe Asciidoctor::Standoc do
       == Normative References
 
       * [[[iso123,ISO 123]]] _Standard_
+      * [[[iso124,(1)ISO 123]]] _Standard_
     INPUT
       #{BLANK_HDR}
       <sections>
@@ -26,6 +27,17 @@ RSpec.describe Asciidoctor::Standoc do
            </organization>
          </contributor>
        </bibitem>
+       <bibitem id='iso124' type='standard'>
+  <title format='text/plain'>Standard</title>
+  <docidentifier type='metanorma'>[1]</docidentifier>
+  <docidentifier>ISO 123</docidentifier>
+  <contributor>
+    <role type='publisher'/>
+    <organization>
+      <name>ISO</name>
+    </organization>
+  </contributor>
+</bibitem>
       </references>
       </bibliography>
       </standard-document>
@@ -39,6 +51,7 @@ RSpec.describe Asciidoctor::Standoc do
       == Normative References
 
       * [[[iso123,ISO 123:1066-1067]]] _Standard_
+      * [[[iso124,(1)ISO 123:1066-1067]]] _Standard_
     INPUT
       #{BLANK_HDR}
       <sections>
@@ -59,6 +72,22 @@ RSpec.describe Asciidoctor::Standoc do
     </organization>
   </contributor>
        </bibitem>
+       <bibitem id="iso124" type="standard">
+          <title format="text/plain">Standard</title>
+          <docidentifier type='metanorma'>[1]</docidentifier>
+  <docidentifier>ISO 123:1066-1067</docidentifier>
+  <date type="published">
+    <from>1066</from>
+    <to>1067</to>
+  </date>
+  <contributor>
+    <role type="publisher"/>
+    <organization>
+      <name>ISO</name>
+    </organization>
+  </contributor>
+       </bibitem>
+
       </references>
       </bibliography>
       </standard-document>
@@ -67,12 +96,14 @@ RSpec.describe Asciidoctor::Standoc do
 
   it "repairs simple fetched ISO reference" do
     mock_isobib_get_123_no_docid
+    mock_isobib_get_123_no_docid_lbl
     input = <<~"INPUT"
         #{ISOBIB_BLANK_HDR}
         [bibliography]
         == Normative References
 
         * [[[iso123,ISO 123]]] _Standard_
+        * [[[iso124,(1)ISO 123]]] _Standard_
       INPUT
     expect(xmlpp(strip_guid(Asciidoctor.convert(input, backend: :standoc, header_footer: true)))).to be_equivalent_to xmlpp( <<~"OUTPUT")
        #{BLANK_HDR}
@@ -122,7 +153,53 @@ RSpec.describe Asciidoctor::Standoc do
   </relation>
 <docidentifier>ISO 123</docidentifier>
 <title><em>Standard</em></title>
-</bibitem> </references></bibliography>
+</bibitem> 
+<bibitem type="standard" id="iso124">
+  <uri type="src">https://www.iso.org/standard/23281.html</uri>
+  <uri type="obp">https://www.iso.org/obp/ui/#!iso:std:23281:en</uri>
+  <uri type="rss">https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</uri>
+  <date type="published">
+    <on>2001</on>
+  </date>
+  <contributor>
+    <role type="publisher"/>
+    <organization>
+      <name>International Organization for Standardization</name>
+      <abbreviation>ISO</abbreviation>
+      <uri>www.iso.org</uri>
+    </organization>
+  </contributor>
+  <edition>3</edition>
+  <language>en</language>
+  <language>fr</language>
+  <script>Latn</script>
+  <status>
+    <stage>Published</stage>
+  </status>
+  <copyright>
+    <from>2001</from>
+    <owner>
+      <organization>
+        <name>ISO</name>
+        <abbreviation/>
+      </organization>
+    </owner>
+  </copyright>
+  <relation type="obsoletes">
+    <bibitem type="standard">
+      <formattedref format="text/plain">ISO 123:1985</formattedref>
+    </bibitem>
+  </relation>
+  <relation type="updates">
+    <bibitem type="standard">
+      <formattedref format="text/plain">ISO 123:2001</formattedref>
+    </bibitem>
+  </relation>
+<docidentifier>ISO 123</docidentifier>
+ <docidentifier type='metanorma'>[1]</docidentifier>
+<title><em>Standard</em></title>
+</bibitem>
+</references></bibliography>
 </standard-document>
      OUTPUT
         expect { Asciidoctor.convert(input, backend: :standoc, header_footer: true) }.to output(/ERROR: No document identifier retrieved for ISO 123/).to_stderr
@@ -137,6 +214,7 @@ RSpec.describe Asciidoctor::Standoc do
         == Normative References
 
         * [[[iso123,ISO 123]]] _Standard_
+        * [[[iso123,(1)ISO 123]]] _Standard_
       INPUT
         #{BLANK_HDR}
        <sections>
@@ -189,7 +267,56 @@ RSpec.describe Asciidoctor::Standoc do
            </bibitem>
          </relation>
          <place>Geneva</place>
-         </bibitem> </references></bibliography>
+         </bibitem> 
+         <bibitem id="iso123" type="standard">
+         <fetched>#{Date.today}</fetched>
+         <title type="title-intro" format="text/plain" language="en" script="Latn">Rubber latex</title>
+         <title type="title-main" format="text/plain" language="en" script="Latn">Sampling</title>
+         <title type="main" format="text/plain" language="en" script="Latn">Rubber latex – Sampling</title>
+         <title type="title-intro" format="text/plain" language="fr" script="Latn">Latex de caoutchouc</title>
+         <title type="title-main" format="text/plain" language="fr" script="Latn">Échantillonnage</title>
+         <title type="main" format="text/plain" language="fr" script="Latn">Latex de caoutchouc – Échantillonnage</title>
+         <uri type="src">https://www.iso.org/standard/23281.html</uri>
+         <uri type="obp">https://www.iso.org/obp/ui/#!iso:std:23281:en</uri>
+         <uri type="rss">https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</uri>
+         <docidentifier type="ISO">ISO 123:2001</docidentifier>
+         <docidentifier type='metanorma'>[1]</docidentifier>
+         <docnumber>123</docnumber>
+         <date type="published">
+                <on>2001</on>
+         </date>
+         <contributor>
+           <role type="publisher"/>
+           <organization>
+             <name>International Organization for Standardization</name>
+             <abbreviation>ISO</abbreviation>
+             <uri>www.iso.org</uri>
+           </organization>
+         </contributor>
+         <edition>3</edition>
+         <language>en</language>
+         <language>fr</language>
+         <script>Latn</script>
+         <status>
+           <stage>90</stage>
+           <substage>93</substage>
+         </status>
+         <copyright>
+           <from>2001</from>
+           <owner>
+             <organization>
+               <name>ISO</name>
+             </organization>
+           </owner>
+         </copyright>
+         <relation type="obsoletes">
+           <bibitem type="standard">
+             <formattedref format="text/plain">ISO 123:1985</formattedref>
+           </bibitem>
+         </relation>
+         <place>Geneva</place>
+         </bibitem>
+        </references></bibliography>
        </standard-document>
        OUTPUT
 =begin
@@ -253,6 +380,7 @@ RSpec.describe Asciidoctor::Standoc do
       == Normative References
 
       * [[[iso123,IEC 123]]] _Standard_
+      * [[[iso124,(1)IEC 123]]] _Standard_
     INPUT
        #{BLANK_HDR}
               <sections>
@@ -269,6 +397,17 @@ RSpec.describe Asciidoctor::Standoc do
            </organization>
          </contributor>
        </bibitem>
+       <bibitem id='iso124' type='standard'>
+  <title format='text/plain'>Standard</title>
+  <docidentifier type='metanorma'>[1]</docidentifier>
+  <docidentifier>IEC 123</docidentifier>
+  <contributor>
+    <role type='publisher'/>
+    <organization>
+      <name>IEC</name>
+    </organization>
+  </contributor>
+</bibitem>
        </references>
        </bibliography>
        </standard-document>
@@ -286,6 +425,8 @@ RSpec.describe Asciidoctor::Standoc do
 
         * [[[iso123,ISO/IEC TR 12382:1992]]] _Standard_
         * [[[iso124,ISO 124:2014]]] _Standard_
+        * [[[iso125,(1)ISO/IEC TR 12382:1992]]] _Standard_
+        * [[[iso126,(1)ISO 124:2014]]] _Standard_
       INPUT
         #{BLANK_HDR}
         <sections>
@@ -390,6 +531,106 @@ RSpec.describe Asciidoctor::Standoc do
             </bibitem>
           </relation>
           <place>Geneva</place>
+          </bibitem>
+          <bibitem type="standard" id="iso125">
+          <fetched>#{Date.today}</fetched>
+          <title type="title-main" format="text/plain" language="en" script="Latn">Permuted index of the vocabulary of information technology</title>
+          <title type="main" format="text/plain" language="en" script="Latn">Permuted index of the vocabulary of information technology</title>
+          <title type="title-main" format="text/plain" language="fr" script="Latn">Index permuté du vocabulaire des technologies de l’information</title>
+          <title type="main" format="text/plain" language="fr" script="Latn">Index permuté du vocabulaire des technologies de l’information</title>
+          <uri type="src">https://www.iso.org/standard/21071.html</uri>
+          <uri type="obp">https://www.iso.org/obp/ui/#!iso:std:21071:en</uri>
+          <uri type="rss">https://www.iso.org/contents/data/standard/02/10/21071.detail.rss</uri>
+          <docidentifier type="ISO">ISO/IEC TR 12382:1992</docidentifier>
+          <docidentifier type='metanorma'>[1]</docidentifier>
+          <docnumber>12382</docnumber>
+          <date type="published">
+            <on>1992</on>
+          </date>
+          <contributor>
+            <role type="publisher"/>
+            <organization>
+              <name>International Organization for Standardization</name>
+              <abbreviation>ISO</abbreviation>
+              <uri>www.iso.org</uri>
+            </organization>
+          </contributor>
+          <contributor>
+            <role type="publisher"/>
+            <organization>
+              <name>International Electrotechnical Commission</name>
+              <abbreviation>IEC</abbreviation>
+              <uri>www.iec.ch</uri>
+            </organization>
+          </contributor>
+          <edition>2</edition>
+          <language>en</language>
+          <language>fr</language>
+          <script>Latn</script>
+          <abstract format="text/plain" language="en" script="Latn">Contains a permuted index of all terms included in the parts 1 — 28 of ISO 2382. If any of these parts has been revised, the present TR refers to the revision.</abstract>
+          <status>
+            <stage>90</stage>
+            <substage>93</substage>
+          </status>
+          <copyright>
+            <from>1992</from>
+            <owner>
+              <organization>
+                <name>ISO/IEC</name>
+              </organization>
+            </owner>
+          </copyright>
+          <place>Geneva</place>
+        </bibitem>
+          <bibitem type="standard" id="iso126">
+          <fetched>#{Date.today}</fetched>
+          <title type="title-intro" format="text/plain" language="en" script="Latn">Latex, rubber</title>
+          <title type="title-main" format="text/plain" language="en" script="Latn">Determination of total solids content</title>
+          <title type="main" format="text/plain" language="en" script="Latn">Latex, rubber – Determination of total solids content</title>
+          <title type="title-intro" format="text/plain" language="fr" script="Latn">Latex de caoutchouc</title>
+<title type="title-main" format="text/plain" language="fr" script="Latn">Détermination des matières solides totales</title>
+          <title type="main" format="text/plain" language="fr" script="Latn">Latex de caoutchouc – Détermination des matières solides totales</title>
+          <uri type="src">https://www.iso.org/standard/61884.html</uri>
+          <uri type="obp">https://www.iso.org/obp/ui/#!iso:std:61884:en</uri>
+          <uri type="rss">https://www.iso.org/contents/data/standard/06/18/61884.detail.rss</uri>
+          <docidentifier type="ISO">ISO 124:2014</docidentifier>
+          <docidentifier type='metanorma'>[1]</docidentifier>
+          <docnumber>124</docnumber>
+          <date type="published">
+            <on>2014</on>
+          </date>
+          <contributor>
+            <role type="publisher"/>
+            <organization>
+              <name>International Organization for Standardization</name>
+              <abbreviation>ISO</abbreviation>
+              <uri>www.iso.org</uri>
+            </organization>
+          </contributor>
+          <edition>7</edition>
+          <language>en</language>
+          <language>fr</language>
+          <script>Latn</script>
+          <abstract format="text/plain" language="en" script="Latn">ISO 124:2014 specifies methods for the determination of the total solids content of natural rubber field and concentrated latices and synthetic rubber latex. These methods are not necessarily suitable for latex from natural sources other than the Hevea brasiliensis, for vulcanized latex, for compounded latex, or for artificial dispersions of rubber.</abstract>
+          <abstract format="text/plain" language="fr" script="Latn">L’ISO 124:2014 spécifie des méthodes pour la détermination des matières solides totales dans le latex de plantation, le latex de concentré de caoutchouc naturel et le latex de caoutchouc synthétique. Ces méthodes ne conviennent pas nécessairement au latex d’origine naturelle autre que celui de l’Hevea brasiliensis, au latex vulcanisé, aux mélanges de latex, ou aux dispersions artificielles de caoutchouc.</abstract>
+          <status>
+            <stage>90</stage>
+            <substage>93</substage>
+          </status>
+          <copyright>
+            <from>2014</from>
+            <owner>
+              <organization>
+                <name>ISO</name>
+              </organization>
+            </owner>
+          </copyright>
+          <relation type="obsoletes">
+            <bibitem type="standard">
+              <formattedref format="text/plain">ISO 124:2011</formattedref>
+            </bibitem>
+          </relation>
+          <place>Geneva</place>
         </bibitem>
         </references></bibliography>
         </standard-document>
@@ -485,6 +726,7 @@ OUTPUT
       * [[[iso123,ISO 123:--]]] _Standard_
       * [[[iso124,ISO 124:—]]]{blank}footnote:[The standard is in press] _Standard_
       * [[[iso125,ISO 125:&ndash;]]], footnote:[The standard is in press] _Standard_
+      * [[[iso126,(1)ISO 123:--]]] _Standard_
     INPUT
        #{BLANK_HDR}
        <sections>
@@ -532,6 +774,20 @@ OUTPUT
          </contributor>
          <note format="text/plain">ISO DATE: The standard is in press</note>
        </bibitem>
+       <bibitem id='iso126' type='standard'>
+  <title format='text/plain'>Standard</title>
+  <docidentifier type='metanorma'>[1]</docidentifier>
+  <docidentifier>ISO 123:—</docidentifier>
+  <date type='published'>
+    <on>–</on>
+  </date>
+  <contributor>
+    <role type='publisher'/>
+    <organization>
+      <name>ISO</name>
+    </organization>
+  </contributor>
+</bibitem>
        </references>
        </bibliography>
        </standard-document>
@@ -547,6 +803,7 @@ OUTPUT
       == Normative References
 
       * [[[iso123,ISO 123:1066 (all parts)]]] _Standard_
+      * [[[iso124,(1)ISO 123:1066 (all parts)]]] _Standard_
     INPUT
       #{BLANK_HDR}
       <sections>
@@ -569,6 +826,23 @@ OUTPUT
                 <referenceFrom>all</referenceFrom>
         </extent>
        </bibitem>
+       <bibitem id='iso124' type='standard'>
+  <title format='text/plain'>Standard</title>
+  <docidentifier type='metanorma'>[1]</docidentifier>
+  <docidentifier>ISO 123:1066 (all parts)</docidentifier>
+  <date type='published'>
+    <on>1066</on>
+  </date>
+  <contributor>
+    <role type='publisher'/>
+    <organization>
+      <name>ISO</name>
+    </organization>
+  </contributor>
+  <extent type='part'>
+    <referenceFrom>all</referenceFrom>
+  </extent>
+</bibitem>
       </references>
       </bibliography>
       </standard-document>
@@ -584,6 +858,7 @@ OUTPUT
         == Normative References
 
         * [[[iso123,IETF(RFC 8341)]]], _Standard_
+        * [[[iso124,(1)IETF(RFC 8341)]]], _Standard_
 
         == Clause 4
 
@@ -651,6 +926,59 @@ OUTPUT
       <number>8341</number>
     </series>
     <place>Fremont, CA</place>
+  </bibitem>
+  <bibitem id="iso124" type="standard">
+    <fetched>#{Date.today}</fetched>
+    <title format="text/plain" language="en" script="Latn">Network Configuration Access Control Model</title>
+    <uri type='xml'>https://xml2rfc.tools.ietf.org/public/rfc/bibxml/reference.RFC.8341.xml</uri>
+    <uri type="src">https://www.rfc-editor.org/info/rfc8341</uri>
+    <docidentifier type="IETF">RFC 8341</docidentifier>
+    <docidentifier type='metanorma'>[1]</docidentifier>
+    <docidentifier type='rfc-anchor'>RFC8341</docidentifier>
+    <docidentifier type="DOI">10.17487/RFC8341</docidentifier>
+    <date type="published">
+      <on>2018-03</on>
+    </date>
+    <contributor>
+      <role type="author"/>
+      <person>
+        <name>
+          <completename language="en">A. Bierman</completename>
+        </name>
+        <affiliation>
+          <organization>
+            <name>IETF</name>
+            <abbreviation>IETF</abbreviation>
+          </organization>
+        </affiliation>
+      </person>
+    </contributor>
+    <contributor>
+      <role type="author"/>
+      <person>
+        <name>
+          <completename language="en">M. Bjorklund</completename>
+        </name>
+        <affiliation>
+          <organization>
+            <name>IETF</name>
+            <abbreviation>IETF</abbreviation>
+          </organization>
+        </affiliation>
+      </person>
+    </contributor>
+    <language>en</language>
+    <script>Latn</script>
+    <abstract format="text/plain" language="en" script="Latn">The standardization of network configuration interfaces for use with the Network Configuration Protocol (NETCONF) or the RESTCONF protocol requires a structured and secure operating environment that promotes human usability and multi-vendor interoperability.  There is a need for standard mechanisms to restrict NETCONF or RESTCONF protocol access for particular users to a preconfigured subset of all available NETCONF or RESTCONF protocol operations and content.  This document defines such an access control model.This document obsoletes RFC 6536.</abstract>
+    <series type="main">
+      <title format="text/plain" language="en" script="Latn">STD</title>
+      <number>91</number>
+    </series>
+    <series type="main">
+      <title format="text/plain" language="en" script="Latn">RFC</title>
+      <number>8341</number>
+    </series>
+    <place>Fremont, CA</place>
   </bibitem>
         </references>
         </bibliography>
@@ -666,6 +994,7 @@ OUTPUT
       == Normative References
 
       * [[[iso123,XYZ 123:1066 (all parts)]]] _Standard_
+      * [[[iso124,(1)XYZ 123:1066 (all parts)]]] _Standard_
     INPUT
        #{BLANK_HDR}
               <sections>
@@ -679,6 +1008,13 @@ OUTPUT
          </formattedref>
          <docidentifier>XYZ 123:1066 (all parts)</docidentifier>
        </bibitem>
+       <bibitem id='iso124'>
+  <formattedref format='application/x-isodoc+xml'>
+    <em>Standard</em>
+  </formattedref>
+  <docidentifier type='metanorma'>[1]</docidentifier>
+  <docidentifier>XYZ 123:1066 (all parts)</docidentifier>
+</bibitem>
        </references>
        </bibliography>
        </standard-document>
@@ -695,6 +1031,7 @@ OUTPUT
       * [[[iso124,(B)]]] _Standard_
       * [[[iso125,1]]] _Standard_
       * [[[iso126,(A)]]] _Standard_
+      * [[[iso127,(4)XYZ 123:1066 (all parts)]]] _Standard_
     INPUT
        #{BLANK_HDR}
               <sections>
@@ -722,6 +1059,13 @@ OUTPUT
          </formattedref>
          <docidentifier type="metanorma">[A]</docidentifier>
        </bibitem>
+<bibitem id='iso127'>
+  <formattedref format='application/x-isodoc+xml'>
+    <em>Standard</em>
+  </formattedref>
+  <docidentifier type='metanorma'>[5]</docidentifier>
+  <docidentifier>XYZ 123:1066 (all parts)</docidentifier>
+</bibitem>
        </references>
        </bibliography>
        </standard-document>
@@ -738,6 +1082,7 @@ OUTPUT
       == Normative References
 
       * [[[iso123,ISO 123]]] _Standard_
+      * [[[iso124,(1)ISO 123]]] _Standard_
     INPUT
       <?xml version="1.0" encoding="UTF-8"?>
       <standard-document xmlns="http://riboseinc.com/isoxml">
@@ -768,6 +1113,17 @@ OUTPUT
           </organization>
         </contributor>
       </bibitem>
+      <bibitem id='iso124' type='standard'>
+  <title format='text/plain'>Standard</title>
+  <docidentifier type='metanorma'>[1]</docidentifier>
+  <docidentifier type='ISO'>ISO 123</docidentifier>
+  <contributor>
+    <role type='publisher'/>
+    <organization>
+      <name>ISO</name>
+    </organization>
+  </contributor>
+</bibitem>
       </references></bibliography>
       </standard-document>
     OUTPUT
@@ -786,7 +1142,15 @@ OUTPUT
     end
 
     def mock_isobib_get_123_no_docid
-      expect(RelatonIso::IsoBibliography).to receive(:get).with("ISO 123", nil, {:title=>"<em>Standard</em>"}) do
+      expect(RelatonIso::IsoBibliography).to receive(:get).with("ISO 123", nil, {:title=>"<em>Standard</em>", usrlbl: nil}) do
+        RelatonBib::XMLParser.from_xml(<<~"OUTPUT")
+        <bibitem type=\"standard\" id=\"ISO123\">\n  <uri type=\"src\">https://www.iso.org/standard/23281.html</uri>\n  <uri type=\"obp\">https://www.iso.org/obp/ui/#!iso:std:23281:en</uri>\n  <uri type=\"rss\">https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</uri>\n  <date type=\"published\">\n    <on>2001</on>\n  </date>\n  <contributor>\n    <role type=\"publisher\"/>\n    <organization>\n      <name>International Organization for Standardization</name>\n      <abbreviation>ISO</abbreviation>\n      <uri>www.iso.org</uri>\n    </organization>\n  </contributor>\n  <edition>3</edition>\n  <language>en</language>\n  <language>fr</language>\n  <script>Latn</script>\n  <status><stage>Published</stage></status>\n  <copyright>\n    <from>2001</from>\n    <owner>\n      <organization>\n        <name>ISO</name>\n        <abbreviation></abbreviation>\n      </organization>\n    </owner>\n  </copyright>\n  <relation type=\"obsoletes\">\n    <bibitem type="standard">\n      <formattedref format="text/plain">ISO 123:1985</formattedref>\n      </bibitem>\n  </relation>\n  <relation type=\"updates\">\n    <bibitem type="standard">\n      <formattedref format="text/plain">ISO 123:2001</formattedref>\n      </bibitem>\n  </relation>\n</bibitem>
+        OUTPUT
+      end.exactly(2).times
+    end
+
+    def mock_isobib_get_123_no_docid_lbl
+      expect(RelatonIso::IsoBibliography).to receive(:get).with("ISO 123", nil, {:title=>"<em>Standard</em>", usrlbl: "(1)"}) do
         RelatonBib::XMLParser.from_xml(<<~"OUTPUT")
         <bibitem type=\"standard\" id=\"ISO123\">\n  <uri type=\"src\">https://www.iso.org/standard/23281.html</uri>\n  <uri type=\"obp\">https://www.iso.org/obp/ui/#!iso:std:23281:en</uri>\n  <uri type=\"rss\">https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</uri>\n  <date type=\"published\">\n    <on>2001</on>\n  </date>\n  <contributor>\n    <role type=\"publisher\"/>\n    <organization>\n      <name>International Organization for Standardization</name>\n      <abbreviation>ISO</abbreviation>\n      <uri>www.iso.org</uri>\n    </organization>\n  </contributor>\n  <edition>3</edition>\n  <language>en</language>\n  <language>fr</language>\n  <script>Latn</script>\n  <status><stage>Published</stage></status>\n  <copyright>\n    <from>2001</from>\n    <owner>\n      <organization>\n        <name>ISO</name>\n        <abbreviation></abbreviation>\n      </organization>\n    </owner>\n  </copyright>\n  <relation type=\"obsoletes\">\n    <bibitem type="standard">\n      <formattedref format="text/plain">ISO 123:1985</formattedref>\n      </bibitem>\n  </relation>\n  <relation type=\"updates\">\n    <bibitem type="standard">\n      <formattedref format="text/plain">ISO 123:2001</formattedref>\n      </bibitem>\n  </relation>\n</bibitem>
         OUTPUT