metanorma-iso 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42be35a908161b2b1c90252599c743ebc821ca814b948425cfd0e58c43b2fe35
-  data.tar.gz: 4962fcc892f8ce7ac514d227d36d499b0f1c2df44994073d44b9efb14b6346c8
+  metadata.gz: fcfe1b51276c62b73efaf0a7ecfd97c5aae10b34823647cae97942e5e2e1cf1e
+  data.tar.gz: e5a96003b94cc1965abebb14112755a1c4134078a233279f8b070bed0c09ea58
 SHA512:
-  metadata.gz: 48a0e630835efcbf208346515d28a879cdf155b3c02d1fe52f314b86e370de01884ff7dfa36fc89dca8cccf5ce08cb70fea433c67f879f46dcce75cf9a34a9cc
-  data.tar.gz: 1fce93f337ad4a87713e58be9d839b06d23bf4a58f45a288fd8d8203bdc17bb5eaa977714bd47cd218b73181ada19c599d73f185b76dde215dc7385b6b6e44ee
+  metadata.gz: c6217989c8151c10b50280795f8d9b63de4dd6277e3a9ac0cf01f6648ef3721dc3d05b547d88b3b1c376a05d1fd6020f195021df2e87afb83940ace8264d8579
+  data.tar.gz: 83bc724ef641add5682d9a6f0eaa08187dad5c76aeb5109d0b59af5f5bb0896597bd37377934ee6b0ce082cc510fd490e4b7337e3ecae42fdb48652788ed9931

data/README.adoc

@@ -487,6 +487,13 @@ not supplied. Example values: `JWG`, `JAG`, `AG` (advisory group), `AHG`, `SWG`,
 `:publisher:`:: The standards agency publishing the standard; can be multiple
 (comma-delimited). Defaults to `ISO`.
 
+`:uri:`:: The URI to which this standard is published.
+`:xml-uri:`:: The URI to which the (Metanorma) XML representation of this standard is published.
+`:html-uri:`:: The URI to which the HTML representation of this standard is published.
+`:pdf-uri:`:: The URI to which the PDF representation of this standard is published.
+`:doc-uri:`:: The URI to which the DOC representation of this standard is published.
+`:relaton-uri:`:: The URI to which the Relaton XML representation of this standard is published.
+
 `:body-font:`:: Font for body text; will be inserted into CSS. Defaults to
 Cambria for Latin script, SimSun for Simplified Chinese.
 

data/docs/outputs.adoc

@@ -0,0 +1,42 @@
+= Outputs
+
+The metanorma toolset currently outputs documents in four formats.
+
+== Metanorma XML
+
+The Metanorma XML output is the intermediate format which marks up the semantic content of the standards document, and is 
+used to drive the other formats. The Metanorma XML file is also the file which is used for validation of the standards 
+document: line numbers in the validation output refer to this file.
+
+== HTML
+
+The HTML output is in HTML 5. It has optional Data-URI encoding of local images; if images in the output are are not Data-URI encoded, 
+they are moved to a folder called `{filename}_images`, and renamed with GUID names, to prevent collisions. Audio and video files are
+not supported. All HTML output has a sidebar with a Javascript-generated Table of Contents, which is two section levels deep.
+
+== PDF
+
+PDF output, for those standards gems that support it, is generated from the HTML output via Google Puppeteer (which runs in Node.js). 
+The PDF output generation takes advantage of the print mode in the HTML CSS stylesheet, so much of the browser-like styling of the HTML
+is rendered as a more print-like document. Because it is generated from HTML, the PDF output does not support page numbers in its
+Table of Contents. Nor does it support advanced paragraph formatting, such as Keep With Next or Widow/Orphan control.
+
+== Word
+
+The Word output is output as a DOC format rather than DOCX (i.e. the pre-2007 version of Word), and it is generated using the 
+Microsoft Office flavour of HTML 4, as a Multipart HTML Word Document (MHT). (This is a MIME-encoded counterpart to the HTML obtained
+when you save a Word document as HTML.)
+
+Using DOC HTML makes it much easier to generate documents with
+the advanced formatting requirements of Metanorma (including complex tables, formulas, footnotes, headers and footers, 
+nested list numbering and crossreferences) than generating either native DOCX (in OOXML), or the DOCX flavour of MHT. For more
+on the choice to use DOC, see https://github.com/riboseinc/html2doc/wiki/Why-not-docx%3F
+
+The constraint on using DOC, however, imposes some constraints. 
+
+* SVG images are not supported. (Word internally converts them into PNG files to render them in Word HTML.)
+* DOC files are a legacy format of Word.
+* DOC files cannot be processed by Pages or LibreOffice: they can only be processed by Microsoft Word. To open the Word output in LibreOffice in particular, you will need to convert the DOC file as a DOCX file, taking the following steps.
+** Open with MS Word
+** Save it once by changing the Extension to `.doc`. (When it asks you to overwrite, say Yes.)
+* "Save As" as a `.docx` file.

