metanorma-standoc 1.11.0.1 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cb09afdb6668a003d8ef2b58d6260631b7b8e068d3ca16baeee26535c8186d0
-  data.tar.gz: 76b254bc985ef940d8224c85202f001cd8660a681386b8b1e774bde626314ff5
+  metadata.gz: 25f4c5a4250a14fb1499512d51f25cf8ea7b1cc6dc7da44560dc442342a54773
+  data.tar.gz: 10dd5ba69da52963c0e9310834212fc5e74743f660a4cf533efdd721037f5f5d
 SHA512:
-  metadata.gz: 893626c5998b7853394c39a0e4249f1a11346d0beb5cc00a9f76edc8ce129cf591ba6819ed6974b34a115f89b82c64b8acccf3c2dfcd71dcb20226c90653e62a
-  data.tar.gz: c10c585b0274e9be19b848c9dcc175a1ef9325ee0dc875bc1b1aafb057c3fcea1c235488c986093980bc5ce6710d293c053a68d3954aae40365def0071d244e6
+  metadata.gz: dbc30f8112130ea49edcfabf97fedc1d3934f41a09163369fb74ba754eb5d11e861e040df17b15e2f865b7f5bb43d8513a76f859bc192eb2f30f23e4dea67232
+  data.tar.gz: 2ce49c90d894757b2964c4922b702bfb54c24f5e8d53a530a399692f6003042d8c9d44f5ebbc57110d6c56bc3d18fc17650e2511c8b102e38dce2a0d7b85fd41

data/lib/asciidoctor/standoc/cleanup_terms.rb

@@ -23,35 +23,46 @@ module Asciidoctor
         split_termdefinitions(xmldoc)
       end
 
+      TERMDEF_BLOCKS =
+        "./p | ./ol | ./dl | ./ul | ./figure | ./formula | ./table".freeze
+
       def generate_termdefinitions(xmldoc)
         xmldoc.xpath("//term[not(definition)]").each do |d|
-          first_child = d.at("./p | ./figure | ./formula | ./table") || next
+          first_child = d.at(TERMDEF_BLOCKS) || next
           t = Nokogiri::XML::Element.new("definition", xmldoc)
           first_child.replace(t)
           t << first_child.remove
-          d.xpath("./p | ./figure | ./formula | ./table").each { |n| t << n.remove }
+          d.xpath(TERMDEF_BLOCKS).each do |n|
+            t << n.remove
+          end
         end
       end
 
       def split_termdefinitions(xmldoc)
         xmldoc.xpath("//definition").each do |d|
-          n = d.children.first.add_previous_sibling("<nonverbalrepresentation/>").first
+          n = d.children.first
+            .add_previous_sibling("<nonverbalrepresentation/>").first
           v = d.children.first.add_previous_sibling("<verbaldefinition/>").first
           nonverb = false
           d.elements.each do |e|
-            case e.name
-            when "nonverbalrepresentation", "verbaldefinition" then next
-            when "figure", "table", "formula"
-              n << e.remove
-              nonverb = true
-            when "termsource"
-              (nonverb ? n : v) << e.remove
-            else v << e.remove
-            end
+            nonverb = split_termdefinitions1(e, n, v, nonverb)
           end
         end
       end
 
+      def split_termdefinitions1(elem, nonverbal, verbal, nonverb)
+        case elem.name
+        when "nonverbalrepresentation", "verbaldefinition" then return nonverb
+        when "figure", "table", "formula"
+          nonverbal << elem.remove
+          nonverb = true
+        when "termsource"
+          (nonverb ? nonverbal : verbal) << elem.remove
+        else verbal << elem.remove
+        end
+        nonverb
+      end
+
       def termdocsource_cleanup(xmldoc)
         f = xmldoc.at("//preface | //sections")
         xmldoc.xpath("//termdocsource").each { |s| f.previous = s.remove }
@@ -60,7 +71,7 @@ module Asciidoctor
       def term_children_cleanup(xmldoc)
         xmldoc.xpath("//terms[terms]").each { |t| t.name = "clause" }
         xmldoc.xpath("//term").each do |t|
-          %w(termnote termexample termsource).each do |w|
+          %w(termnote termexample termsource term).each do |w|
             t.xpath("./#{w}").each { |n| t << n.remove }
           end
         end
