metanorma-iso 1.5.11 → 1.6.1

data/spec/asciidoctor-iso/cleanup_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 RSpec.describe Asciidoctor::ISO do
   it "removes empty text elements" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       == {blank}
     INPUT
@@ -17,7 +17,7 @@ RSpec.describe Asciidoctor::ISO do
   end
 
   it "processes stem-only terms as admitted" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       == Terms and Definitions
 
@@ -53,7 +53,7 @@ RSpec.describe Asciidoctor::ISO do
   end
 
   it "moves term domains out of the term definition paragraph" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       == Terms and Definitions
 
@@ -77,7 +77,7 @@ RSpec.describe Asciidoctor::ISO do
   end
 
   it "permits multiple blocks in term definition paragraph" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       = Document title
       Author
       :docfile: test.adoc
@@ -124,8 +124,8 @@ RSpec.describe Asciidoctor::ISO do
     OUTPUT
   end
 
-  it "strips any initial boilerplate from terms and definitions" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+  it "keeps any initial boilerplate from terms and definitions" do
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       == Terms and Definitions
 
@@ -142,6 +142,12 @@ RSpec.describe Asciidoctor::ISO do
          <terms id="_" obligation="normative"><title>Terms and definitions</title>
 
          #{TERM_BOILERPLATE}
+         <p id='_'>I am boilerplate</p>
+<ul id='_'>
+  <li>
+    <p id='_'>So am I</p>
+  </li>
+</ul>
        <term id="term-time">
        <preferred>Time</preferred>
          <definition><p id="_">This paragraph is extraneous</p></definition>
@@ -152,7 +158,7 @@ RSpec.describe Asciidoctor::ISO do
   end
 
   it "moves notes inside preceding blocks, if they are not at clause end, and the blocks are not delimited" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       [stem]
       ++++
@@ -177,7 +183,7 @@ RSpec.describe Asciidoctor::ISO do
   end
 
   it "does not move notes inside preceding blocks, if they are at clause end" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       [source,ruby]
       [1...x].each do |y|
@@ -198,7 +204,7 @@ RSpec.describe Asciidoctor::ISO do
   end
 
   it "converts xrefs to references into erefs" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       <<iso216>>
 
@@ -238,7 +244,7 @@ RSpec.describe Asciidoctor::ISO do
   end
 
   it "extracts localities from erefs" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       <<iso216,whole,clause=3,example=9-11,locality:prelude=33,locality:entirety:the reference>>
 
@@ -279,7 +285,7 @@ RSpec.describe Asciidoctor::ISO do
 
 
   it "strips type from xrefs" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       <<iso216>>
 
@@ -315,7 +321,7 @@ RSpec.describe Asciidoctor::ISO do
   end
 
   it "processes localities in term sources" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       == Terms and Definitions
 
@@ -346,7 +352,7 @@ RSpec.describe Asciidoctor::ISO do
   end
 
   it "removes extraneous material from Normative References" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       [bibliography]
       == Normative References
@@ -378,7 +384,7 @@ RSpec.describe Asciidoctor::ISO do
   end
 
   it "inserts IDs into paragraphs" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       Paragraph
     INPUT
@@ -391,7 +397,7 @@ RSpec.describe Asciidoctor::ISO do
   end
 
   it "inserts IDs into notes" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       [example]
       ====
@@ -411,7 +417,7 @@ RSpec.describe Asciidoctor::ISO do
   end
 
   it "moves table key inside table" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       |===
       |a |b |c
@@ -430,7 +436,7 @@ RSpec.describe Asciidoctor::ISO do
              <td valign="top" align="left">c</td>
            </tr>
          </tbody>
-       <dl id="_">
+       <dl id="_" key="true">
          <dt>a</dt>
          <dd>
            <p id="_">b</p>
@@ -443,7 +449,7 @@ RSpec.describe Asciidoctor::ISO do
   end
 
   it "processes headerrows attribute for table without header rows" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       [headerrows=3]
       |===
@@ -482,7 +488,7 @@ RSpec.describe Asciidoctor::ISO do
   end
 
   it "processes headerrows attribute for table with header rows" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       [headerrows=3]
       |===
@@ -527,7 +533,7 @@ RSpec.describe Asciidoctor::ISO do
   end
 
   it "moves table notes inside table" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       |===
       |a |b |c
@@ -558,7 +564,7 @@ RSpec.describe Asciidoctor::ISO do
   end
 
   it "moves formula key inside formula" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       [stem]
       ++++
@@ -572,7 +578,7 @@ RSpec.describe Asciidoctor::ISO do
        #{BLANK_HDR}
        <sections><formula id="_">
           <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mi>F</mi><mi>or</mi><mi>μ</mi><mi>l</mi><mi>a</mi></math></stem>
-       <dl id="_">
+       <dl id="_" key="true">
          <dt>a</dt>
          <dd>
            <p id="_">b</p>
@@ -585,7 +591,7 @@ RSpec.describe Asciidoctor::ISO do
   end
 
   it "moves footnotes inside figures" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       image::spec/examples/rice_images/rice_image1.png[]
 
@@ -609,7 +615,7 @@ RSpec.describe Asciidoctor::ISO do
   end
 
   it "moves figure key inside figure" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       image::spec/examples/rice_images/rice_image1.png[]
 
@@ -620,7 +626,7 @@ RSpec.describe Asciidoctor::ISO do
        #{BLANK_HDR}
        <sections><figure id="_">
          <image src="spec/examples/rice_images/rice_image1.png" id="_" mimetype="image/png" height="auto" width="auto"/>
-       <dl id="_">
+       <dl id="_" key="true">
          <dt>a</dt>
          <dd>
            <p id="_">b</p>
@@ -634,7 +640,7 @@ RSpec.describe Asciidoctor::ISO do
   end
 
   it "numbers bibliographic notes and footnotes sequentially" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       footnote:[Footnote]
 
@@ -678,7 +684,7 @@ RSpec.describe Asciidoctor::ISO do
              <abbreviation>ISO</abbreviation>
            </organization>
          </contributor>
-         <note format="text/plain" type="ISO DATE">The standard is in press</note>
+         <note format="text/plain" type="Unpublished-Status">The standard is in press</note>
        </bibitem>
       </references>
       </bibliography>
@@ -687,7 +693,7 @@ RSpec.describe Asciidoctor::ISO do
   end
 
   it "defaults section obligations" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
 
       == Clause
@@ -712,7 +718,7 @@ RSpec.describe Asciidoctor::ISO do
   end
 
   it "extends clause levels past 5" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     #{ASCIIDOC_BLANK_HDR}
 
     == Clause1
@@ -775,7 +781,7 @@ RSpec.describe Asciidoctor::ISO do
   end
 
   it "reorders references in bibliography, and renumbers citations accordingly" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     #{ASCIIDOC_BLANK_HDR}
 
     == Clause 1

data/spec/asciidoctor-iso/inline_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 RSpec.describe Asciidoctor::ISO do
   it "processes inline_quoted formatting" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       _emphasis_
       *strong*
@@ -47,7 +47,7 @@ RSpec.describe Asciidoctor::ISO do
   end
 
   it "processes breaks" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       Line break +
       line break
@@ -66,7 +66,7 @@ RSpec.describe Asciidoctor::ISO do
   end
 
   it "processes links" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       mailto:fred@example.com
       http://example.com[]
@@ -83,7 +83,7 @@ RSpec.describe Asciidoctor::ISO do
   end
 
     it "processes bookmarks" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       Text [[bookmark]] Text
     INPUT
@@ -96,7 +96,7 @@ RSpec.describe Asciidoctor::ISO do
     end
 
     it "processes crossreferences" do
-      expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+      expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       [[reference]]
       == Section