data/lib/asciidoctor/iso/biblio.rng

@@ -414,6 +414,20 @@
       <ref name="BibliographicItem"/>
     </element>
   </define>
+  <define name="relaton_collection">
+    <element name="relaton-collection">
+      <optional>
+        <attribute name="type"/>
+      </optional>
+      <ref name="btitle"/>
+      <zeroOrMore>
+        <ref name="contributor"/>
+      </zeroOrMore>
+      <zeroOrMore>
+        <ref name="docrelation"/>
+      </zeroOrMore>
+    </element>
+  </define>
   <define name="BibItemType" combine="choice">
     <choice>
       <value>article</value>
@@ -531,7 +545,10 @@
   </define>
   <define name="fetched">
     <element name="fetched">
-      <data type="dateTime"/>
+      <choice>
+        <data type="dateTime"/>
+        <data type="date"/>
+      </choice>
     </element>
   </define>
   <define name="validity">
@@ -549,17 +566,26 @@
   </define>
   <define name="validityBegins">
     <element name="validityBegins">
-      <data type="dateTime"/>
+      <choice>
+        <data type="dateTime"/>
+        <data type="date"/>
+      </choice>
     </element>
   </define>
   <define name="validityEnds">
     <element name="validityEnds">
-      <data type="dateTime"/>
+      <choice>
+        <data type="dateTime"/>
+        <data type="date"/>
+      </choice>
     </element>
   </define>
   <define name="validityRevision">
     <element name="revision">
-      <data type="dateTime"/>
+      <choice>
+        <data type="dateTime"/>
+        <data type="date"/>
+      </choice>
     </element>
   </define>
   <define name="TypedTitleString">
@@ -744,6 +770,7 @@
     <element name="from">
       <choice>
         <data type="dateTime"/>
+        <data type="date"/>
         <data type="gYear"/>
       </choice>
     </element>
@@ -752,6 +779,7 @@
     <element name="to">
       <choice>
         <data type="dateTime"/>
+        <data type="date"/>
         <data type="gYear"/>
       </choice>
     </element>

data/lib/asciidoctor/iso/front.rb

@@ -83,19 +83,6 @@ module Asciidoctor
         end
       end
 
-      def metadata(node, xml)
-        title node, xml
-        metadata_id(node, xml)
-        metadata_author(node, xml)
-        metadata_publisher(node, xml)
-        xml.language (node.attr("language") || "en")
-        xml.script (node.attr("script") || "Latn")
-        metadata_status(node, xml)
-        metadata_copyright(node, xml)
-        metadata_committee(node, xml)
-        metadata_ics(node, xml)
-      end
-
       def title_intro(node, t, lang, at)
         return unless node.attr("title-intro-#{lang}")
         t.title_intro(**attr_code(at)) do |t1|

data/lib/isodoc/iso/html/html_iso_titlepage.html

@@ -1,7 +1,19 @@
     <div id='toggle'> <span>•</span> </div>
-<p class="coverpage_docnumber">{{ agency }} {{ docnumber }}:{{ docyear }}(E) {{ draftinfo }}</p>
+    {% if tc_docnumber %}
+<p class="coverpage_docnumber">{{ tc_docnumber }}</p>
+    {% else %}
+<p class="coverpage_docnumber">{{ docnumber }}:{{ docyear }}(E) {{ draftinfo }}</p>
+    {% endif %}
+
+{% if revdate %}
+<p class="coverpage_docnumber">Date: {{ revdate }}</p>
+{% endif %}
+
+{% if tc_docnumber %}
+<p class="coverpage_docnumber">{{ docnumber }}:{{ docyear }}(E) {{ draftinfo }}</p>
+{% endif %}
 
-<p class="coverpage_techcommittee">{{ agency }}&nbsp;{{ editorialgroup | join: "/" }}</p>
+<p class="coverpage_techcommittee">{{ agency }}/{{ editorialgroup | join: "/" }}</p>
 
 <p class="coverpage_techcommittee"><a
 name="CVP_Secretariat_Loca">Secretariat</a>: {{ secretariat }}</p>

data/lib/isodoc/iso/html/isodoc.scss

@@ -478,6 +478,8 @@ table.MsoISOTable
 	mso-yfti-tbllook:480;
 	mso-border-insideh:.75pt solid windowtext;
 	mso-border-insidev:.75pt solid windowtext;
+        mso-table-anchor-vertical:paragraph;
+        mso-table-bspace:12.0pt;
 	font-size:10.0pt;
 	font-family:$bodyfont;}
 table.MsoISOTable tr
@@ -504,6 +506,8 @@ table.MsoTableGrid
 	mso-para-margin:0cm;
 	mso-para-margin-bottom:.0001pt;
 	mso-pagination:widow-orphan;
+        mso-table-anchor-vertical:paragraph;
+        mso-table-bspace:12.0pt;
 	font-size:10.0pt;
 	font-family:$bodyfont;}
 td { page-break-inside:avoid; }
@@ -664,6 +668,15 @@ p.example, li.example, div.example, td.example
 	mso-pagination:none;
 	font-size:10.0pt;
 	font-family:$bodyfont;}
+
+table.example {
+        margin-bottom:12pt;
+}
+
+td.example p.MsoListParagraph {
+  font-size: 10.0pt;
+}
+
 span.note_label, span.example_label, td.example_label, td.note_label
 {
 font-size: 10.0pt;

data/lib/isodoc/iso/html/style-human.scss

@@ -362,7 +362,13 @@ p.Terms {
     }
 }
   
-
+@media screen {
+  img { 
+      width: 100%;   
+      height: auto;
+  }
+}
+    
 
 #toc ul {
     margin: 0;

data/lib/isodoc/iso/html/style-iso.scss

@@ -365,6 +365,13 @@ p.Terms {
     }
 }
   
+@media screen {
+  img { 
+      width: 100%;   
+      height: auto;
+  }
+}
+    
 
 
 #toc ul {

data/lib/isodoc/iso/html/word_iso_titlepage.html

@@ -1,9 +1,23 @@
+{% if tc_docnumber %}
+<p class="MsoNormal" align="right" style='text-align:right'><b style='mso-bidi-font-weight:
+normal'><span lang="EN-GB" style='font-size:14.0pt;mso-no-proof:yes'>{{ tc_docnumber }}</span></b><b
+style='mso-bidi-font-weight:normal'><span lang="EN-GB" style='font-size:14.0pt'><o:p></o:p></span></b></p>
+{% else %}
 <p class="MsoNormal" align="right" style='text-align:right'><b style='mso-bidi-font-weight:
 normal'><span lang="EN-GB" style='font-size:14.0pt;mso-no-proof:yes'>{{ docnumber }}:{{ docyear }}(E) {{ draftinfo }}</span></b><b
 style='mso-bidi-font-weight:normal'><span lang="EN-GB" style='font-size:14.0pt'><o:p></o:p></span></b></p>
+{% endif %}
+
+{% if revdate %}
+<p class="MsoNormal" align="right" style='text-align:right'><span lang="EN-GB" style='mso-no-proof:yes'>Date: {{ revdate }}</span></p>
+{% endif %}
+
+{% if tc_docnumber %}
+<p class="MsoNormal" align="right" style='text-align:right'><span lang="EN-GB" style='mso-no-proof:yes'>{{ docnumber }}:{{ docyear }}(E) {{ draftinfo }}</span></p>
+{% endif %}
 
 <p class="MsoNormal" align="right" style='text-align:right'><span lang="EN-GB"
-style='mso-no-proof:yes'>{{ agency }}&nbsp;{{ editorialgroup | join: "/" }}</span></p>
+style='mso-no-proof:yes'>{{ agency }}/{{ editorialgroup | join: "/" }}</span></p>
 
 <p class="MsoNormal" align="right" style='margin-bottom:100.0pt;text-align:right'><span lang="EN-GB">Secretariat: <span style='mso-no-proof:yes'>{{ secretariat }}</span></span></p>
 

data/lib/isodoc/iso/html/wordstyle.scss

@@ -114,10 +114,8 @@ p.MsoListParagraph, li.MsoListParagraph, div.MsoListParagraph
 	mso-style-qformat:yes;
 	margin-top:0cm;
 	margin-right:0cm;
-	margin-bottom:0cm;
+	margin-bottom:12.0pt;
 	/* do not put in margin-left, it is specific to list level */
-	margin-bottom:.0001pt;
-	mso-add-space:auto;
 	mso-pagination:widow-orphan;
 	font-size:11.0pt;
 	font-family:$bodyfont;
@@ -130,10 +128,8 @@ p.MsoListParagraphCxSpFirst, li.MsoListParagraphCxSpFirst, div.MsoListParagraphC
 	mso-style-type:export-only;
 	margin-top:0cm;
 	margin-right:0cm;
-	margin-bottom:0cm;
+	margin-bottom:12.0pt;
 	/* do not put in margin-left, it is specific to list level */
-	margin-bottom:.0001pt;
-	mso-add-space:auto;
 	mso-pagination:widow-orphan;
 	font-size:11.0pt;
 	font-family:$bodyfont;
@@ -146,10 +142,8 @@ p.MsoListParagraphCxSpMiddle, li.MsoListParagraphCxSpMiddle, div.MsoListParagrap
 	mso-style-type:export-only;
 	margin-top:0cm;
 	margin-right:0cm;
-	margin-bottom:0cm;
+	margin-bottom:12.0pt;
 	/* do not put in margin-left, it is specific to list level */
-	margin-bottom:.0001pt;
-	mso-add-space:auto;
 	mso-pagination:widow-orphan;
 	font-size:11.0pt;
 	font-family:$bodyfont;
@@ -162,10 +156,8 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
 	mso-style-type:export-only;
 	margin-top:0cm;
 	margin-right:0cm;
-	margin-bottom:0cm;
-	/* do not put in margin-left, it is specific to list level */
 	margin-bottom:12.0pt;
-	mso-add-space:auto;
+	/* do not put in margin-left, it is specific to list level */
 	mso-pagination:widow-orphan;
 	font-size:11.0pt;
 	font-family:$bodyfont;
@@ -1250,6 +1242,8 @@ table.MsoNormalTable
 	mso-para-margin:0cm;
 	mso-para-margin-bottom:.0001pt;
 	mso-pagination:widow-orphan;
+        mso-table-anchor-vertical:paragraph;
+        mso-table-bspace:12.0pt;
 	font-size:10.0pt;
 	font-family:$bodyfont;}
 br.section

data/lib/isodoc/iso/metadata.rb

@@ -35,6 +35,8 @@ module IsoDoc
                               isoxml.at(ns("//version/draft")))
           set(:stageabbr, abbr)
         end
+        revdate = isoxml.at(ns("//version/revision-date"))
+        set(:revdate, revdate&.text)
       end
 
       def docid(isoxml, _out)
@@ -43,9 +45,11 @@ module IsoDoc
         if docstatus
           abbr = get[:stageabbr]
           docstatus = get[:stage]
-          (docstatus.to_i < 60) && dn = dn.sub(/ /, " #{abbr} ")
+          (docstatus.to_i < 60) && dn = dn.sub(/ /, "/#{abbr} ")
         end
         set(:docnumber, dn)