@@ -76,9 +87,9 @@ module Asciidoctor
 
       def termnote_example_cleanup(xmldoc)
         %w(note example).each do |w|
-        xmldoc.xpath("//term#{w}[not(ancestor::term)]").each do |x|
-          x.name = w
-        end
+          xmldoc.xpath("//term#{w}[not(ancestor::term)]").each do |x|
+            x.name = w
+          end
         end
       end
 

data/lib/asciidoctor/standoc/cleanup_text.rb

@@ -28,6 +28,7 @@ module Asciidoctor
       end
 
       # "abc<tag/>", def => "abc",<tag/> def
+=begin
       def uninterrupt_quotes_around_xml(xmldoc)
         xmldoc.xpath("//*[following::text()[1]"\
                      "[starts-with(., '\"') or starts-with(., \"'\")]]")
@@ -37,6 +38,28 @@ module Asciidoctor
           uninterrupt_quotes_around_xml1(x)
         end
       end
+=end
+=begin
+      def uninterrupt_quotes_around_xml(xmldoc)
+        xmldoc.traverse do |n|
+          next unless n.element? && n&.next&.text? &&
+            n.ancestors("pre, tt, sourcecode, stem, figure").empty?
+          next unless /^['"]/.match?(n.next.text)
+
+          uninterrupt_quotes_around_xml1(n)
+        end
+      end
+=end
+      def uninterrupt_quotes_around_xml(xmldoc)
+        xmldoc.traverse do |n|
+          next unless n.text? && n&.previous&.element?
+          next unless /^['"]/.match?(n.text)
+          next unless n.previous.ancestors("pre, tt, sourcecode, stem, figure")
+            .empty?
+
+          uninterrupt_quotes_around_xml1(n.previous)
+        end
+      end
 
       def uninterrupt_quotes_around_xml1(elem)
         prev = elem.at(".//preceding::text()[1]") or return

data/lib/asciidoctor/standoc/isodoc.rng

@@ -2063,7 +2063,12 @@
   <define name="verbaldefinition">
     <element name="verbaldefinition">
       <oneOrMore>
-        <ref name="paragraph"/>
+        <choice>
+          <ref name="paragraph"/>
+          <ref name="dl"/>
+          <ref name="ol"/>
+          <ref name="ul"/>
+        </choice>
       </oneOrMore>
       <zeroOrMore>
         <ref name="termsource"/>
@@ -2163,6 +2168,12 @@
           <value>modified</value>
         </choice>
       </attribute>
+      <attribute name="type">
+        <choice>
+          <value>authoritative</value>
+          <value>lineage</value>
+        </choice>
+      </attribute>
       <ref name="origin"/>
       <optional>
         <ref name="modification"/>

data/lib/asciidoctor/standoc/lists.rb

@@ -14,11 +14,9 @@ module Asciidoctor
 
       def ul_li(xml_ul, item)
         xml_ul.li **ul_li_attrs(item) do |xml_li|
+          xml_li.p(**attr_code(id_attr(item))) { |t| t << item.text }
           if item.blocks?
-            xml_li.p(**attr_code(id_attr(item))) { |t| t << item.text }
             xml_li << item.content
-          else
-            xml_li.p(**attr_code(id_attr(item))) { |p| p << item.text }
           end
         end
       end

data/lib/asciidoctor/standoc/ref.rb

@@ -161,7 +161,7 @@ module Asciidoctor
 
       def refitem1(xml, _item, match)
         code = analyse_ref_code(match[:code])
-        unless code[:id] && code[:numeric] || code[:nofetch]
+        unless (code[:id] && code[:numeric]) || code[:nofetch]
           ref = fetch_ref(xml, code[:id],
                           match.names.include?("year") ? match[:year] : nil,
                           title: match[:text],

data/lib/asciidoctor/standoc/section.rb

@@ -18,7 +18,7 @@ module Asciidoctor
       def sectiontype(node, level = true)
         ret = sectiontype1(node)
         ret1 = sectiontype_streamline(ret)
-        return ret1 if "symbols and abbreviated terms" == ret1
+        return ret1 if ret1 == "symbols and abbreviated terms"
         return nil unless !level || node.level == 1
         return nil if @seen_headers.include? ret
 
@@ -49,7 +49,8 @@ module Asciidoctor
                 script: node.attributes["script"],
                 number: node.attributes["number"],
                 type: node.attributes["type"],
-                annex: (if (node.attr("style") == "appendix" || node.role == "appendix") &&
+                annex: (if (node.attr("style") == "appendix" ||
+                            node.role == "appendix") &&
                           node.level == 1
                           true
                         end),
@@ -84,13 +85,11 @@ module Asciidoctor
           else
             if @term_def then term_def_subclause_parse(a, xml, node)
             elsif @definitions then symbols_parse(a, xml, node)
-            elsif @norm_ref then norm_ref_parse(a, xml, node)
-            elsif @biblio then bibliography_parse(a, xml, node)
-            elsif node.attr("style") == "bibliography" && sectiontype(node, false) == "normative references"
+            elsif @norm_ref ||
+                (node.attr("style") == "bibliography" &&
+                 sectiontype(node, false) == "normative references")
               norm_ref_parse(a, xml, node)
-            elsif node.attr("style") == "bibliography" && sectiontype(node, false) == "bibliography"
-              bibliography_parse(a, xml, node)
-            elsif node.attr("style") == "bibliography"
+            elsif @biblio || node.attr("style") == "bibliography"
               bibliography_parse(a, xml, node)
             elsif node.attr("style") == "abstract"
               abstract_parse(a, xml, node)
@@ -118,7 +117,9 @@ module Asciidoctor
       def preamble(node)
         noko do |xml|
           xml.foreword **attr_code(section_attributes(node)) do |xml_abstract|
-            xml_abstract.title { |t| t << (node.blocks[0].title || @i18n.foreword) }
+            xml_abstract.title do |t|
+              t << (node.blocks[0].title || @i18n.foreword)
+            end
             content = node.content
             xml_abstract << content
           end
@@ -143,7 +144,7 @@ module Asciidoctor
       end
 
       def clause_parse(attrs, xml, node)
-        attrs["inline-header".to_sym] = node.option? "inline-header"
+        attrs[:"inline-header"] = node.option? "inline-header"
         attrs[:bibitem] = true if node.option? "bibitem"
         attrs[:level] = node.attr("level")
         set_obligation(attrs, node)
@@ -154,7 +155,7 @@ module Asciidoctor
       end
 
       def annex_parse(attrs, xml, node)
-        attrs["inline-header".to_sym] = node.option? "inline-header"
+        attrs[:"inline-header"] = node.option? "inline-header"
         set_obligation(attrs, node)
         xml.annex **attr_code(attrs) do |xml_section|
           xml_section.title { |name| name << node.title }
@@ -180,7 +181,7 @@ module Asciidoctor
 
       def acknowledgements_parse(attrs, xml, node)
         xml.acknowledgements **attr_code(attrs) do |xml_section|
-          xml_section.title { |t| t << node.title || @i18n.acknowledgements }
+          xml_section.title { |t| (t << node.title) || @i18n.acknowledgements }
           content = node.content
           xml_section << content
         end

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "1.11.0.1".freeze
+    VERSION = "1.11.1".freeze
   end
 end

data/spec/asciidoctor/blocks_spec.rb

@@ -514,6 +514,59 @@ RSpec.describe Asciidoctor::Standoc do
       .to be_equivalent_to xmlpp(output)
   end
 
+  it "processes nested terms" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+      == Terms and Definitions
+
+      [.term]
+      === Term1
+
+      definition
+
+      NOTE: Note 1
+
+      ==== Term11
+      definition2
+
+      NOTE: Note 2
+    INPUT
+    output = <<~OUTPUT
+      #{BLANK_HDR}
+                <sections>
+           <clause id='_' obligation='normative'>
+             <title>Terms and definitions</title>
+             <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
+             <terms id='_' obligation='normative'>
+               <title>Term1</title>
+               <p id='_'>definition</p>
+               <note id='_'>
+                 <p id='_'>Note 1</p>
+               </note>
+               <term id='term-term11'>
+                 <preferred>
+                   <expression>
+                     <name>Term11</name>
+                   </expression>
+                 </preferred>
+                 <definition>
+                   <verbaldefinition>
+                     <p id='_'>definition2</p>
+                   </verbaldefinition>
+                 </definition>
+                 <termnote id='_'>
+                   <p id='_'>Note 2</p>
+                 </termnote>
+               </term>
+             </terms>
+           </clause>
+         </sections>
+       </standard-document>
+    OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
+  end
+
   it "processes notes" do
     input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}

data/spec/asciidoctor/cleanup_spec.rb

@@ -579,7 +579,7 @@ RSpec.describe Asciidoctor::Standoc do
           <title>Normative references</title>
         #{NORM_REF_BOILERPLATE}
           <bibitem type="standard" id="IEC60050-102">
-          <fetched>#{Date.today}</fetched>
+          <fetched/>
           <title type="title-main" format="text/plain" language="en" script="Latn">International Electrotechnical Vocabulary (IEV)</title>
           <title type="title-part" format="text/plain" language="en" script="Latn">Part 102: Mathematics — General concepts and linear algebra</title>
           <title type='main' format='text/plain' language='en' script='Latn'>International Electrotechnical Vocabulary (IEV) — Part 102: Mathematics — General concepts and linear algebra</title>
@@ -618,7 +618,7 @@ RSpec.describe Asciidoctor::Standoc do
           </copyright>
           <place>Geneva</place>
         </bibitem><bibitem type="standard" id="IEC60050-103">
-          <fetched>#{Date.today}</fetched>
+          <fetched/>
           <title type="title-main" format="text/plain" language="en" script="Latn">International Electrotechnical Vocabulary (IEV)</title>
           <title type="title-part" format="text/plain" language="en" script="Latn">Part 103: Mathematics — Functions</title>
           <title type="main" format="text/plain" language="en" script="Latn">International Electrotechnical Vocabulary (IEV) — Part 103: Mathematics — Functions</title>

data/spec/asciidoctor/cleanup_terms_spec.rb

@@ -759,6 +759,17 @@ RSpec.describe Asciidoctor::Standoc do
       ++++
 
       This paragraph is extraneous
+
+      * This is a list
+
+      []
+      . This too is a list
+
+      []
+      This is:: another list
+
+
+      This is a concluding paragraph
     INPUT
     output = <<~OUTPUT
              #{BLANK_HDR}
@@ -775,7 +786,26 @@ RSpec.describe Asciidoctor::Standoc do
        </mrow>
       </msub></math></stem></name></letter-symbol></preferred>
       <definition>
-             <verbaldefinition><p id="_">This paragraph is extraneous</p></verbaldefinition>
+      <verbaldefinition>
+      <p id="_">This paragraph is extraneous</p>
+                  <ul id='_'>
+              <li>
+                <p id='_'>This is a list</p>
+              </li>
+            </ul>
+            <ol id='_' type='arabic'>
+              <li>
+                <p id='_'>This too is a list</p>
+              </li>
+            </ol>
+            <dl id='_'>
+              <dt>This is</dt>
+              <dd>
+                <p id='_'>another list</p>
+              </dd>
+            </dl>
+            <p id='_'>This is a concluding paragraph</p>
+      </verbaldefinition>
       <nonverbalrepresentation><formula id="_">
                <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub>
                <mrow>

data/spec/asciidoctor/refs_dl_spec.rb

@@ -42,7 +42,7 @@ RSpec.describe Asciidoctor::Standoc do
         <title>Normative references</title>
         #{NORM_REF_BOILERPLATE}
         <bibitem id="iso123" type="standard">
-        <fetched>#{Date.today}</fetched>
+        <fetched/>
         <title type='title-main' format='text/plain'>Standard</title>
         <title type='main' format='text/plain'>Standard</title>
          <docidentifier type="ISO">ISO 123</docidentifier>
@@ -304,7 +304,7 @@ formattedref::
         <title>Normative references</title>
         #{NORM_REF_BOILERPLATE}
         <bibitem id="ISOTC211" type="standard">
-  <fetched>2019-06-30</fetched>
+  <fetched/>
   <title type="main" format="text/plain">Geographic information</title>
   <title type="subtitle" format="text/plain" language="en" script="Latn">Geographic information subtitle</title>
   <title type='title-main' format='text/plain'>Other Title</title>
@@ -624,7 +624,7 @@ series.formattedref.script:: Latn
         <title>Normative references</title>
         #{NORM_REF_BOILERPLATE}
         <bibitem id="ISOTC211" type="standard">
-  <fetched>2019-06-30</fetched>
+  <fetched/>
   <title type="main" format="text/plain">Geographic information</title>
   <title type="subtitle" format="text/plain" language="en" script="Latn">Geographic information subtitle</title>
   <uri type="src">https://www.iso.org/standard/53798.html</uri>
@@ -827,7 +827,7 @@ OUTPUT
          <docidentifier>B</docidentifier>
        </bibitem>
        <bibitem id='iso123' type='standard'>
-         <fetched>#{Date.today.to_s}</fetched>
+         <fetched/>
          <title type='title-main' format='text/plain'>Standard</title>
          <title type='main' format='text/plain'>Standard</title>
          <docidentifier type='ISO'>ISO 123</docidentifier>

data/spec/asciidoctor/refs_spec.rb

@@ -237,20 +237,17 @@ RSpec.describe Asciidoctor::Standoc do
 
               </sections><bibliography><references id="_" obligation="informative" normative="true"><title>Normative references</title>
                #{NORM_REF_BOILERPLATE}
-                <bibitem id='iso123' type='standard'>
-                      <fetched>#{Date.today}</fetched>
-                                   <title type='title-intro' format='text/plain' language='en' script='Latn'>Rubber latex</title>
+                    <bibitem id='iso123' type='standard'>
+               <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&#8201;&#8212;&#8201;Sampling</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='ISO'>ISO 123</docidentifier>
                <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.93:ed-3:en</docidentifier>
                <docnumber>123</docnumber>
-               <date type='published'>
-                 <on>2001-05</on>
-               </date>
                <contributor>
                  <role type='publisher'/>
                  <organization>
@@ -262,13 +259,6 @@ RSpec.describe Asciidoctor::Standoc do
                <edition>3</edition>
                <language>en</language>
                <script>Latn</script>
-               <abstract format='text/plain' language='en' script='Latn'>
-                 This International Standard specifies procedures for sampling natural
-                 rubber latex concentrate and for sampling synthetic rubber latices and
-                 artificial latices. It is also suitable for sampling rubber latex
-                 contained in drums, tank cars or tanks. The procedures may also be
-                 used for sampling plastics dispersions.
-               </abstract>
                <status>
                  <stage>90</stage>
                  <substage>93</substage>
@@ -286,23 +276,73 @@ RSpec.describe Asciidoctor::Standoc do
                    <formattedref format='text/plain'>ISO 123:1985</formattedref>
                  </bibitem>
                </relation>
+               <relation type='instance'>
+                 <bibitem type='standard'>
+                   <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&#8201;&#8212;&#8201;Sampling</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='URN'>urn:iso:std:iso:123:stage-90.93:ed-3:en</docidentifier>
+                   <docnumber>123</docnumber>
+                   <date type='published'>
+                     <on>2001-05</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>
+                   <script>Latn</script>
+                   <abstract format='text/plain' language='en' script='Latn'>
+                     This International Standard specifies procedures for sampling
+                     natural rubber latex concentrate and for sampling synthetic rubber
+                     latices and artificial latices. It is also suitable for sampling
+                     rubber latex contained in drums, tank cars or tanks. The
+                     procedures may also be used for sampling plastics dispersions.
+                   </abstract>
+                   <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>
+               </relation>
                <place>Geneva</place>
              </bibitem>
              <bibitem id='iso124' type='standard'>
-               <fetched>#{Date.today}</fetched>
+               <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&#8201;&#8212;&#8201;Sampling</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='ISO'>ISO 123</docidentifier>
                <docidentifier type='metanorma'>[1]</docidentifier>
                <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.93:ed-3:en</docidentifier>
                <docnumber>123</docnumber>
-               <date type='published'>
-                 <on>2001-05</on>
-               </date>
                <contributor>
                  <role type='publisher'/>
                  <organization>
@@ -314,13 +354,6 @@ RSpec.describe Asciidoctor::Standoc do
                <edition>3</edition>
                <language>en</language>
                <script>Latn</script>
-               <abstract format='text/plain' language='en' script='Latn'>
-                 This International Standard specifies procedures for sampling natural
-                 rubber latex concentrate and for sampling synthetic rubber latices and
-                 artificial latices. It is also suitable for sampling rubber latex
-                 contained in drums, tank cars or tanks. The procedures may also be
-                 used for sampling plastics dispersions.
-               </abstract>
                <status>
                  <stage>90</stage>
                  <substage>93</substage>
@@ -338,6 +371,59 @@ RSpec.describe Asciidoctor::Standoc do
                    <formattedref format='text/plain'>ISO 123:1985</formattedref>
                  </bibitem>
                </relation>
+               <relation type='instance'>
+                 <bibitem type='standard'>
+                   <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&#8201;&#8212;&#8201;Sampling</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='URN'>urn:iso:std:iso:123:stage-90.93:ed-3:en</docidentifier>
+                   <docnumber>123</docnumber>
+                   <date type='published'>
+                     <on>2001-05</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>
+                   <script>Latn</script>
+                   <abstract format='text/plain' language='en' script='Latn'>
+                     This International Standard specifies procedures for sampling
+                     natural rubber latex concentrate and for sampling synthetic rubber
+                     latices and artificial latices. It is also suitable for sampling
+                     rubber latex contained in drums, tank cars or tanks. The
+                     procedures may also be used for sampling plastics dispersions.
+                   </abstract>
+                   <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>
+               </relation>
                <place>Geneva</place>
              </bibitem>
            </references>
@@ -365,31 +451,30 @@ RSpec.describe Asciidoctor::Standoc do
         * [[[iso124,(1)ISO 123]]] _Standard_
       INPUT
               #{BLANK_HDR.sub(%r{<language>en</language>}, '<language>fr</language>')}
-               <sections>
-               </sections><bibliography>
-               <references id='_' normative='true' obligation='informative'>
-                     <title>Références normatives</title>
-                     <p id='_'>
-                       Les documents suivants cités dans le texte constituent, pour tout ou
-        partie de leur contenu, des exigences du présent document. Pour les
-        références datées, seule l’édition citée s’applique. Pour les références
-        non datées, la dernière édition du document de référence s’applique (y
-        compris les éventuels amendements).
-                     </p>
-                <bibitem id='iso123' type='standard'>
-                <fetched>#{Date.today}</fetched>
-                <title type='title-intro' format='text/plain' language='fr' script='Latn'>Latex de caoutchouc</title>
+                       <sections> </sections>
+         <bibliography>
+           <references id='_' normative='true' obligation='informative'>
+             <title>R&#233;f&#233;rences normatives</title>
+             <p id='_'>
+               Les documents suivants cit&#233;s dans le texte constituent, pour tout
+               ou partie de leur contenu, des exigences du pr&#233;sent document. Pour
+               les r&#233;f&#233;rences dat&#233;es, seule l&#8217;&#233;dition
+               cit&#233;e s&#8217;applique. Pour les r&#233;f&#233;rences non
+               dat&#233;es, la derni&#232;re &#233;dition du document de
+               r&#233;f&#233;rence s&#8217;applique (y compris les &#233;ventuels
+               amendements).
+             </p>
+             <bibitem id='iso123' type='standard'>
+               <fetched/>
+               <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'>&#201;chantillonnage</title>
                <title type='main' format='text/plain' language='fr' script='Latn'>Latex de caoutchouc&#8201;&#8212;&#8201;&#201;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='ISO'>ISO 123</docidentifier>
                <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.93:ed-3:fr</docidentifier>
                <docnumber>123</docnumber>
-               <date type='published'>
-                 <on>2001-05</on>
-               </date>
                <contributor>
                  <role type='publisher'/>
                  <organization>
@@ -402,16 +487,6 @@ RSpec.describe Asciidoctor::Standoc do
                <language>en</language>
                <language>fr</language>
                <script>Latn</script>
-               <abstract format='text/plain' language='fr' script='Latn'>
-                 La pr&#233;sente Norme internationale sp&#233;cifie des m&#233;thodes
-                 d&#8217;&#233;chantillonnage pour des concentr&#233;s de latex de
-                 caoutchouc naturel et pour &#233;chantillonner des latex de caoutchouc
-                 synth&#233;tique et des latex artificiels. Elle s&#8217;applique
-                 &#233;galement &#224; l&#8217;&#233;chantillonnage de latex de
-                 caoutchouc contenus dans des f&#251;ts, citernes routi&#232;res ou de
-                 stockage. Le mode op&#233;ratoire peut aussi &#234;tre utilis&#233;
-                 pour l&#8217;&#233;chantillonnage de dispersions de plastiques.
-               </abstract>
                <status>
                  <stage>90</stage>
                  <substage>93</substage>
@@ -429,23 +504,78 @@ RSpec.describe Asciidoctor::Standoc do
                    <formattedref format='text/plain'>ISO 123:1985</formattedref>
                  </bibitem>
                </relation>
+               <relation type='instance'>
+                 <bibitem type='standard'>
+                   <fetched/>
+                   <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'>&#201;chantillonnage</title>
+                   <title type='main' format='text/plain' language='fr' script='Latn'>Latex de caoutchouc&#8201;&#8212;&#8201;&#201;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='URN'>urn:iso:std:iso:123:stage-90.93:ed-3:fr</docidentifier>
+                   <docnumber>123</docnumber>
+                   <date type='published'>
+                     <on>2001-05</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>
+                   <abstract format='text/plain' language='fr' script='Latn'>
+                     La pr&#233;sente Norme internationale sp&#233;cifie des
+                     m&#233;thodes d&#8217;&#233;chantillonnage pour des
+                     concentr&#233;s de latex de caoutchouc naturel et pour
+                     &#233;chantillonner des latex de caoutchouc synth&#233;tique et
+                     des latex artificiels. Elle s&#8217;applique &#233;galement &#224;
+                     l&#8217;&#233;chantillonnage de latex de caoutchouc contenus dans
+                     des f&#251;ts, citernes routi&#232;res ou de stockage. Le mode
+                     op&#233;ratoire peut aussi &#234;tre utilis&#233; pour
+                     l&#8217;&#233;chantillonnage de dispersions de plastiques.
+                   </abstract>
+                   <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>
+               </relation>
                <place>Geneva</place>
              </bibitem>
              <bibitem id='iso124' type='standard'>
-               <fetched>#{Date.today}</fetched>
+               <fetched/>
                <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'>&#201;chantillonnage</title>
                <title type='main' format='text/plain' language='fr' script='Latn'>Latex de caoutchouc&#8201;&#8212;&#8201;&#201;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='ISO'>ISO 123</docidentifier>
                <docidentifier type='metanorma'>[1]</docidentifier>
                <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.93:ed-3:fr</docidentifier>
                <docnumber>123</docnumber>
-               <date type='published'>
-                 <on>2001-05</on>
-               </date>
                <contributor>
                  <role type='publisher'/>
                  <organization>
@@ -458,16 +588,6 @@ RSpec.describe Asciidoctor::Standoc do
                <language>en</language>
                <language>fr</language>
                <script>Latn</script>
-               <abstract format='text/plain' language='fr' script='Latn'>
-                 La pr&#233;sente Norme internationale sp&#233;cifie des m&#233;thodes
-                 d&#8217;&#233;chantillonnage pour des concentr&#233;s de latex de
-                 caoutchouc naturel et pour &#233;chantillonner des latex de caoutchouc
-                 synth&#233;tique et des latex artificiels. Elle s&#8217;applique
-                 &#233;galement &#224; l&#8217;&#233;chantillonnage de latex de
-                 caoutchouc contenus dans des f&#251;ts, citernes routi&#232;res ou de
-                 stockage. Le mode op&#233;ratoire peut aussi &#234;tre utilis&#233;
-                 pour l&#8217;&#233;chantillonnage de dispersions de plastiques.
-               </abstract>
                <status>
                  <stage>90</stage>
                  <substage>93</substage>
@@ -485,6 +605,64 @@ RSpec.describe Asciidoctor::Standoc do
                    <formattedref format='text/plain'>ISO 123:1985</formattedref>
                  </bibitem>
                </relation>
+               <relation type='instance'>
+                 <bibitem type='standard'>
+                   <fetched/>
+                   <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'>&#201;chantillonnage</title>
+                   <title type='main' format='text/plain' language='fr' script='Latn'>Latex de caoutchouc&#8201;&#8212;&#8201;&#201;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='URN'>urn:iso:std:iso:123:stage-90.93:ed-3:fr</docidentifier>
+                   <docnumber>123</docnumber>
+                   <date type='published'>
+                     <on>2001-05</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>
+                   <abstract format='text/plain' language='fr' script='Latn'>
+                     La pr&#233;sente Norme internationale sp&#233;cifie des
+                     m&#233;thodes d&#8217;&#233;chantillonnage pour des
+                     concentr&#233;s de latex de caoutchouc naturel et pour
+                     &#233;chantillonner des latex de caoutchouc synth&#233;tique et
+                     des latex artificiels. Elle s&#8217;applique &#233;galement &#224;
+                     l&#8217;&#233;chantillonnage de latex de caoutchouc contenus dans
+                     des f&#251;ts, citernes routi&#232;res ou de stockage. Le mode
+                     op&#233;ratoire peut aussi &#234;tre utilis&#233; pour
+                     l&#8217;&#233;chantillonnage de dispersions de plastiques.
+                   </abstract>
+                   <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>
+               </relation>
                <place>Geneva</place>
              </bibitem>
            </references>
@@ -558,7 +736,7 @@ RSpec.describe Asciidoctor::Standoc do
           <title>Normative references</title>
         #{NORM_REF_BOILERPLATE}
           <bibitem type="standard" id="iso123">
-          <fetched>#{Date.today}</fetched>
+          <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>
           <uri type="src">https://www.iso.org/standard/21071.html</uri>
@@ -605,7 +783,7 @@ RSpec.describe Asciidoctor::Standoc do
           <place>Geneva</place>
         </bibitem>
           <bibitem id="iso124" type="standard">
-          <fetched>#{Date.today}</fetched>
+          <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>
@@ -650,7 +828,7 @@ RSpec.describe Asciidoctor::Standoc do
           <place>Geneva</place>
           </bibitem>
           <bibitem id="iso125" type="standard">
-          <fetched>#{Date.today}</fetched>
+          <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>
           <uri type="src">https://www.iso.org/standard/21071.html</uri>
@@ -698,7 +876,7 @@ RSpec.describe Asciidoctor::Standoc do
           <place>Geneva</place>
         </bibitem>
           <bibitem id="iso126" type="standard">
-          <fetched>#{Date.today}</fetched>
+          <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>
@@ -774,7 +952,7 @@ RSpec.describe Asciidoctor::Standoc do
                <docnumber>12382:1992</docnumber>
              </bibitem>
              <bibitem id='iso124' type='standard'>
-               <fetched>#{Date.today}</fetched>
+               <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>
@@ -990,7 +1168,7 @@ RSpec.describe Asciidoctor::Standoc do
         <title>Normative references</title>
               #{NORM_REF_BOILERPLATE}
               <bibitem id='iso123' type='standard'>
-                     <fetched>#{Date.today}</fetched>
+                     <fetched/>
                      <title format='text/plain' language='en' script='Latn'>Network Configuration Access Control Model</title>
                      <uri type='xml'>
                        https://raw.githubusercontent.com/relaton/relaton-data-ietf/master/data/reference.RFC.8341.xml
@@ -1051,7 +1229,7 @@ RSpec.describe Asciidoctor::Standoc do
                      <place>Fremont, CA</place>
                    </bibitem>
                    <bibitem id='iso124' type='standard'>
-                     <fetched>#{Date.today}</fetched>
+                     <fetched/>
                      <title format='text/plain' language='en' script='Latn'>Network Configuration Access Control Model</title>
                      <uri type='xml'>
                        https://raw.githubusercontent.com/relaton/relaton-data-ietf/master/data/reference.RFC.8341.xml
@@ -1403,7 +1581,7 @@ RSpec.describe Asciidoctor::Standoc do
               amendments) applies.
             </p>
             <bibitem id='iso123' type='standard'>
-        <fetched>2020-06-12</fetched>
+        <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>
@@ -1450,7 +1628,7 @@ RSpec.describe Asciidoctor::Standoc do
         </relation>
         <relation type='instance'>
           <bibitem type='standard'>
-            <fetched>2020-06-12</fetched>
+            <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>

data/spec/spec_helper.rb

@@ -61,7 +61,8 @@ def xmlpp(xml)
   s = ""
   f = REXML::Formatters::Pretty.new(2)
   f.compact = true
-  f.write(REXML::Document.new(xml), s)
+  f.write(REXML::Document.new(xml
+    .gsub(%r{<fetched>[^<]+</fetched>}, "<fetched/>")), s)
   s
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 1.11.0.1
+  version: 1.11.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-26 00:00:00.000000000 Z
+date: 2021-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor