asciidoctor-iso 0.9.6 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de3b792b4a60d8da397a08e1dcc4f8afa083a91e6d25ce153b6eb61003c2f162
-  data.tar.gz: ef4b5b07410e3a865ee3657c7f5e0d01613c19edf854629a4b69416d6048cb5c
+  metadata.gz: 225229b725b0ffc73cc5acc93152e63dc14393642e70760091d26f018a7ca329
+  data.tar.gz: 8268c280a53388ca060ddc42756bd0ca548a90caceb5c75ea9d376a52ead3516
 SHA512:
-  metadata.gz: 70a807f56e7516d3be9d3b9b93fc8c21965bc1c0aa5edd0ecda0262c1d992d8dbb5495b4b573c7da572bbdd93e5049b3fd14be1148bfc28c53aef5e89660b0aa
-  data.tar.gz: a79c9e5d0de76c3d183ef2d7d152f1853930b764f4b6a51dfec74cdabc63f6524a1b603edac7dba757b42799086ed8b7ab0548c5a3f9d83195c5b53b12d68c46
+  metadata.gz: 2c3b97e89a0663e6df5127339c71f3cd437bf6ddc0eeb19a38679474d59bc7072fe5de846493d99c2e02807e12d39734c3e4b08a97a8fde29215537d887701be
+  data.tar.gz: eddf671a4b9e67b78ca10a7cd708e089455512bd7f4427c4452903aee178bf601ff80a815393d28e3a45360021d9cfa9d6a2bd57b9420ee1fbc1a119ba670e70

data/Gemfile.lock

@@ -1,21 +1,22 @@
 GIT
   remote: git://github.com/riboseinc/relaton.git
-  revision: ce33a2874530a8f7bf438e26624d05a47526d346
+  revision: 3daaf6fa4cd85eb4e1ea8141e520b4350a944975
   specs:
-    relaton (0.0.2)
+    relaton (0.1.0)
+      algoliasearch
       gbbib (~> 0.1.0)
       iev (~> 0.1.0)
-      isobib (~> 0.1.9)
+      isobib (~> 0.2.0)
       rfcbib (~> 0.1.0)
 
 PATH
   remote: .
   specs:
-    asciidoctor-iso (0.9.5)
+    asciidoctor-iso (0.9.6)
       asciidoctor (~> 1.5.7)
       iev (~> 0.1.0)
       isodoc (>= 0.8)
-      relaton (~> 0.0.1)
+      relaton (~> 0.1.0)
       ruby-jing
 
 GEM
@@ -36,9 +37,9 @@ GEM
       nokogiri (>= 1.4.3)
     ffi (1.9.25)
     formatador (0.2.5)
-    gbbib (0.1.5)
-      cnccs (~> 0.1.1)
-      iso-bib-item (~> 0.1.10)
+    gbbib (0.1.4)
+      cnccs
+      iso-bib-item
     guard (2.14.2)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
@@ -67,13 +68,13 @@ GEM
     iev (0.1.0)
       nokogiri
     image_size (2.0.0)
-    iso-bib-item (0.1.11)
+    iso-bib-item (0.2.0)
       isoics (~> 0.1.6)
       nokogiri (~> 1.8.4)
       ruby_deep_clone (~> 0.8.0)
-    isobib (0.1.10)
+    isobib (0.2.0)
       algoliasearch
-      iso-bib-item (~> 0.1.10)
+      iso-bib-item (~> 0.2.0)
     isodoc (0.8.4)
       asciimath
       html2doc (~> 0.8.1)
@@ -120,7 +121,7 @@ GEM
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
     rfcbib (0.1.1)
-      iso-bib-item (~> 0.1.10)
+      iso-bib-item (~> 0.2.0)
     roman-numerals (0.3.0)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
@@ -176,6 +177,7 @@ DEPENDENCIES
   equivalent-xml (~> 0.6)
   guard (~> 2.14)
   guard-rspec (~> 4.7)
+  isobib (~> 0.2.0)
   metanorma (~> 0.2.6)
   rake (~> 12.0)
   relaton!

data/README.adoc

@@ -91,7 +91,7 @@ $ gem install asciidoctor-iso
 === Content Warnings
 
 The gem also realises several format
-checks as prescribed in ISO/IEC DIR 2, and warns the user about them in the
+checks as prescribed in ISO/IEC DIR 2: 2018, and warns the user about them in the
 console:
 
 * Numbers with what looks like dots instead of commas for decimal points.

data/asciidoctor-iso.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "ruby-jing"
   spec.add_dependency "isodoc", ">= 0.8"
   spec.add_dependency "iev", "~> 0.1.0"
-  spec.add_dependency "relaton", "~> 0.0.1"
+  spec.add_dependency "relaton", "~> 0.1.1"
 
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "byebug", "~> 9.1"
@@ -44,4 +44,5 @@ Gem::Specification.new do |spec|
   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.2.0"
 end

data/docs/htmloutput.adoc