+        tcdn = isoxml.at(ns("//bibdata/docidentifier/tc-document-number"))
+        set(:tc_docnumber, tcdn&.text)
       end
 
       # we don't leave this to i18n.rb, because we have both English and

data/lib/isodoc/iso/word_convert.rb

@@ -53,6 +53,8 @@ module IsoDoc
       end
 
       def colophon(body, docxml)
+        stage =  @meta.get[:stage_int]
+        return if !stage.nil? && stage < 60
         body.br **{ clear: "all", style: "page-break-before:left;mso-break-type:section-break" }
         body.div **{ class: "colophon" } do |div|
         end

data/lib/metanorma/iso/processor.rb

@@ -22,8 +22,8 @@ module Metanorma
         "Metanorma::ISO #{Metanorma::ISO::VERSION}"
       end
 
-      def input_to_isodoc(file)
-        Metanorma::Input::Asciidoc.new.process(file, @asciidoctor_backend)
+      def input_to_isodoc(file, filename)
+        Metanorma::Input::Asciidoc.new.process(file, filename, @asciidoctor_backend)
       end
 
       def output(isodoc_node, outname, format, options={})

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "1.0.7".freeze
+    VERSION = "1.0.8".freeze
   end
 end

data/metanorma-iso.gemspec

@@ -33,7 +33,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "ruby-jing"
   spec.add_dependency "isodoc", "~> 0.9.0"
   spec.add_dependency "iev", "~> 0.2.0"
-  spec.add_dependency "relaton", "~> 0.2.0"
   spec.add_dependency "metanorma-standoc", "~> 1.0.0"
 
   spec.add_development_dependency "bundler", "~> 1.15"
@@ -46,7 +45,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rubocop", "~> 0.50"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
-  spec.add_development_dependency "metanorma", "~> 0.2.6"
-  spec.add_development_dependency "isobib", "~> 0.3.0"
-  spec.add_development_dependency "ietfbib", "~> 0.4.0"
+  spec.add_development_dependency "metanorma", "~> 0.3.0"
 end

data/spec/asciidoctor-iso/base_spec.rb

@@ -8,7 +8,9 @@ RSpec.describe Asciidoctor::ISO do
 
   it "generates output for the Rice document" do
     FileUtils.rm_f %w(spec/examples/rice.xml spec/examples/rice.doc spec/examples/rice.html spec/examples/rice_alt.html)
-    system "cd spec/examples; asciidoctor --trace -b iso -r 'metanorma-iso' rice.adoc; cd ../.."
+    FileUtils.cd "spec/examples"
+    Asciidoctor.convert_file "rice.adoc", {:attributes=>{"backend"=>"iso"}, :safe=>0, :header_footer=>true, :requires=>["metanorma-iso"], :failure_level=>4, :mkdirs=>true, :to_file=>nil}
+    FileUtils.cd "../.."
     expect(File.exist?("spec/examples/rice.xml")).to be true
     expect(File.exist?("spec/examples/rice.doc")).to be true
     expect(File.exist?("spec/examples/rice.html")).to be true
@@ -32,6 +34,7 @@ RSpec.describe Asciidoctor::ISO do
       Author
       :docfile: test.adoc
       :novalid:
+      :no-isobib:
     INPUT
     #{BLANK_HDR}
 <sections/>
@@ -48,6 +51,7 @@ RSpec.describe Asciidoctor::ISO do
       :docfile: test.adoc
       :nodoc:
       :novalid:
+      :no-isobib:
       :docnumber: 1000
       :partnumber: 1
       :edition: 2
@@ -167,6 +171,7 @@ RSpec.describe Asciidoctor::ISO do
       :docfile: test.adoc
       :nodoc:
       :novalid:
+      :no-isobib:
       :docnumber: 1000
       :partnumber: 1-1
       :tc-docnumber: 2000
@@ -277,6 +282,7 @@ RSpec.describe Asciidoctor::ISO do
       Author
       :docfile: test.adoc
       :novalid:
+      :no-isobib:
     INPUT
     html = File.read("test.html", encoding: "utf-8")
     expect(html).to match(%r{<script>})