@@ -121,7 +121,7 @@ RSpec.describe Asciidoctor::ISO do
     end
 
     it "processes bibliographic anchors" do
-      expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+      expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       [bibliography]
       == Normative References
@@ -152,7 +152,7 @@ RSpec.describe Asciidoctor::ISO do
   end
 
   it "processes footnotes" do
-      expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+      expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       Hello!footnote:[Footnote text]
     INPUT

data/spec/asciidoctor-iso/lists_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 RSpec.describe Asciidoctor::ISO do
   it "processes simple lists" do
-    output = Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+    output = Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
       #{ASCIIDOC_BLANK_HDR}
       * List 1
       * List 2
@@ -28,7 +28,7 @@ RSpec.describe Asciidoctor::ISO do
          </li>
          <li>
            <p id="_">List 3</p>
-           <ol id="_" type="arabic">
+           <ol id="_">
          <li>
            <p id="_">List A</p>
          </li>
@@ -57,7 +57,7 @@ RSpec.describe Asciidoctor::ISO do
   end
 
     it "processes complex lists" do
-    output = Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+    output = Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
       #{ASCIIDOC_BLANK_HDR}
       [[id]]
       * First
@@ -107,13 +107,13 @@ RSpec.describe Asciidoctor::ISO do
          <li><p id="_">Second</p><p id="_">entry1</p>
        <p id="_">entry2</p></li>
        </ul>
-       <ol id="id1" type="alphabet">
+       <ol id="id1">
          <li>
            <p id="_">First</p>
          </li>
          <li>
            <p id="_">Second</p>
-           <ol id="_" type="alphabet_upper">
+           <ol id="_">
          <li>
            <p id="_">Third</p>
          </li>
@@ -129,19 +129,19 @@ RSpec.describe Asciidoctor::ISO do
            <p id="_">Sixth</p>
          </li>
        </ol>
-       <ol id="_" type="roman">
+       <ol id="_">
          <li>
            <p id="_">A</p>
          </li>
          <li>
            <p id="_">B</p>
-           <ol id="_" type="roman_upper">
+           <ol id="_">
          <li>
            <p id="_">C</p>
          </li>
          <li>
            <p id="_">D</p>
-           <ol id="_" type="arabic">
+           <ol id="_">
          <li>
            <p id="_">E</p>
          </li>
@@ -165,7 +165,7 @@ RSpec.describe Asciidoctor::ISO do
     end
 
     it "anchors lists and list items" do
-     expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+     expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       [[id1]]
       * [[id2]] List item

data/spec/asciidoctor-iso/refs_spec.rb

@@ -4,38 +4,177 @@ require "relaton_ietf"
 
 RSpec.describe Asciidoctor::ISO do
   it "processes draft ISO reference" do
-    #stub_fetch_ref no_year: true, note: "The standard is in press"
+    mock_fdis
+    #mock_isobib_get_123
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+      #{ISOBIB_BLANK_HDR}
+      == Clause
+      <<iso123>>
+      <<iso123>>
+      A.footnote:[a footnote]
+      <<fdis>>
+      <<fdis>>
 
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-      #{ASCIIDOC_BLANK_HDR}
       [bibliography]
       == Normative References
 
       * [[[iso123,ISO 123:--]]] footnote:[The standard is in press] _Standard_
+      * [[[fdis,ISO/FDIS 17664-1]]] Title
     INPUT
        #{BLANK_HDR}