@@ -0,0 +1,115 @@
+= HTML and Word HTML Output
+
+In order to create CSS stylesheets for the HTML and Word HTML output of the Metanorma tool, it is necessary to understand the structure of the HTML it generates.
+
+== HTML
+
+=== Top-Level Structure
+
+The `head` of the HTML document contains a single stylesheet (the `:htmlstylesheet` parameter of `HtmlConvert.new()`), and some brief script calls that are embedded in the Ruby code (initialising jQuery, including webfonts).
+
+The `body` of the HTML document is divided into the following parts:
+
+* A title section (`<div class="title-section">`), comprising identifying information about the document, such as appears in a title page in print. 
+** The section is populated with an HTML template (the `:htmlcoverpage` parameter of `HtmlConvert.new()`). The information in this section is sourced from document metadata, rather than document content proper; the gem uses http://liquidmarkup.org[Liquid Template] to populate the HTML template. Different fields usually have distinct class names for CSS styling; these can vary by gem. 
+** For example, ISO documents have `coverpage_docnumber` (for the document ID), `coverpage_techcommittee` (for the technical committee responsible for the document), `doctitle-en` (for the English-language title of the document), `doctitle-fr` (for the French title), `title, subtitle, part` (for the three components of the document title), and `coverpage_docstage` (for the stage of publication of the document).
+* A prefatory section (`<div class="prefatory-section">`), comprising boilerplate information which also does not come from document content proper. This is typically restricted to a copyright statement (`<div class="copyright">`), contact details, and a table of contents `<div id="toc">`. 
+** The section is also populated with a Liquid HTML template (the `:htmlintropage` parameter of `HtmlConvert.new()`). 
+** The table of contents in the HTML template is a placeholder; it is populated by a table of contents script included among the scripts loaded into the HTML body.
+* The main section of the document (`<main class="main-section">`), which is populated with the document content.
+* Optionally, a colophon (`<div class="colophon">`), which is populated with boilerplate information and/or document metadata. (Currently colophons in Metanorma gems appear only in Word output.)
+* Scripts. These are populated from a static file (the `:scripts` parameter of `HtmlConvert.new()`). These are expected to include https://www.mathjax.org[MathJax], a Table of Contents generator, and a script for handling footnotes.
+
+=== Body markup
+
+Within the body of the document, different blocks and inline spans of the Metanorma document model (https://github.com/riboseinc/metanorma-model-standoc[Standoc XML], https://github.com/riboseinc/basicdoc-models[BasicDoc XML]) are represented by different CSS classes, as follows:
+
+==== Sections
+
+Symbols and abbreviated terms:: `<div class="Symbols">` (contents are a definition list)
+Appendix title:: `<h1 class="Annex">`
+Appendix, Bibliography, Introduction:: `<div class="Section3">`
+Introduction title:: `<h1 class="IntroTitle">`
+Foreword title:: `<h1 class="ForewordTitle">`
+Deprecated term:: `<p class="DeprecatedTerms">`
+Alternative term:: `<p class="AltTerms">`
+Primary term:: `<p class="Terms">`
+Term header:: `<p class="TermNum">`
+Document title (in body):: `<p class="zzSTDTitle1">`
+
+==== Blocks
+
+Note:: `<div class="Note">`
+Note label:: `<span class="note_label">`
+Figure:: `<div class="figure">`
+Figure title:: `<span class="FigureTitle">`
+Example:: `<table class="example">` or `<div class="example">`
+Example label:: `<span class="example_label">`
+Sourcecode:: `<p class="Sourcecode">`
+Admonition:: `<div class="Admonition">`
+Formula:: `<div class="formula">`
+Blockquote:: `<div class="Quote">`
+Blockquote attribution:: `<p class="QuoteAttribution">`
+Footnote:: `<aside class="footnote">`
+Ordered list:: `<ol>`
+Unordered list:: `<ul>`
+Definition list:: `<dl>`
+Normative reference:: `<p class="NormRef">`
+Informative reference:: `<p class="Biblio">`
+Table:: `<table>`
+Table title:: `<p class="TableTitle">`
+Table head:: `<thead>`
+Table body:: `<tbody>`
+Table foot:: `<tfoot>`
+
+==== Inline
+
+Hyperlink:: `<a>`
+Cross-Reference:: `<a>`
+Stem expression:: `<span class="stem">`
+Small caps:: `<span style="font-variant:small-caps;">`
+Emphasis:: `<i>`
+Strong:: `<b>`
+Superscript:: `<sup>`
+Subscript:: `<sub>`
+Monospace:: `<tt>`
+Strikethrough:: `<s>`
+Line Break:: `<br>`
+Horizontal Rule:: `<hr>`
+Page Break:: `<br>` (realised as page break in Word HTML)
+
+
+== Word HTML
+
+=== Word HTML and Word HTML CSS
+
+The Word HTML documented here is what is used by the gems to generate DOC output. For more on why Word HTML is used, instead of OOXML or HTML 5 embedded into DOCX, see https://github.com/riboseinc/html2doc/wiki/Why-not-docx%3F
+
+Word HTML, and the Word HTML version of CSS, are restricted compared to the HTML and CSS you are likely familiar with. Word HTML is a subset of HTML 4; Word HTML CSS has a weakened set of selectors, and a range of Microsoft-specific extensions (prefixed with `@` or `mso-`). The weakened set of selectors means you cannot assume that classes are inherited by their children; normal CSS would apply formatting on a `div` class to its child paragraphs, but Word HTML would expect you to repeat that class definition for `p`.
+
+Some of the necessary caveats are listed in https://github.com/riboseinc/html2doc/blob/master/README.adoc. The styling of lists in particular is quite different to normal CSS, and requires a Word-specific selector to define list styles (the `:ulstyle ` and `:olstyle ` parameter of `WordConvert.new()`).
+
+Word HTML and CSS is not well-documented (even though there is a 1500 page manual from Microsoft); fortunately saving Word documents to HTML will reveal the Word HTML and Word HTML CSS that can be used to generate the same formatting. The stylesheets need to follow the conventions of Word HTML, and should be formulated by saving Word documents as HTML, and extracting their CSS stylesheets. Note that the CSS is prefixed with a set of font definitions; these too should be obtained by saving Word documents as HTML.
+
+=== Top-Level Structure
+
+The headers and footers of a Word document are defined in Word HTML in a separate file, `header.html` (the `:header` parameter of `WordConvert.new()`), which is included in the file manifest for the document. The header.html file is cross-referenced to the Word HTML CSS file, and contains a separate `div` for each header and footer type; refer to the instances in the gems for illustration.
+
+The `head` of the Word HTML document contains two stylesheets (the `:wordstylesheet` and `:standardsheet` parameter of `WordConvert.new()`). The `:wordstylesheet` is intended as generic Word markup, while `:standardsheet` is intended to contain styling specific to the standard. No scripts are supported in Word HTML. 
+
+The other elements of the Word HTML head are populated by the https://github.com/riboseinc/html2doc[html2doc gem]: a reference to a manifest of included files (specifically images and the header file), and settings to open the document in Print View at 100% magnification.
+
+The `body` of the Word HTML document is divided into the following parts:
+
+* A title section (`<div class="WordSection1">`), comprising identifying information about the document, such as appears in a title page in print. 
+** The section is populated with an HTML template (the `:wordcoverpage` parameter of `WordConvert.new()`). As with HTML, the information in this section is sourced from document metadata, rather than document content proper; and the gem uses http://liquidmarkup.org[Liquid Template] to populate the HTML template. 
+* A prefatory section (`<div class="WordSection2">`), comprising boilerplate information which does not come from document content proper (such as a Table of Contents shell), as well as prefatory material from the document content. The prefatory section is set in the CSS stylesheet to have Roman numerals for its pagination.
+** Because of the requirement for Roman numerals, prefatory material from the document is sent to this section, whereas all document content in the HTML document is sent to the main section.
+* The main section of the document (`<div class="WordSection3">`), which is populated with the remaining document content. The main section is set in the CSS stylesheet to have Arabic numerals for its pagination.
+* Optionally, a colophon (`<div class="colophon">`), which is populated with boilerplate information and/or document metadata. 
+
+=== Body markup
+
+With the exception of the top-level document sections, discussed above, the Word HTML generated by the gem use the same CSS classes as the HTML proper. As already noted, the quirks of Word HTML CSS mean that classes need to be repeated on descendant elements that are not required in normal CSS.
+
+The handling of footnotes and comments in Word HTML uses idiosyncratic Word HTML markup, including custom CSS, and is generated separately their the HTML counterparts in the gems.

data/lib/asciidoctor/iso/base.rb

@@ -119,7 +119,6 @@ module Asciidoctor
         result << noko { |ixml| front node, ixml }
         result << noko { |ixml| middle node, ixml }
         result << "</iso-standard>"
-        @bibdb.save() if @bibdb
         textcleanup(result.flatten * "\n")
       end
 

data/lib/asciidoctor/iso/cleanup_ref.rb

@@ -116,7 +116,7 @@ module Asciidoctor
           docid = ref.at("./docidentifier")
           date = ref.at("./date[@type = 'published']")
           reference = format_ref(docid.text, isopub)
-          reference += ": #{date_range(date)}" if date && isopub
+          reference += ":#{date_range(date)}" if date && isopub
           @anchors[ref["id"]] = { xref: reference }
         end
       end

data/lib/asciidoctor/iso/ref.rb

@@ -82,7 +82,7 @@ module Asciidoctor
       def fetch_ref(xml, code, year, **opts)
         hit = @bibdb&.fetch(code, year, opts) 
         return nil if hit.nil?
-        xml.parent.add_child(hit)
+        xml.parent.add_child(hit.to_xml)
         xml
       rescue Algolia::AlgoliaProtocolError
         nil # Render reference without an Internet connection.

data/lib/asciidoctor/iso/validate.rb

@@ -144,6 +144,15 @@ module Asciidoctor
     end
   end
 
+  def locality_erefs_validate(root)
+    root.xpath("//eref[locality]").each do |t|
+      unless /:[ ]?\d+{4}$/.match? t["citeas"]
+        warn "ISO: undated reference #{t['citeas']} should not contain "\
+          "specific elements"
+      end
+    end
+  end
+
   def termdef_warn(text, re, term, msg)
     re.match?(text) && warn("ISO style: #{term}: #{msg}")
   end
@@ -181,6 +190,7 @@ module Asciidoctor
     iev_validate(doc.root)
     see_xrefs_validate(doc.root)
     see_erefs_validate(doc.root)
+    locality_erefs_validate(doc.root)
   end
 
   def schema_validate(doc, filename)

data/lib/asciidoctor/iso/validate_requirements.rb

@@ -9,14 +9,13 @@ module Asciidoctor
         \\b
          ( shall | (is|are)_to |
            (is|are)_required_(not_)?to |
+           (is|are)_required_that |
            has_to |
            only\\b[^.,]+\\b(is|are)_permitted |
            it_is_necessary |
-           (needs|need)_to |
            (is|are)_not_(allowed | permitted |
                          acceptable | permissible) |
            (is|are)_not_to_be |
-           (need|needs)_not |
            do_not )
         \\b
       REGEXP

data/lib/asciidoctor/iso/validate_section.rb

@@ -189,6 +189,7 @@ module Asciidoctor
 
       def asset_style(root)
         root.xpath("//example | //termexample").each { |e| example_style(e) }
+        root.xpath("//definition").each { |e| definition_style(e) }
         root.xpath("//note").each { |e| note_style(e) }
         root.xpath("//fn").each { |e| footnote_style(e) }
         root.xpath(ASSETS_TO_STYLE).each { |e| style(e, extract_text(e)) }

data/lib/asciidoctor/iso/validate_style.rb

@@ -30,6 +30,12 @@ module Asciidoctor
         style_warning(node, "Introduction may contain requirement", r) if r
       end
 
+      def definition_style(node)
+        return if @novalid
+        r = requirement(extract_text(node))
+        style_warning(node, "Definition may contain requirement", r) if r
+      end
+
       def example_style(node)
         return if @novalid
         style_no_guidance(node, extract_text(node), "Term Example")

data/lib/asciidoctor/iso/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module ISO
-    VERSION = "0.9.6".freeze
+    VERSION = "0.9.7".freeze
   end
 end

data/spec/asciidoctor-iso/blocks_spec.rb

@@ -286,7 +286,7 @@ RSpec.describe Asciidoctor::ISO do
               <sections>
          <figure id="_">
          <name>Split-it-right sample divider</name>
-                  <image src="spec/examples/rice_images/rice_image1.png" id="_" imagetype="PNG"/>
+                  <image src="spec/examples/rice_images/rice_image1.png" id="_" imagetype="PNG" height="auto" width="auto"/>
        </figure>
        </sections>
        </iso-standard>

data/spec/asciidoctor-iso/cleanup_spec.rb

@@ -182,7 +182,7 @@ r = 1 %</stem>
         <preface><foreword obligation="informative">
         <title>Foreword</title>
         <p id="_">
-        <eref type="inline" bibitemid="iso216" citeas="ISO 216: 2001"/>
+        <eref type="inline" bibitemid="iso216" citeas="ISO 216:2001"/>
       </p>
       </foreword></preface><sections>
       </sections><bibliography><references id="_" obligation="informative">
@@ -551,7 +551,7 @@ r = 1 %</stem>
     INPUT
        #{BLANK_HDR}
        <sections><figure id="_">
-         <image src="spec/examples/rice_images/rice_image1.png" id="_" imagetype="PNG"/>
+         <image src="spec/examples/rice_images/rice_image1.png" id="_" imagetype="PNG" height="auto" width="auto"/>
        <fn reference="a">
          <p id="_">This is a footnote to a figure</p>
        </fn><fn reference="b">
@@ -575,7 +575,7 @@ r = 1 %</stem>
     INPUT
        #{BLANK_HDR}
        <sections><figure id="_">
-         <image src="spec/examples/rice_images/rice_image1.png" id="_" imagetype="PNG"/>
+         <image src="spec/examples/rice_images/rice_image1.png" id="_" imagetype="PNG" height="auto" width="auto"/>
        <dl id="_">
          <dt>a</dt>
          <dd>
@@ -609,15 +609,15 @@ r = 1 %</stem>
               <sections>
          <figure id="figureC-2"><figure id="_">
          <name>Initial stages: No grains are fully gelatinized (ungelatinized starch granules are visible inside the kernels)</name>
-         <image src="spec/examples/rice_images/rice_image3_1.png" id="_" imagetype="PNG"/>
+         <image src="spec/examples/rice_images/rice_image3_1.png" id="_" imagetype="PNG" height="auto" width="auto"/>
        </figure>
        <figure id="_">
          <name>Intermediate stages: Some fully gelatinized kernels are visible</name>
-         <image src="spec/examples/rice_images/rice_image3_2.png" id="_" imagetype="PNG"/>
+         <image src="spec/examples/rice_images/rice_image3_2.png" id="_" imagetype="PNG" height="auto" width="auto"/>
        </figure>
        <figure id="_">
          <name>Final stages: All kernels are fully gelatinized</name>
-         <image src="spec/examples/rice_images/rice_image3_3.png" id="_" imagetype="PNG"/>
+         <image src="spec/examples/rice_images/rice_image3_3.png" id="_" imagetype="PNG" height="auto" width="auto"/>
        </figure></figure>
        </sections>
        </iso-standard>

data/spec/asciidoctor-iso/isobib_cache_spec.rb

@@ -1,11 +1,14 @@
 require "spec_helper"
+require "isobib"
 
 RSpec.describe Asciidoctor::ISO do
 
   ISO_123_SHORT = <<~EOS
-<bibitem type="international-standard" id="iso123">
+<bibitem type="international-standard" id="ISO123">
   <title format="text/plain" language="en" script="Latn">Rubber latex -- Sampling</title>
   <docidentifier>ISO 123</docidentifier>
+  <contributor>    <role type="publisher"/>    <organization>      <name>International Organization for Standardization</name>      <abbreviation>ISO</abbreviation>      <uri>www.iso.org</uri>    </organization>  </contributor>
+  <status>Published</status>
 </bibitem>
 EOS
 
@@ -13,27 +16,31 @@ EOS
 <bibitem type="international-standard" id="ISO124">
   <title format="text/plain" language="en" script="Latn">Latex, rubber -- Determination of total solids content</title>
   <docidentifier>ISO 124</docidentifier>
+  <contributor>    <role type="publisher"/>    <organization>      <name>International Organization for Standardization</name>      <abbreviation>ISO</abbreviation>      <uri>www.iso.org</uri>    </organization>  </contributor>
+  <status>Published</status>
 </bibitem>
 EOS
 
   ISO_124_SHORT_ALT = <<~EOS
-<bibitem type="international-standard" id="iso124">
+<bibitem type="international-standard" id="ISO124">
   <title format="text/plain" language="en" script="Latn">Latex, rubber -- Replacement</title>
   <docidentifier>ISO 124</docidentifier>
+  <contributor>    <role type="publisher"/>    <organization>      <name>International Organization for Standardization</name>      <abbreviation>ISO</abbreviation>      <uri>www.iso.org</uri>    </organization>  </contributor>
+  <status>Published</status>
 </bibitem>
 EOS
 
   ISOBIB_123_DATED = <<~EOS
-<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>  <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>ISO 123</docidentifier>  <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>Published</status>  <copyright>    <from>2001</from>    <owner>      <organization>        <name>ISO</name>        <abbreviation></abbreviation>      </organization>    </owner>  </copyright>  <relation type="obsoletes">    <bibitem>      <formattedref>ISO 123:1985</formattedref>      <docidentifier>ISO 123:1985</docidentifier>    </bibitem>  </relation>  <relation type="updates">    <bibitem>      <formattedref>ISO 123:2001</formattedref>      <docidentifier>ISO 123:2001</docidentifier>    </bibitem>  </relation></bibitem>
+<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>  <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>ISO 123</docidentifier>  <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>Published</status>  <copyright>    <from>2001</from>    <owner>      <organization>        <name>ISO</name>        </organization>    </owner>  </copyright>  <relation type="obsoletes">    <bibitem>      <formattedref>ISO 123:1985</formattedref>      </bibitem>  </relation>  <relation type="updates">    <bibitem>      <formattedref>ISO 123:2001</formattedref>      </bibitem>  </relation></bibitem>
 EOS
 
   ISOBIB_123_UNDATED = <<~EOS
-<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>  <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>ISO 123</docidentifier>  <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>Published</status>  <copyright>    <from>2001</from>    <owner>      <organization>        <name>ISO</name>        <abbreviation></abbreviation>      </organization>    </owner>  </copyright>  <relation type="obsoletes">    <bibitem>      <formattedref>ISO 123:1985</formattedref>      <docidentifier>ISO 123:1985</docidentifier>    </bibitem>  </relation>  <relation type="updates">    <bibitem>      <formattedref>ISO 123:2001</formattedref>      <docidentifier>ISO 123:2001</docidentifier>    </bibitem>  </relation></bibitem>
+<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>  <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>ISO 123</docidentifier>  <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>Published</status>  <copyright>    <from>2001</from>    <owner>      <organization>        <name>ISO</name>        </organization>    </owner>  </copyright>  <relation type="obsoletes">    <bibitem>      <formattedref>ISO 123:1985</formattedref>      </bibitem>  </relation>  <relation type="updates">    <bibitem>      <formattedref>ISO 123:2001</formattedref>      </bibitem>  </relation></bibitem>
 EOS
 
 
   ISOBIB_124_DATED = <<~EOS
-<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>  <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>ISO 124</docidentifier>  <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="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="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>Published</status>  <copyright>    <from>2014</from>    <owner>      <organization>        <name>ISO</name>        <abbreviation></abbreviation>      </organization>    </owner>  </copyright>  <relation type="obsoletes">    <bibitem>      <formattedref>ISO 124:2011</formattedref>      <docidentifier>ISO 124:2011</docidentifier>    </bibitem>  </relation></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>  <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>ISO 124</docidentifier>  <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="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="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>Published</status>  <copyright>    <from>2014</from>    <owner>      <organization>        <name>ISO</name>        </organization>    </owner>  </copyright>  <relation type="obsoletes">    <bibitem>      <formattedref>ISO 124:2011</formattedref>      </bibitem>  </relation></bibitem>
 EOS
 
   it "does not activate biblio caches if isobib disabled" do
@@ -88,9 +95,10 @@ EOS
     INPUT
     expect(File.exist?("#{Dir.home}/.relaton-bib.json")).to be true
 
-    json = JSON.parse(File.read("#{Dir.home}/.relaton-bib.json", encoding: "utf-8"))
-    expect(json["ISO 123:2001"]["fetched"]).to eq(Date.today.to_s)
-    expect(json["ISO 123:2001"]["bib"]).to be_equivalent_to(ISOBIB_123_DATED)
+    db = Relaton::Db.new "#{Dir.home}/.relaton-bib.json", nil
+    entry = db.load_entry("ISO 123:2001")
+    expect(entry["fetched"].to_s).to eq(Date.today.to_s)
+    expect(entry["bib"].to_xml).to be_equivalent_to(ISOBIB_123_DATED)
 
     system "rm ~/.relaton-bib.json"
     system "mv ~/.relaton-bib.json1 ~/.relaton-bib.json"
@@ -111,8 +119,9 @@ EOS
     expect(File.exist?("#{Dir.home}/.relaton-bib.json")).to be true
     expect(File.exist?("test.relaton.json")).to be false
 
-    json = JSON.parse(File.read("#{Dir.home}/.relaton-bib.json", encoding: "utf-8"))
-    expect(json).to have_key("ISO 123:2001")
+    db = Relaton::Db.new "#{Dir.home}/.relaton-bib.json", nil
+    entry = db.load_entry("ISO 123:2001")
+    expect(entry).to_not be nil
 
     system "rm ~/.relaton-bib.json"
     system "mv ~/.relaton-bib.json1 ~/.relaton-bib.json"
@@ -132,11 +141,13 @@ EOS
     expect(File.exist?("#{Dir.home}/.relaton-bib.json")).to be true
     expect(File.exist?("test.relaton.json")).to be true
 
-    json = JSON.parse(File.read("#{Dir.home}/.relaton-bib.json", encoding: "utf-8"))
-    expect(json).to have_key("ISO 123:2001")
+    db = Relaton::Db.new "#{Dir.home}/.relaton-bib.json", nil
+    entry = db.load_entry("ISO 123:2001")
+    expect(entry).to_not be nil
 
-    json = JSON.parse(File.read("test.relaton.json", encoding: "utf-8"))
-    expect(json).to have_key("ISO 123:2001")
+    db = Relaton::Db.new "test.relaton.json", nil
+    entry = db.load_entry("ISO 123:2001")
+    expect(entry).to_not be nil
 
     system "rm ~/.relaton-bib.json"
     system "mv ~/.relaton-bib.json1 ~/.relaton-bib.json"
@@ -145,15 +156,13 @@ EOS
 
   it "fetches uncached references" do
     system "mv ~/.relaton-bib.json ~/.relaton-bib.json1"
-
-    File.open("#{Dir.home}/.relaton-bib.json", "w") do |f|
-      f.write({
-        "ISO 123:2001": {
-          "fetched": Date.today.to_s,
-          "bib": ISO_123_SHORT
+    db = Relaton::Db.new "#{Dir.home}/.relaton-bib.json", nil
+    db.save_entry("ISO 123:2001",
+        {
+          "fetched" => Date.today.to_s,
+          "bib" => IsoBibItem.from_xml(ISO_123_SHORT)
         }
-      }.to_json)
-    end
+      )
 
     mock_isobib_get_124
 
@@ -166,11 +175,12 @@ EOS
       * [[[iso124,ISO 124:2014]]] _Standard_
     INPUT
 
-    json = JSON.parse(File.read("#{Dir.home}/.relaton-bib.json", encoding: "utf-8"))
-    expect(json["ISO 123:2001"]["fetched"]).to eq(Date.today.to_s)
-    expect(json["ISO 124:2014"]["fetched"]).to eq(Date.today.to_s)
-    expect(json["ISO 123:2001"]["bib"]).to be_equivalent_to(ISO_123_SHORT)
-    expect(json["ISO 124:2014"]["bib"]).to be_equivalent_to(ISOBIB_124_DATED)
+    entry = db.load_entry("ISO 123:2001")
+    expect(entry["fetched"].to_s).to eq(Date.today.to_s)
+    expect(entry["bib"].to_xml).to be_equivalent_to(ISO_123_SHORT)
+    entry = db.load_entry("ISO 124:2014")
+    expect(entry["fetched"].to_s).to eq(Date.today.to_s)
+    expect(entry["bib"].to_xml).to be_equivalent_to(ISOBIB_124_DATED)
 
     system "rm ~/.relaton-bib.json"
     system "mv ~/.relaton-bib.json1 ~/.relaton-bib.json"
@@ -179,14 +189,13 @@ EOS
   it "expires stale undated references" do
     system "mv ~/.relaton-bib.json ~/.relaton-bib.json1"
 
-    File.open("#{Dir.home}/.relaton-bib.json", "w") do |f|
-      f.write({
-        "ISO 123": {
-          "fetched": (Date.today - 90).to_s,
-          "bib": ISO_123_SHORT
+        db = Relaton::Db.new "#{Dir.home}/.relaton-bib.json", nil
+        db.save_entry("ISO 123",
+        {
+          "fetched" => (Date.today - 90).to_s,
+          "bib" => IsoBibItem.from_xml(ISO_123_SHORT)
         }
-      }.to_json)
-    end
+      )
 
     mock_isobib_get_123_undated
 
@@ -198,9 +207,9 @@ EOS
       * [[[iso123,ISO 123]]] _Standard_
     INPUT
 
-    json = JSON.parse(File.read("#{Dir.home}/.relaton-bib.json", encoding: "utf-8"))
-    expect(json["ISO 123"]["fetched"]).to eq(Date.today.to_s)
-    expect(json["ISO 123"]["bib"]).to be_equivalent_to(ISOBIB_123_UNDATED)
+        entry = db.load_entry("ISO 123")
+            expect(entry["fetched"].to_s).to eq(Date.today.to_s)
+    expect(entry["bib"].to_xml).to be_equivalent_to(ISOBIB_123_UNDATED)
 
     system "rm ~/.relaton-bib.json"
     system "mv ~/.relaton-bib.json1 ~/.relaton-bib.json"
@@ -209,14 +218,13 @@ EOS
   it "does not expire stale dated references" do
     system "mv ~/.relaton-bib.json ~/.relaton-bib.json1"
 
-    File.open("#{Dir.home}/.relaton-bib.json", "w") do |f|
-      f.write({
-        "ISO 123:2001": {
-          "fetched": (Date.today - 90).to_s,
-          "bib": ISO_123_SHORT
+            db = Relaton::Db.new "#{Dir.home}/.relaton-bib.json", nil
+            db.save_entry("ISO 123:2001",
+        {
+          "fetched" => (Date.today - 90).to_s,
+          "bib" => IsoBibItem.from_xml(ISO_123_SHORT)
         }
-      }.to_json)
-    end
+      )
 
     Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
       #{CACHED_ISOBIB_BLANK_HDR}
@@ -226,9 +234,9 @@ EOS
       * [[[iso123,ISO 123:2001]]] _Standard_
     INPUT
 
-    json = JSON.parse(File.read("#{Dir.home}/.relaton-bib.json", encoding: "utf-8"))
-    expect(json["ISO 123:2001"]["fetched"]).to eq((Date.today - 90).to_s)
-    expect(json["ISO 123:2001"]["bib"]).to be_equivalent_to(ISO_123_SHORT)
+            entry = db.load_entry("ISO 123:2001")
+            expect(entry["fetched"].to_s).to eq((Date.today - 90).to_s)
+    expect(entry["bib"].to_xml).to be_equivalent_to(ISO_123_SHORT)
 
     system "rm ~/.relaton-bib.json"
     system "mv ~/.relaton-bib.json1 ~/.relaton-bib.json"
@@ -238,35 +246,35 @@ EOS
     system "mv ~/.relaton-bib.json ~/.relaton-bib.json1"
     system "rm test.relaton.json"
 
-    File.open("#{Dir.home}/.relaton-bib.json", "w") do |f|
-      f.write({
-        "ISO 123:2001": {
-          "fetched": Date.today.to_s,
-          "bib": ISO_123_SHORT
-        },
-        "ISO 124": {
-          "fetched": Date.today.to_s,
-          "bib": ISO_124_SHORT
+    db = Relaton::Db.new "#{Dir.home}/.relaton-bib.json", nil
+    db.save_entry("ISO 123:2001",
+        {
+          "fetched" => Date.today.to_s,
+          "bib" => IsoBibItem.from_xml(ISO_123_SHORT)
         }
-      }.to_json)
-    end
+      )
+    db.save_entry("ISO 124",
+        {
+          "fetched" => Date.today.to_s,
+          "bib" => IsoBibItem.from_xml(ISO_124_SHORT)
+        }
+      )
 
-    File.open("test.relaton.json", "w") do |f|
-      f.write({
-        "ISO 124": {
-          "fetched": Date.today.to_s,
-          "bib": ISO_124_SHORT_ALT
+    localdb = Relaton::Db.new "test.relaton.json", nil
+    localdb.save_entry("ISO 124",
+        {
+          "fetched" => Date.today.to_s,
+          "bib" => IsoBibItem.from_xml(ISO_124_SHORT_ALT)
         }
-      }.to_json)
-    end
+      )
 
     input = <<~EOS
 #{LOCAL_CACHED_ISOBIB_BLANK_HDR}
 [bibliography]
 == Normative References
 
-* [[[iso123,ISO 123:2001]]] _Standard_
-* [[[iso124,ISO 124]]] _Standard_
+* [[[ISO123,ISO 123:2001]]] _Standard_
+* [[[ISO124,ISO 124]]] _Standard_
 EOS
 
     output = <<~EOS
@@ -284,19 +292,10 @@ EOS
 
     expect(strip_guid(Asciidoctor.convert(input, backend: :iso, header_footer: true))).to be_equivalent_to(output)
 
-    json = JSON.parse(File.read("#{Dir.home}/.relaton-bib.json", encoding: "utf-8"))
-
-    expect(json["ISO 123:2001"]["fetched"]).to eq(Date.today.to_s)
-    expect(json["ISO 124"]["fetched"]).to eq(Date.today.to_s)
-    expect(json["ISO 123:2001"]["bib"]).to be_equivalent_to(ISO_123_SHORT)
-    expect(json["ISO 124"]["bib"]).to be_equivalent_to(ISO_124_SHORT)
-
-    json_local = JSON.parse(File.read("test.relaton.json", encoding: "utf-8"))
-
-    expect(json_local["ISO 123:2001"]["fetched"]).to eq(Date.today.to_s)
-    expect(json_local["ISO 124"]["fetched"]).to eq(Date.today.to_s)
-    expect(json_local["ISO 123:2001"]["bib"]).to be_equivalent_to(ISO_123_SHORT)
-    expect(json_local["ISO 124"]["bib"]).to be_equivalent_to(ISO_124_SHORT_ALT)
+    expect(db.load_entry("ISO 123:2001")["bib"].to_xml).to be_equivalent_to(ISO_123_SHORT)
+    expect(db.load_entry("ISO 124")["bib"].to_xml).to be_equivalent_to(ISO_124_SHORT)
+    expect(localdb.load_entry("ISO 123:2001")["bib"].to_xml).to be_equivalent_to(ISO_123_SHORT)
+    expect(localdb.load_entry("ISO 124")["bib"].to_xml).to be_equivalent_to(ISO_124_SHORT_ALT)
 
     system "rm ~/.relaton-bib.json"
     system "mv ~/.relaton-bib.json1 ~/.relaton-bib.json"
@@ -305,15 +304,15 @@ EOS
 private
 
   def mock_isobib_get_123
-    expect(Isobib::IsoBibliography).to receive(:get).with("ISO 123", "2001", {}).and_return(ISOBIB_123_DATED)
+    expect(Isobib::IsoBibliography).to receive(:get).with("ISO 123", "2001", {}).and_return(IsoBibItem.from_xml(ISOBIB_123_DATED))
   end
 
   def mock_isobib_get_123_undated
-    expect(Isobib::IsoBibliography).to receive(:get).with("ISO 123", nil, {}).and_return(ISOBIB_123_UNDATED)
+    expect(Isobib::IsoBibliography).to receive(:get).with("ISO 123", nil, {}).and_return(IsoBibItem.from_xml(ISOBIB_123_UNDATED))
   end
 
   def mock_isobib_get_124
-    expect(Isobib::IsoBibliography).to receive(:get).with("ISO 124", "2014", {}).and_return(ISOBIB_124_DATED)
+    expect(Isobib::IsoBibliography).to receive(:get).with("ISO 124", "2014", {}).and_return(IsoBibItem.from_xml(ISOBIB_124_DATED))
   end
 
 end

data/spec/asciidoctor-iso/refs_spec.rb

@@ -1,4 +1,5 @@
 require "spec_helper"
+require "isobib"
 
 RSpec.describe Asciidoctor::ISO do
     it "processes simple ISO reference" do
@@ -80,9 +81,9 @@ RSpec.describe Asciidoctor::ISO do
          <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>
-         <source type="src">https://www.iso.org/standard/23281.html</source>
-         <source type="obp">https://www.iso.org/obp/ui/#!iso:std:23281:en</source>
-         <source type="rss">https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</source>
+         <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>ISO 123</docidentifier>
          <date type="published">
            <on>2001</on>
@@ -112,13 +113,11 @@ RSpec.describe Asciidoctor::ISO do
          <relation type="obsoletes">
            <bibitem>
              <formattedref>ISO 123:1985</formattedref>
-             <docidentifier>ISO 123:1985</docidentifier>
            </bibitem>
          </relation>
          <relation type="updates">
            <bibitem>
              <formattedref>ISO 123:2001</formattedref>
-             <docidentifier>ISO 123:2001</docidentifier>
            </bibitem>
          </relation>
        </bibitem>
@@ -175,9 +174,9 @@ RSpec.describe Asciidoctor::ISO do
         <bibitem type="international-standard" id="iso123">
          <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>
-         <source type="src">https://www.iso.org/standard/21071.html</source>
-         <source type="obp">https://www.iso.org/obp/ui/#!iso:std:21071:en</source>
-         <source type="rss">https://www.iso.org/contents/data/standard/02/10/21071.detail.rss</source>
+         <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>ISO/IEC 12382</docidentifier>
          <date type="published">
            <on>1992</on>
@@ -216,7 +215,6 @@ RSpec.describe Asciidoctor::ISO do
          <relation type="updates">
            <bibitem>
              <formattedref>ISO/IEC TR 12382:1992</formattedref>
-             <docidentifier>ISO/IEC TR 12382:1992</docidentifier>
            </bibitem>
          </relation>
         <ics>
@@ -231,9 +229,9 @@ RSpec.describe Asciidoctor::ISO do
          <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>
-         <source type="src">https://www.iso.org/standard/61884.html</source>
-         <source type="obp">https://www.iso.org/obp/ui/#!iso:std:61884:en</source>
-         <source type="rss">https://www.iso.org/contents/data/standard/06/18/61884.detail.rss</source>
+         <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>ISO 124</docidentifier>
          <date type="published">
            <on>2014</on>
@@ -264,7 +262,6 @@ RSpec.describe Asciidoctor::ISO do
          <relation type="obsoletes">
            <bibitem>
              <formattedref>ISO 124:2011</formattedref>
-             <docidentifier>ISO 124:2011</docidentifier>
            </bibitem>
          </relation>
         <ics>
@@ -482,21 +479,21 @@ RSpec.describe Asciidoctor::ISO do
 
     def mock_isobib_get_123
       expect(Isobib::IsoBibliography).to receive(:get).with("ISO 123", nil, {}) do
-        <<~"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  <source type=\"src\">https://www.iso.org/standard/23281.html</source>\n  <source type=\"obp\">https://www.iso.org/obp/ui/#!iso:std:23281:en</source>\n  <source type=\"rss\">https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</source>\n  <docidentifier>ISO 123</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      <docidentifier>ISO 123:1985</docidentifier>\n    </bibitem>\n  </relation>\n  <relation type=\"updates\">\n    <bibitem>\n      <formattedref>ISO 123:2001</formattedref>\n      <docidentifier>ISO 123:2001</docidentifier>\n    </bibitem>\n  </relation>\n</bibitem>
+        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>ISO 123</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
-        <<~"OUTPUT"
+        IsoBibItem.from_xml(<<~"OUTPUT")
                  <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>
-         <source type="src">https://www.iso.org/standard/61884.html</source>
-         <source type="obp">https://www.iso.org/obp/ui/#!iso:std:61884:en</source>
-         <source type="rss">https://www.iso.org/contents/data/standard/06/18/61884.detail.rss</source>
+         <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>ISO 124</docidentifier>
          <date type="published">
            <on>2014</on>
@@ -527,7 +524,6 @@ RSpec.describe Asciidoctor::ISO do
          <relation type="obsoletes">
            <bibitem>
              <formattedref>ISO 124:2011</formattedref>
-             <docidentifier>ISO 124:2011</docidentifier>
            </bibitem>
          </relation>
         <ics>
@@ -541,13 +537,13 @@ RSpec.describe Asciidoctor::ISO do
 
     def mock_isobib_get_iec12382
       expect(Isobib::IsoBibliography).to receive(:get).with("ISO/IEC TR 12382", "1992", {}) do
-      <<~"OUTPUT"
+      IsoBibItem.from_xml(<<~"OUTPUT")
       <bibitem type="international-standard" id="iso123">
          <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>
-         <source type="src">https://www.iso.org/standard/21071.html</source>
-         <source type="obp">https://www.iso.org/obp/ui/#!iso:std:21071:en</source>
-         <source type="rss">https://www.iso.org/contents/data/standard/02/10/21071.detail.rss</source>
+         <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>ISO/IEC 12382</docidentifier>
          <date type="published">
            <on>1992</on>
@@ -586,7 +582,6 @@ RSpec.describe Asciidoctor::ISO do
          <relation type="updates">
            <bibitem>
              <formattedref>ISO/IEC TR 12382:1992</formattedref>
-             <docidentifier>ISO/IEC TR 12382:1992</docidentifier>
            </bibitem>
          </relation>
         <ics>

data/spec/asciidoctor-iso/validate_spec.rb

@@ -50,6 +50,19 @@ RSpec.describe "warn that scope may contain recommendation" do
   INPUT
 end
 
+RSpec.describe "warn that definition may contain requirement" do
+  specify { expect { Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true) }.to output(/Definition may contain requirement/).to_stderr }
+  #{VALIDATING_BLANK_HDR}
+
+  == Terms and Definitions
+
+  === Term1
+
+  It is required that there is a definition.
+
+  INPUT
+end
+
 RSpec.describe "warn that term example may contain recommendation" do
   specify { expect { Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true) }.to output(/Term Example may contain recommendation/).to_stderr }
   #{VALIDATING_BLANK_HDR}
@@ -120,6 +133,19 @@ RSpec.describe "term source is not a real reference" do
   INPUT
 end
 
+RSpec.describe "undated reference has locality" do
+  specify { expect { Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true) }.to output(/undated reference ISO 123 should not contain specific elements/).to_stderr }
+  #{VALIDATING_BLANK_HDR}
+  
+  == Scope
+  <<iso123,clause=1>>
+
+  [bibliography]
+  == Normative References
+  * [[[iso123,ISO 123]]] _Standard_
+  INPUT
+end
+
 RSpec.describe "Non-reference in bibliography" do
   specify { expect { Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true) }.to output(/no anchor on reference/).to_stderr }
   #{VALIDATING_BLANK_HDR}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-iso
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-14 00:00:00.000000000 Z
+date: 2018-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -234,6 +234,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.6
+- !ruby/object:Gem::Dependency
+  name: isobib
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 description: |
   asciidoctor-iso lets you write ISO standards in AsciiDoc syntax.
 
@@ -263,6 +277,7 @@ files:
 - bin/rspec
 - docs/customisation.adoc
 - docs/guidance.adoc
+- docs/htmloutput.adoc
 - docs/quickstart.adoc
 - lib/asciidoctor-iso.rb
 - lib/asciidoctor/iso/base.rb