@@ -289,6 +295,7 @@ RSpec.describe Asciidoctor::ISO do
       Author
       :docfile: test.adoc
       :novalid:
+      :no-isobib:
     INPUT
     html = File.read("test.html", encoding: "utf-8")
     expect(html).to match(%r[\.Sourcecode[^{]+\{[^{]+font-family: "Courier New", monospace;]m)
@@ -303,6 +310,7 @@ RSpec.describe Asciidoctor::ISO do
       Author
       :docfile: test.adoc
       :novalid:
+      :no-isobib:
     INPUT
     html = File.read("test_alt.html", encoding: "utf-8")
     expect(html).to match(%r[\.Sourcecode[^{]+\{[^{]+font-family: "Space Mono", monospace;]m)
@@ -317,6 +325,7 @@ RSpec.describe Asciidoctor::ISO do
       Author
       :docfile: test.adoc
       :novalid:
+      :no-isobib:
       :script: Hans
     INPUT
     html = File.read("test.html", encoding: "utf-8")
@@ -332,6 +341,7 @@ RSpec.describe Asciidoctor::ISO do
       Author
       :docfile: test.adoc
       :novalid:
+      :no-isobib:
       :script: Hans
       :body-font: Zapf Chancery
       :header-font: Comic Sans
@@ -351,6 +361,7 @@ RSpec.describe Asciidoctor::ISO do
       Author
       :docfile: test.adoc
       :novalid:
+      :no-isobib:
     INPUT
     word = File.read("test.doc", encoding: "utf-8")
     html = File.read("test.html", encoding: "utf-8")

data/spec/asciidoctor-iso/blocks_spec.rb

@@ -79,6 +79,7 @@ RSpec.describe Asciidoctor::ISO do
       :nodoc:
       :novalid:
       :draft: 1.2
+      :no-isobib:
 
       [[foreword]]
       .Foreword

data/spec/asciidoctor-iso/cleanup_spec.rb

@@ -70,6 +70,7 @@ RSpec.describe Asciidoctor::ISO do
       :nodoc:
       :novalid:
       :stem:
+      :no-isobib:
 
       == Terms and Definitions
 

data/spec/asciidoctor-iso/refs_spec.rb

@@ -80,8 +80,9 @@ RSpec.describe Asciidoctor::ISO do
              </sections><bibliography><references id="_" obligation="informative">
          <title>Normative References</title>
          <bibitem type="international-standard" id="iso123">
-         <title format="text/plain" language="en" script="Latn">Rubber latex -- Sampling</title>
-         <title format="text/plain" language="fr" script="Latn">Latex de caoutchouc -- ?chantillonnage</title>
+         <fetched>#{Date.today}</fetched>
+         <title format="text/plain" language="en" script="Latn">Rubber latex — Sampling</title>
+         <title 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>
@@ -173,8 +174,9 @@ RSpec.describe Asciidoctor::ISO do
       </sections><bibliography><references id="_" obligation="informative">
         <title>Normative References</title>
         <bibitem type="international-standard" id="iso123">
+         <fetched>#{Date.today}</fetched>
          <title format="text/plain" language="en" script="Latn">Permuted index of the vocabulary of information technology</title>
-         <title format="text/plain" language="fr" script="Latn">Index permuté du vocabulaire des technologies de l'information</title>
+         <title 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>
@@ -228,8 +230,9 @@ RSpec.describe Asciidoctor::ISO do
         </ics>
        </bibitem>
          <bibitem type="international-standard" id="iso124">
-         <title format="text/plain" language="en" script="Latn">Latex, rubber -- Determination of total solids content</title>
-         <title format="text/plain" language="fr" script="Latn">Latex de caoutchouc -- Détermination des matières solides totales</title>
+         <fetched>#{Date.today}</fetched>
+         <title format="text/plain" language="en" script="Latn">Latex, rubber — Determination of total solids content</title>
+         <title 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>
@@ -360,13 +363,13 @@ RSpec.describe Asciidoctor::ISO do
 
        </sections><bibliography><references id="_" obligation="informative">
          <title>Normative References</title>
-               <bibitem type="" id="iso123">
-  <title format="text/plain" language="en" script="Latn">Network Configuration Access Control Model</title>
+               <bibitem id="iso123">
+               <fetched>#{Date.today}</fetched>
+  <title format="plain" language="en" script="Latn">Network Configuration Access Control Model</title>
   <docidentifier type="IETF">RFC 8341</docidentifier>
   <date type="published">
     <on>2018</on>
   </date>
-  <status>published</status>
 </bibitem>
        </references>
        </bibliography>
@@ -508,16 +511,17 @@ RSpec.describe Asciidoctor::ISO do
 
     def mock_isobib_get_123
       expect(Isobib::IsoBibliography).to receive(:get).with("ISO 123", nil, {}) do
-        IsoBibItem.from_xml(<<~"OUTPUT")
-        <bibitem type=\"international-standard\" id=\"ISO123\">\n  <title format=\"text/plain\" language=\"en\" script=\"Latn\">Rubber latex -- Sampling</title>\n  <title format=\"text/plain\" language=\"fr\" script=\"Latn\">Latex de caoutchouc -- ?chantillonnage</title>\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  <docidentifier type="ISO">ISO 123:2001</docidentifier>\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>Published</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>\n      <formattedref>ISO 123:1985</formattedref>\n      </bibitem>\n  </relation>\n  <relation type=\"updates\">\n    <bibitem>\n      <formattedref>ISO 123:2001</formattedref>\n      </bibitem>\n  </relation>\n</bibitem>
+        IsoBibItem::XMLParser.from_xml(<<~"OUTPUT")
+        <bibitem type=\"international-standard\" id=\"ISO123\">\n  <fetched>#{Date.today}</fetched>\n<title format=\"text/plain\" language=\"en\" script=\"Latn\">Rubber latex -- Sampling</title>\n  <title format=\"text/plain\" language=\"fr\" script=\"Latn\">Latex de caoutchouc -- ?chantillonnage</title>\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  <docidentifier type="ISO">ISO 123:2001</docidentifier>\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>Published</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>\n      <formattedref>ISO 123:1985</formattedref>\n      </bibitem>\n  </relation>\n  <relation type=\"updates\">\n    <bibitem>\n      <formattedref>ISO 123:2001</formattedref>\n      </bibitem>\n  </relation>\n</bibitem>
         OUTPUT
       end
     end
 
     def mock_isobib_get_124
       expect(Isobib::IsoBibliography).to receive(:get).with("ISO 124", "2014", {}) do
-        IsoBibItem.from_xml(<<~"OUTPUT")
+        IsoBibItem::XMLParser.from_xml(<<~"OUTPUT")
                  <bibitem type="international-standard" id="iso124">
+      <fetched>#{Date.today}</fetched>
          <title format="text/plain" language="en" script="Latn">Latex, rubber -- Determination of total solids content</title>
          <title 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>
@@ -566,8 +570,9 @@ RSpec.describe Asciidoctor::ISO do
 
     def mock_isobib_get_iec12382
       expect(Isobib::IsoBibliography).to receive(:get).with("ISO/IEC TR 12382", "1992", {}) do
-      IsoBibItem.from_xml(<<~"OUTPUT")
+      IsoBibItem::XMLParser.from_xml(<<~"OUTPUT")
       <bibitem type="international-standard" id="iso123">
+      <fetched>#{Date.today}</fetched>
          <title format="text/plain" language="en" script="Latn">Permuted index of the vocabulary of information technology</title>
          <title 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>
@@ -628,8 +633,9 @@ end
 
        def mock_rfcbib_get_rfc8341
       expect(IETFBib::RfcBibliography).to receive(:get).with("RFC 8341", nil, {}) do
-      IsoBibItem.from_xml(<<~"OUTPUT")
+      IETFBib::XMLParser.from_xml(<<~"OUTPUT")
       <bibitem id="RFC8341">
+      <fetched>#{Date.today}</fetched>
   <title format="text/plain" language="en" script="Latn">Network Configuration Access Control Model</title>
   <docidentifier type="IETF">RFC 8341</docidentifier>
   <date type="published">