-       <sections>
-              </sections><bibliography><references id="_" obligation="informative" normative="true">
-         <title>Normative references</title>
-         <p id="_">The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
-         <bibitem id="iso123" type="standard">
-         <title format="text/plain">Standard</title>
-         <docidentifier>ISO 123:—</docidentifier>
-         <docnumber>123</docnumber>
-         <date type="published">
-           <on>–</on>
-         </date>
-         <contributor>
-           <role type="publisher"/>
-           <organization>
-             <name>International Organization for Standardization</name>
-             <abbreviation>ISO</abbreviation>
-           </organization>
-         </contributor>
-         <note format="text/plain" type="ISO DATE">The standard is in press</note>
-       </bibitem>
-       </references>
-       </bibliography>
+                <sections>
+           <clause id='_' inline-header='false' obligation='normative'>
+             <title>Clause</title>
+             <p id='_'>
+               <eref type='inline' bibitemid='iso123' citeas='ISO 123:--'/>
+               <fn reference='1'>The standard is in press</fn>
+               <eref type='inline' bibitemid='iso123' citeas='ISO 123:--'/>
+                A.
+               <fn reference='2'>
+                 <p id='_'>a footnote</p>
+               </fn>
+               <eref type='inline' bibitemid='fdis' citeas='ISO/FDIS 17664-1'/>
+               <fn reference='3'>
+                 <p id='_'>Under preparation. (Stage at the time of publication ISO/FDIS 17664-1).</p>
+               </fn>
+               <eref type='inline' bibitemid='fdis' citeas='ISO/FDIS 17664-1'/>
+             </p>
+           </clause>
+         </sections>
+         <bibliography>
+           <references id='_' normative='true' obligation='informative'>
+             <title>Normative references</title>
+             <p id='_'>
+               The following documents are referred to in the text in such a way that
+               some or all of their content constitutes requirements of this document.
+               For dated references, only the edition cited applies. For undated
+               references, the latest edition of the referenced document (including any
+               amendments) applies.
+             </p>
+             <bibitem id='iso123' type='standard'>
+               <title format='text/plain'>Standard</title>
+               <docidentifier type='ISO'>ISO 123:—</docidentifier>
+               <docnumber>123</docnumber>
+               <date type='published'>
+                 <on>–</on>
+               </date>
+               <contributor>
+                 <role type='publisher'/>
+                 <organization>
+                   <name>International Organization for Standardization</name>
+                   <abbreviation>ISO</abbreviation>
+                 </organization>
+               </contributor>
+               <note format='text/plain' type='Unpublished-Status'>The standard is in press</note>
+             </bibitem>
+             <bibitem id='fdis' type='standard'>
+               <fetched>#{Date.today}</fetched>
+               <title type='title-intro' format='text/plain' language='fr' script='Latn'>Traitement de produits de soins de santé</title>
+               <title type='title-main' format='text/plain' language='fr' script='Latn'>
+                 Informations relatives au traitement des dispositifs médicaux à
+                 fournir par le fabricant du dispositif
+               </title>
+               <title type='title-part' format='text/plain' language='fr' script='Latn'>Partie 1: Titre manque</title>
+               <title type='main' format='text/plain' language='fr' script='Latn'>
+                 Traitement de produits de soins de santé — Informations relatives au
+                 traitement des dispositifs médicaux à fournir par le fabricant du
+                 dispositif — Partie 1: Titre manque
+               </title>
+               <uri type='src'>https://www.iso.org/standard/81720.html</uri>
+               <uri type='rss'>https://www.iso.org/contents/data/standard/08/17/81720.detail.rss</uri>
+               <docidentifier type='ISO'>ISO/FDIS 17664-1</docidentifier>
+               <docidentifier type='URN'>urn:iso:std:iso-fdis:17664:-1:stage-50.00:ed-1:fr</docidentifier>
+               <docnumber>17664</docnumber>
+               <contributor>
+                 <role type='publisher'/>
+                 <organization>
+                   <name>International Organization for Standardization</name>
+                   <abbreviation>ISO</abbreviation>
+                   <uri>www.iso.org</uri>
+                 </organization>
+               </contributor>
+               <edition>1</edition>
+               <note type='Unpublished-Status'>
+                 <p id='_'>Under preparation. (Stage at the time of publication ISO/FDIS 17664-1).</p>
+               </note>
+               <language>en</language>
+               <language>fr</language>
+               <script>Latn</script>
+               <status>
+                 <stage>50</stage>
+                 <substage>00</substage>
+               </status>
+               <copyright>
+                 <from>unknown</from>
+                 <owner>
+                   <organization>
+                     <name>ISO/FDIS</name>
+                   </organization>
+                 </owner>
+               </copyright>
+               <relation type='obsoletes'>
+                 <bibitem type='standard'>
+                   <formattedref format='text/plain'>ISO 17664:2017</formattedref>
+                 </bibitem>
+               </relation>
+               <relation type='instance'>
+                 <bibitem type='standard'>
+                   <fetched>2020-11-03</fetched>
+                   <title type='title-intro' format='text/plain' language='fr' script='Latn'>Traitement de produits de soins de santé</title>
+                   <title type='title-main' format='text/plain' language='fr' script='Latn'>
+                     Informations relatives au traitement des dispositifs médicaux à
+                     fournir par le fabricant du dispositif
+                   </title>
+                   <title type='title-part' format='text/plain' language='fr' script='Latn'>Partie 1: Titre manque</title>
+                   <title type='main' format='text/plain' language='fr' script='Latn'>
+                     Traitement de produits de soins de santé — Informations relatives
+                     au traitement des dispositifs médicaux à fournir par le fabricant
+                     du dispositif — Partie 1: Titre manque
+                   </title>
+                   <uri type='src'>https://www.iso.org/standard/81720.html</uri>
+                   <uri type='rss'>https://www.iso.org/contents/data/standard/08/17/81720.detail.rss</uri>
+                   <docidentifier type='ISO'>ISO/FDIS 17664-1</docidentifier>
+                   <docidentifier type='URN'>urn:iso:std:iso-fdis:17664:-1:stage-50.00:ed-1:fr</docidentifier>
+                   <docnumber>17664</docnumber>
+                   <contributor>
+                     <role type='publisher'/>
+                     <organization>
+                       <name>International Organization for Standardization</name>
+                       <abbreviation>ISO</abbreviation>
+                       <uri>www.iso.org</uri>
+                     </organization>
+                   </contributor>
+                   <edition>1</edition>
+                   <note type='Unpublished-Status'>
+                     <p id='_'>Under preparation. (Stage at the time of publication ISO/FDIS 17664-1).</p>
+                   </note>
+                   <language>en</language>
+                   <language>fr</language>
+                   <script>Latn</script>
+                   <status>
+                     <stage>50</stage>
+                     <substage>00</substage>
+                   </status>
+                   <copyright>
+                     <from>unknown</from>
+                     <owner>
+                       <organization>
+                         <name>ISO/FDIS</name>
+                       </organization>
+                     </owner>
+                   </copyright>
+                   <relation type='obsoletes'>
+                     <bibitem type='standard'>
+                       <formattedref format='text/plain'>ISO 17664:2017</formattedref>
+                     </bibitem>
+                   </relation>
+                   <place>Geneva</place>
+                 </bibitem>
+               </relation>
+               <place>Geneva</place>
+             </bibitem>
+           </references>
+         </bibliography>
        </iso-standard>
     OUTPUT
   end
@@ -43,7 +182,7 @@ RSpec.describe Asciidoctor::ISO do
   it "processes all-parts ISO reference" do
     #stub_fetch_ref(all_parts: true)
 
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
 
       == Clause
@@ -90,7 +229,7 @@ RSpec.describe Asciidoctor::ISO do
   end
 
   it "processes non-ISO reference in Normative References" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       [bibliography]
       == Normative References
@@ -117,7 +256,7 @@ RSpec.describe Asciidoctor::ISO do
   end
 
   it "processes non-ISO reference in Bibliography" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       [bibliography]
       == Bibliography
@@ -141,132 +280,16 @@ RSpec.describe Asciidoctor::ISO do
     OUTPUT
   end
 
-  private
-
       private
 
     def mock_isobib_get_123
-      expect(Isobib::IsoBibliography).to receive(:get).with("ISO 123", nil, {}) do
-        IsoBibItem::XMLParser.from_xml(<<~"OUTPUT")
+      expect(RelatonIso::IsoBibliography).to receive(:get).with("ISO 123", nil, {:lang=>"en", :title=>"Title", :usrlbl=>nil}) do
+      RelatonIsoBib::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::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>
-         <uri type="obp">https://www.iso.org/obp/ui/#!iso:std:61884:en</uri>
-         <uri type="rss">https://www.iso.org/contents/data/standard/06/18/61884.detail.rss</uri>
-         <docidentifier type="ISO">ISO 124:2014</docidentifier>
-         <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>
-         <status>Published</status>
-         <copyright>
-           <from>2014</from>
-           <owner>
-             <organization>
-               <name>ISO</name>
-               <abbreviation/>
-             </organization>
-           </owner>
-         </copyright>
-         <relation type="obsoletes">
-           <bibitem>
-             <formattedref>ISO 124:2011</formattedref>
-           </bibitem>
-         </relation>
-        <ics>
-          <code>83.040.10</code>
-          <text>Latex and raw rubber</text>
-        </ics>
-      </bibitem>
-        OUTPUT
-      end
-    end
-
-    def mock_isobib_get_iec12382
-      expect(Isobib::IsoBibliography).to receive(:get).with("ISO/IEC TR 12382", "1992", {}) do
-      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>
-         <uri type="obp">https://www.iso.org/obp/ui/#!iso:std:21071:en</uri>
-         <uri type="rss">https://www.iso.org/contents/data/standard/02/10/21071.detail.rss</uri>
-         <docidentifier type="ISO">ISO/IEC 12382:1992</docidentifier>
-         <date type="published">
-           <on>1992</on>
-         </date>
-         <contributor>
-           <role type="publisher"/>
-           <organization>
-             <name>International Organization for Standardization</name>
-             <abbreviation>ISO</abbreviation>
-             <uri>www.iso.org</uri>
-           </organization>
-         </contributor>
-         <contributor>
-           <role type="publisher"/>
-           <organization>
-             <name>International Electrotechnical Commission</name>
-             <abbreviation>IEC</abbreviation>
-             <uri>www.iec.ch</uri>
-           </organization>
-         </contributor>
-         <edition>2</edition>
-         <language>en</language>
-         <language>fr</language>
-         <script>Latn</script>
-         <abstract format="plain" language="en" script="Latn">Contains a permuted index of all terms included in the parts 1 - 28 of ISO 2382. If any of these parts has been revised, the present TR refers to the revision.</abstract>
-         <status>Published</status>
-         <copyright>
-           <from>1992</from>
-           <owner>
-             <organization>
-               <name>ISO/IEC</name>
-               <abbreviation/>
-             </organization>
-           </owner>
-         </copyright>
-         <relation type="updates">
-           <bibitem>
-             <formattedref>ISO/IEC TR 12382:1992</formattedref>
-           </bibitem>
-         </relation>
-        <ics>
-          <code>35.020</code>
-          <text>Information technology (IT) in general</text>
-        </ics>
-        <ics>
-          <code>01.040.35</code>
-          <text>Information technology (Vocabularies)</text>
-        </ics>
-       </bibitem>
-OUTPUT
-    end
-end
-
        def mock_rfcbib_get_rfc8341
       expect(IETFBib::RfcBibliography).to receive(:get).with("RFC 8341", nil, {}) do
       IETFBib::XMLParser.from_xml(<<~"OUTPUT")
@@ -283,4 +306,12 @@ OUTPUT
     end
 end
 
+   def mock_fdis
+     expect(RelatonIso::IsoBibliography).to receive(:get).with("ISO/FDIS 17664-1", nil, {:lang=>"en", :title=>"Title", :usrlbl=>nil}) do
+      RelatonIsoBib::XMLParser.from_xml(<<~"OUTPUT")
+     <bibitem id="x" type="standard">  <fetched>#{Date.today}</fetched>  <title type="title-intro" format="text/plain" language="fr" script="Latn">Traitement de produits de soins de santé</title>  <title type="title-main" format="text/plain" language="fr" script="Latn">Informations relatives au traitement des dispositifs médicaux à fournir par le fabricant du dispositif</title>  <title type="title-part" format="text/plain" language="fr" script="Latn">Partie 1: Titre manque</title>  <title type="main" format="text/plain" language="fr" script="Latn">Traitement de produits de soins de santé — Informations relatives au traitement des dispositifs médicaux à fournir par le fabricant du dispositif — Partie 1: Titre manque</title>  <uri type="src">https://www.iso.org/standard/81720.html</uri>  <uri type="rss">https://www.iso.org/contents/data/standard/08/17/81720.detail.rss</uri>  <docidentifier type="ISO">ISO/FDIS 17664-1</docidentifier>  <docidentifier type="URN">urn:iso:std:iso-fdis:17664:-1:stage-50.00:ed-1:fr</docidentifier>  <docnumber>17664</docnumber>  <contributor>    <role type="publisher"/>    <organization>      <name>International Organization for Standardization</name>      <abbreviation>ISO</abbreviation>      <uri>www.iso.org</uri>    </organization>  </contributor>  <edition>1</edition>  <language>en</language>  <language>fr</language>  <script>Latn</script>  <status>    <stage>50</stage>    <substage>00</substage>  </status>  <copyright>    <from>unknown</from>    <owner>      <organization>        <name>ISO/FDIS</name>      </organization>    </owner>  </copyright>  <relation type="obsoletes">    <bibitem type="standard">      <formattedref format="text/plain">ISO 17664:2017</formattedref>    </bibitem>  </relation>  <relation type="instance">    <bibitem type="standard">      <fetched>2020-11-03</fetched>      <title type="title-intro" format="text/plain" language="fr" script="Latn">Traitement de produits de soins de santé</title>      <title type="title-main" format="text/plain" language="fr" script="Latn">Informations relatives au traitement des dispositifs médicaux à fournir par le fabricant du dispositif</title>      <title type="title-part" format="text/plain" language="fr" script="Latn">Partie 1: Titre manque</title>      <title type="main" format="text/plain" language="fr" script="Latn">Traitement de produits de soins de santé — Informations relatives au traitement des dispositifs médicaux à fournir par le fabricant du dispositif — Partie 1: Titre manque</title>      <uri type="src">https://www.iso.org/standard/81720.html</uri>      <uri type="rss">https://www.iso.org/contents/data/standard/08/17/81720.detail.rss</uri>      <docidentifier type="ISO">ISO/FDIS 17664-1</docidentifier>      <docidentifier type="URN">urn:iso:std:iso-fdis:17664:-1:stage-50.00:ed-1:fr</docidentifier>      <docnumber>17664</docnumber>      <contributor>        <role type="publisher"/>        <organization>          <name>International Organization for Standardization</name>          <abbreviation>ISO</abbreviation>          <uri>www.iso.org</uri>        </organization>      </contributor>      <edition>1</edition>      <language>en</language>      <language>fr</language>      <script>Latn</script>      <status>        <stage>50</stage>        <substage>00</substage>      </status>      <copyright>        <from>unknown</from>        <owner>          <organization>            <name>ISO/FDIS</name>          </organization>        </owner>      </copyright>      <relation type="obsoletes">        <bibitem type="standard">          <formattedref format="text/plain">ISO 17664:2017</formattedref>        </bibitem>      </relation>      <place>Geneva</place>    </bibitem>  </relation>  <place>Geneva</place></bibitem>
+     OUTPUT
+   end
+   end
+
 end