metanorma-iso 1.5.12 → 1.7.0

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

@@ -6,7 +6,7 @@ RSpec.describe Asciidoctor::ISO do
   it "processes draft ISO reference" do
     mock_fdis
     #mock_isobib_get_123
-    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")
       #{ISOBIB_BLANK_HDR}
       == Clause
       <<iso123>>
@@ -68,7 +68,7 @@ RSpec.describe Asciidoctor::ISO do
                <note format='text/plain' type='Unpublished-Status'>The standard is in press</note>
              </bibitem>
              <bibitem id='fdis' type='standard'>
-               <fetched>2020-11-09</fetched>
+               <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 à
@@ -182,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
@@ -229,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
@@ -256,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

data/spec/asciidoctor-iso/section_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 RSpec.describe Asciidoctor::ISO do
   it "processes sections" 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}
       == Foreword
 
@@ -50,6 +50,8 @@ RSpec.describe Asciidoctor::ISO do
       [%appendix]
       === Appendix 1
 
+      ==== Appendix subclause
+
       == Bibliography
 
       === Bibliography Subsection
@@ -136,6 +138,9 @@ standardization at the following addresses:</p>
        </clause>
        <appendix id="_" inline-header="false" obligation="normative">
           <title>Appendix 1</title>
+          <clause id='_' inline-header='false' obligation='normative'>
+  <title>Appendix subclause</title>
+</clause>
        </appendix></annex><bibliography><references id="_" obligation="informative" normative="true">
          <title>Normative references</title>
          <p id="_">There are no normative references in this document.</p>
@@ -151,7 +156,7 @@ standardization at the following addresses:</p>
   end
 
   it "processes 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}
       [obligation=informative]
       == Clause 1
@@ -182,7 +187,7 @@ standardization at the following addresses:</p>
   end
 
     it "processes inline headers" 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
 
@@ -213,7 +218,7 @@ standardization at the following addresses:</p>
     end
 
   it "processes blank headers" 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
 
@@ -233,7 +238,7 @@ standardization at the following addresses:</p>
   end
 
  it "processes terms & definitions with external source" 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}
 
       Foreword
@@ -272,7 +277,7 @@ standardization at the following addresses:</p>
     end
 
           it "processes empty terms & definitions" 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}
 
       Foreword
@@ -318,7 +323,7 @@ standardization at the following addresses:</p>
     end
 
            it "processes empty terms & definitions with external source" 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}
 
       Foreword

data/spec/asciidoctor-iso/table_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 RSpec.describe Asciidoctor::ISO do
   it "processes basic tables" 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}
       .Table Name
       |===
@@ -36,7 +36,7 @@ RSpec.describe Asciidoctor::ISO do
   end
 
   it "inserts header rows in a table with a name and no header" 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=2]
       .Table Name
@@ -76,7 +76,7 @@ RSpec.describe Asciidoctor::ISO do
 
 
   it "inserts header rows in a table without a name and no header" 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=2]
       |===
@@ -112,7 +112,7 @@ RSpec.describe Asciidoctor::ISO do
   end
 
   it "processes complex tables" 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}
       [cols="<,^,^,^,^",options="header,footer",headerrows=2]
       .Maximum permissible mass fraction of defects

data/spec/asciidoctor-iso/validate_spec.rb

@@ -17,15 +17,84 @@ RSpec.describe Asciidoctor::ISO do
       expect do
         Metanorma::Compile
           .new
-          .compile("spec/assets/xref_error.adoc", type: "iso")
+          .compile("spec/assets/xref_error.adoc", type: "iso", :"agree-to-terms" => true)
       end.to(change { File.exist?("spec/assets/xref_error.err") }
               .from(false).to(true))
     end
   end
 
+it "Warns of image names not compliant with DRG" do
+      FileUtils.rm_f "test.err"
+    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
+      = Document title
+      Author
+      :docfile: test.adoc
+      :nodoc:
+      :no-isobib:
+      :docnumber: 1000
+      :partnumber: 1
+      :edition: 2
+      :amendment-number: 3
+
+      .Split-it-right sample divider
+      image::spec/examples/rice_images/rice_image1.png[]
+      image::spec/examples/rice_images/SL1000-1_ed2amd3fig1.png[]
+      image::spec/examples/rice_images/1001_ed2amd3fig1.png[]
+      image::spec/examples/rice_images/ISO_1213_1.png[]
+      image::spec/examples/rice_images/1000-1_ed2amd3figA.png[]
+
+      |===
+      |a |b
+
+      a|image::spec/examples/rice_images/1000-1_ed2amd3figTab1.png[] 
+      a|image::spec/examples/rice_images/1000-1_ed2amd3fig2.png[]
+      |===
+
+      image::spec/examples/rice_images/1000-1_ed2amd3figTab2.png[]
+
+      image::spec/examples/rice_images/1000-1_ed2amd3figA1.png[]
+      image::spec/examples/rice_images/1000-1_ed2amd3fig1a.png[]
+
+      .Stages of gelatinization
+      ====
+      image::spec/examples/rice_images/1000-1_ed2amd3fig1b.png[]
+
+      image::spec/examples/rice_images/1000-1_ed2amd3fig4.png[]
+      ====
+
+      image::spec/examples/rice_images/1000-1_ed2amd3fig5_f.png[]
+
+      [appendix]
+      == Annex
+      image::spec/examples/rice_images/1000-1_ed2amd3figA2.png[]
+      image::spec/examples/rice_images/1000-1_ed2amd3fig3.png[]
+
+      INPUT
+    expect(File.read("test.err")).to include "image name spec/examples/rice_images/rice_image1.png does not match DRG requirements: expect 1000-1_ed2amd3fig"
+    expect(File.read("test.err")).to include "image name spec/examples/rice_images/1001_ed2amd3fig1.png does not match DRG requirements: expect 1000-1_ed2amd3fig"
+    expect(File.read("test.err")).not_to include "image name spec/examples/rice_images/SL1000-1_ed2amd3fig1.png does not match DRG requirements: expect 1000-1_ed2amd3fig"
+    expect(File.read("test.err")).not_to include "image name spec/examples/rice_images/ISO_1213_1.png does not match DRG requirements: expect 1000-1_ed2amd3fig"
+    expect(File.read("test.err")).to include "image name spec/examples/rice_images/1000-1_ed2amd3figA.png does not match DRG requirements"
+    expect(File.read("test.err")).not_to include "image name spec/examples/rice_images/1000-1_ed2amd3figTab1.png does not match DRG requirements"
+    expect(File.read("test.err")).not_to include "image name spec/examples/rice_images/1000-1_ed2amd3figTab1.png is under a table but is not so labelled"
+    expect(File.read("test.err")).to include "image name spec/examples/rice_images/1000-1_ed2amd3fig2.png is under a table but is not so labelled"
+    expect(File.read("test.err")).to include "image name spec/examples/rice_images/1000-1_ed2amd3figTab2.png is labelled as under a table but is not"
+    expect(File.read("test.err")).not_to include "image name spec/examples/rice_images/1000-1_ed2amd3fig1.png is labelled as under a table but is not"
+    expect(File.read("test.err")).not_to include "image name spec/examples/rice_images/1000-1_ed2amd3figA2.png is under an annex but is not so labelled"
+    expect(File.read("test.err")).to include "image name spec/examples/rice_images/1000-1_ed2amd3fig3.png is under an annex but is not so labelled"
+    expect(File.read("test.err")).to include "image name spec/examples/rice_images/1000-1_ed2amd3figA1.png is labelled as under an annex but is not"
+    expect(File.read("test.err")).not_to include "image name spec/examples/rice_images/1000-1_ed2amd3fig1.png is labelled as under an annex but is not"
+    expect(File.read("test.err")).not_to include "image name spec/examples/rice_images/1000-1_ed2amd3fig1b.png has a subfigure letter but is not a subfigure"
+    expect(File.read("test.err")).to include "image name spec/examples/rice_images/1000-1_ed2amd3fig4.png does not have a subfigure letter but is a subfigure"
+    expect(File.read("test.err")).to include "image name spec/examples/rice_images/1000-1_ed2amd3fig1a.png has a subfigure letter but is not a subfigure"
+    expect(File.read("test.err")).not_to include "image name spec/examples/rice_images/1000-1_ed2amd3fig1.png has a subfigure letter but is not a subfigure"
+    expect(File.read("test.err")).to include "image name spec/examples/rice_images/1000-1_ed2amd3fig5_f.png expected to have suffix _e"
+    expect(File.read("test.err")).not_to include "image name spec/examples/rice_images/1000-1_ed2amd3fig1.png expected to have suffix _e"
+end
+
 it "Warns of missing scope" do
     FileUtils.rm_f "test.err"
-    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   = Document title
   Author
   :docfile: test.adoc
@@ -36,8 +105,9 @@ it "Warns of missing scope" do
   text
   INPUT
     expect(File.read("test.err")).to include "Scope clause missing"
+
   FileUtils.rm_f "test.err"
-    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   = Document title
   Author
   :docfile: test.adoc
@@ -49,11 +119,23 @@ it "Warns of missing scope" do
   INPUT
     expect(File.read("test.err")).not_to include "Scope clause missing"
 
+  FileUtils.rm_f "test.err"
+    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  = Document title
+  Author
+  :docfile: test.adoc
+  :nodoc:
+  :no-isobib:
+  :doctype: amendment
+
+  text
+  INPUT
+    expect(File.read("test.err")).not_to include "Scope clause missing"
 end
 
 it "Warns of missing normative references" do
     FileUtils.rm_f "test.err"
-    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   = Document title
   Author
   :docfile: test.adoc
@@ -64,8 +146,9 @@ it "Warns of missing normative references" do
   text
   INPUT
     expect(File.read("test.err")).to include "Normative references missing"
+
   FileUtils.rm_f "test.err"
-    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   = Document title
   Author
   :docfile: test.adoc
@@ -78,11 +161,24 @@ it "Warns of missing normative references" do
   INPUT
     expect(File.read("test.err")).not_to include "Normative references missing"
 
+  FileUtils.rm_f "test.err"
+    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  = Document title
+  Author
+  :docfile: test.adoc
+  :nodoc:
+  :no-isobib:
+  :doctype: amendment
+
+  text
+  INPUT
+    expect(File.read("test.err")).not_to include "Normative references missing"
+
 end
 
 it "Warns of missing terms & definitions" do
     FileUtils.rm_f "test.err"
-    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   = Document title
   Author
   :docfile: test.adoc
@@ -93,8 +189,9 @@ it "Warns of missing terms & definitions" do
   text
   INPUT
     expect(File.read("test.err")).to include "Terms & definitions missing"
+
   FileUtils.rm_f "test.err"
-    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   = Document title
   Author
   :docfile: test.adoc
@@ -107,12 +204,23 @@ it "Warns of missing terms & definitions" do
   INPUT
     expect(File.read("test.err")).not_to include "Terms & definitions missing"
 
-end
+FileUtils.rm_f "test.err"
+    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  = Document title
+  Author
+  :docfile: test.adoc
+  :nodoc:
+  :no-isobib:
+  :doctype: amendment
 
+  text
+  INPUT
+    expect(File.read("test.err")).not_to include "Terms & definitions missing"
+end
 
 it "Warns of illegal doctype" do
     FileUtils.rm_f "test.err"
-    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   = Document title
   Author
   :docfile: test.adoc
@@ -127,7 +235,7 @@ end
 
 it "Warns of illegal script" do
     FileUtils.rm_f "test.err"
-    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   = Document title
   Author
   :docfile: test.adoc
@@ -142,7 +250,7 @@ end
 
 it "Warns of illegal stage" do
     FileUtils.rm_f "test.err"
-    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   = Document title
   Author
   :docfile: test.adoc
@@ -157,7 +265,7 @@ end
 
 it "Warns of illegal substage" do
     FileUtils.rm_f "test.err"
-    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   = Document title
   Author
   :docfile: test.adoc
@@ -173,7 +281,7 @@ end
 
 it "Warns of illegal iteration" do
     FileUtils.rm_f "test.err"
-    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   = Document title
   Author
   :docfile: test.adoc
@@ -189,7 +297,7 @@ end
 
 it "Warns of illegal script" do
     FileUtils.rm_f "test.err"
-    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   = Document title
   Author
   :docfile: test.adoc
@@ -204,7 +312,7 @@ end
 
 it "warns that technical report may contain requirement" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   = Document title
   Author
   :docfile: test.adoc
@@ -222,7 +330,7 @@ end
 
 it "warns that introduction may contain requirement" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   #{VALIDATING_BLANK_HDR}
   == Introduction
 
@@ -233,7 +341,7 @@ end
 
 it "warns that foreword may contain recommendation" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   #{VALIDATING_BLANK_HDR}
 
   It is not recommended that widgets should be larger than 15 cm.
@@ -245,7 +353,7 @@ end
 
 it "warns that foreword may contain permission" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   #{VALIDATING_BLANK_HDR}
 
   No widget is required to be larger than 15 cm.
@@ -257,7 +365,7 @@ end
 
 it "warns that scope may contain recommendation" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   #{VALIDATING_BLANK_HDR}
 
   == Scope
@@ -268,7 +376,7 @@ end
 
 it "warns that definition may contain requirement" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   #{VALIDATING_BLANK_HDR}
 
   == Terms and Definitions
@@ -283,7 +391,7 @@ end
 
 it "warns that term example may contain recommendation" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   #{VALIDATING_BLANK_HDR}
 
   == Terms and Definitions
@@ -298,7 +406,7 @@ end
 
 it "warns that note may contain recommendation" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   #{VALIDATING_BLANK_HDR}
 
   NOTE: It is not recommended that widgets should be larger than 15 cm.
@@ -308,7 +416,7 @@ end
 
 it "warns that footnote may contain recommendation" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   #{VALIDATING_BLANK_HDR}
 
   footnote:[It is not recommended that widgets should be larger than 15 cm.]
@@ -318,7 +426,7 @@ end
 
 it "warns that term source is not in expected format" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   #{VALIDATING_BLANK_HDR}
 
   [.source]
@@ -329,7 +437,7 @@ end
 
 it "warns that figure does not have title" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   #{VALIDATING_BLANK_HDR}
 
   image::spec/examples/rice_images/rice_image1.png[]
@@ -339,7 +447,7 @@ end
 
 it "warns that callouts do not match annotations" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
       #{VALIDATING_BLANK_HDR}
       [source,ruby]
       --
@@ -356,7 +464,7 @@ end
 
 it "warns that term source is not a real reference" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   #{VALIDATING_BLANK_HDR}
 
   [.source]
@@ -367,7 +475,7 @@ end
 
 it "warns that undated reference has locality" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   #{VALIDATING_BLANK_HDR}
 
   == Scope
@@ -382,7 +490,7 @@ end
 
 it "do not warn that undated reference which is a bibliographic reference has locality" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   #{VALIDATING_BLANK_HDR}
 
   == Scope
@@ -397,7 +505,7 @@ end
 
 it "do not warn that undated IEV reference has locality" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   #{VALIDATING_BLANK_HDR}
 
   == Scope
@@ -412,7 +520,7 @@ end
 
 it "do not warn that in print has locality" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   #{VALIDATING_BLANK_HDR}
 
   == Scope
@@ -427,7 +535,7 @@ end
 
 it "warns of Non-reference in bibliography" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   #{VALIDATING_BLANK_HDR}
 
   == Normative References
@@ -438,7 +546,7 @@ end
 
 it "warns of Non-ISO reference in Normative References" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   #{VALIDATING_BLANK_HDR}
 
   [bibliography]
@@ -450,7 +558,7 @@ end
 
 it "warns that Scope contains subclauses" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   #{VALIDATING_BLANK_HDR}
 
   == Scope
@@ -463,7 +571,7 @@ end
 
 it "warns that Table should have title" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   #{VALIDATING_BLANK_HDR}
 
   |===
@@ -475,7 +583,7 @@ end
 
 it "gives Style warning if number not broken up in threes" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   #{VALIDATING_BLANK_HDR}
 
   == Clause
@@ -486,7 +594,7 @@ end
 
 it "gives No style warning if number not broken up in threes is ISO reference" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   #{VALIDATING_BLANK_HDR}
 
   == Clause
@@ -497,7 +605,7 @@ end
 
 it "Style warning if decimal point" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   #{VALIDATING_BLANK_HDR}
 
   == Clause
@@ -508,7 +616,7 @@ end
 
 it "Style warning if billion used" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   #{VALIDATING_BLANK_HDR}
 
   == Clause
@@ -519,7 +627,7 @@ end
 
 it "Style warning if no space before percent sign" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   #{VALIDATING_BLANK_HDR}
 
   == Clause
@@ -530,7 +638,7 @@ end
 
 it "Style warning if unbracketed tolerance before percent sign" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   #{VALIDATING_BLANK_HDR}
 
   == Clause
@@ -541,7 +649,7 @@ end
 
 it "Style warning if dots in abbreviation" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   #{VALIDATING_BLANK_HDR}
 
   == Clause
@@ -552,7 +660,7 @@ end
 
 it "No Style warning if dots in abbreviation are e.g." do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   #{VALIDATING_BLANK_HDR}
 
   == Clause
@@ -563,7 +671,7 @@ end
 
 it "Style warning if ppm used" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   #{VALIDATING_BLANK_HDR}
 
   == Clause
@@ -574,7 +682,7 @@ end
 
 it "Style warning if space between number and degree" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   #{VALIDATING_BLANK_HDR}
 
   == Clause
@@ -585,7 +693,7 @@ end
 
 it "Style warning if no space between number and SI unit" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   #{VALIDATING_BLANK_HDR}
 
   == Clause
@@ -596,7 +704,7 @@ end
 
 it "Style warning if mins used" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   #{VALIDATING_BLANK_HDR}
 
   == Clause
@@ -607,7 +715,7 @@ end
 
 # can't test: our asciidoc template won't allow this to be generated
 # it "Style warning if foreword contains subclauses" do
-  # expect { Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true) }.to output(%r{non-standard unit}).to_stderr
+  # expect { Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true) }.to output(%r{non-standard unit}).to_stderr
   #  #{VALIDATING_BLANK_HDR}
 #
   # INPUT
@@ -615,7 +723,7 @@ end
 
 # can't test: we strip out any such content from Normative references preemptively
 #it "Style warning if Normative References contains subclauses" do
-  #expect { Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true) }.to output(%r{normative references contains subclauses}).to_stderr
+  #expect { Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true) }.to output(%r{normative references contains subclauses}).to_stderr
   ##{VALIDATING_BLANK_HDR}
 #
   #[bibliography]
@@ -627,7 +735,7 @@ end
 
 it "Style warning if two Symbols and Abbreviated Terms sections" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   #{VALIDATING_BLANK_HDR}
 
   == Terms and Abbreviations
@@ -641,7 +749,7 @@ end
 
 it "Style warning if Symbols and Abbreviated Terms contains extraneous matter" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   #{VALIDATING_BLANK_HDR}
 
   == Symbols and Abbreviated Terms
@@ -653,7 +761,7 @@ end
 
 it "Warning if missing foreword" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   #{VALIDATING_BLANK_HDR}
 
   == Symbols and Abbreviated Terms
@@ -661,11 +769,27 @@ it "Warning if missing foreword" do
   Paragraph
   INPUT
     expect(File.read("test.err")).to include "Initial section must be (content) Foreword"
+
+        FileUtils.rm_f "test.err"
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  = Document title
+  Author
+  :docfile: test.adoc
+  :nodoc:
+  :no-isobib:
+  :doctype: amendment
+
+  == Symbols and Abbreviated Terms
+
+  Paragraph
+  INPUT
+    expect(File.read("test.err")).not_to include "Initial section must be (content) Foreword"
+
 end
 
 it "Warning if do not start with scope or introduction" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   #{VALIDATING_BLANK_HDR}
   Foreword
 
@@ -674,11 +798,29 @@ it "Warning if do not start with scope or introduction" do
   Paragraph
   INPUT
     expect(File.read("test.err")).to include "Prefatory material must be followed by (clause) Scope"
+
+  FileUtils.rm_f "test.err"
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  = Document title
+  Author
+  :docfile: test.adoc
+  :nodoc:
+  :no-isobib:
+  :doctype: amendment
+
+  Foreword
+
+  == Symbols and Abbreviated Terms
+
+  Paragraph
+  INPUT
+    expect(File.read("test.err")).not_to include "Prefatory material must be followed by (clause) Scope"
+
 end
 
 it "Warning if introduction not followed by scope" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   #{VALIDATING_BLANK_HDR}
 
   .Foreword
@@ -691,11 +833,32 @@ it "Warning if introduction not followed by scope" do
   Paragraph
   INPUT
     expect(File.read("test.err")).to include "Prefatory material must be followed by (clause) Scope"
+
+  FileUtils.rm_f "test.err"
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  = Document title
+  Author
+  :docfile: test.adoc
+  :nodoc:
+  :no-isobib:
+  :doctype: amendment
+
+  .Foreword
+  Foreword
+
+  == Introduction
+
+  == Symbols and Abbreviated Terms
+
+  Paragraph
+  INPUT
+    expect(File.read("test.err")).not_to include "Prefatory material must be followed by (clause) Scope"
+
 end
 
 it "Warning if normative references not followed by terms and definitions" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   #{VALIDATING_BLANK_HDR}
 
   .Foreword
@@ -711,11 +874,35 @@ it "Warning if normative references not followed by terms and definitions" do
   Paragraph
   INPUT
     expect(File.read("test.err")).to include "Normative References must be followed by Terms and Definitions"
+
+        FileUtils.rm_f "test.err"
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  = Document title
+  Author
+  :docfile: test.adoc
+  :nodoc:
+  :no-isobib:
+  :doctype: amendment
+
+  .Foreword
+  Foreword
+
+  == Scope
+
+  [bibliography]
+  == Normative References
+
+  == Symbols and Abbreviated Terms
+
+  Paragraph
+  INPUT
+    expect(File.read("test.err")).not_to include "Normative References must be followed by Terms and Definitions"
+
 end
 
 it "Warning if there are no clauses in the document" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   #{VALIDATING_BLANK_HDR}
 
   .Foreword
@@ -732,11 +919,35 @@ it "Warning if there are no clauses in the document" do
 
   INPUT
     expect(File.read("test.err")).to include "Document must contain at least one clause"
+
+      FileUtils.rm_f "test.err"
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  = Document title
+  Author
+  :docfile: test.adoc
+  :nodoc:
+  :no-isobib:
+  :doctype: amendment
+
+  .Foreword
+  Foreword
+
+  == Scope
+
+  [bibliography]
+  == Normative References
+
+  == Terms and Definitions
+
+  == Symbols and Abbreviated Terms
+
+  INPUT
+    expect(File.read("test.err")).not_to include "Document must contain at least one clause"
 end
 
 it "Warning if scope occurs after Terms and Definitions" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   #{VALIDATING_BLANK_HDR}
 
   .Foreword
@@ -755,11 +966,38 @@ it "Warning if scope occurs after Terms and Definitions" do
 
   INPUT
     expect(File.read("test.err")).to include "Scope must occur before Terms and Definitions"
+
+  FileUtils.rm_f "test.err"
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  = Document title
+  Author
+  :docfile: test.adoc
+  :nodoc:
+  :no-isobib:
+  :doctype: amendment
+
+  .Foreword
+  Foreword
+
+  == Scope
+
+  [bibliography]
+  == Normative References
+
+  == Terms and Definitions
+
+  == Clause
+
+  == Scope
+
+  INPUT
+    expect(File.read("test.err")).not_to include "Scope must occur before Terms and Definitions"
+
 end
 
 it "Warning if Symbols and Abbreviated Terms does not occur immediately after Terms and Definitions" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   #{VALIDATING_BLANK_HDR}
 
   .Foreword
@@ -778,11 +1016,39 @@ it "Warning if Symbols and Abbreviated Terms does not occur immediately after Te
 
   INPUT
     expect(File.read("test.err")).to include "Only annexes and references can follow clauses"
+
+  FileUtils.rm_f "test.err"
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  = Document title
+  Author
+  :docfile: test.adoc
+  :nodoc:
+  :no-isobib:
+  :doctype: amendment
+
+
+  .Foreword
+  Foreword
+
+  == Scope
+
+  [bibliography]
+  == Normative References
+
+  == Terms and Definitions
+
+  == Clause
+
+  == Symbols and Abbreviated Terms
+
+  INPUT
+    expect(File.read("test.err")).not_to include "Only annexes and references can follow clauses"
+
 end
 
 it "Warning if no normative references" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   #{VALIDATING_BLANK_HDR}
 
   .Foreword
@@ -805,11 +1071,42 @@ it "Warning if no normative references" do
 
   INPUT
     expect(File.read("test.err")).to include "Document must include (references) Normative References"
+
+  FileUtils.rm_f "test.err"
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  = Document title
+  Author
+  :docfile: test.adoc
+  :nodoc:
+  :no-isobib:
+  :doctype: amendment
+
+  .Foreword
+  Foreword
+
+  == Scope
+
+  == Terms and Definitions
+
+  == Clause
+
+  [appendix]
+  == Appendix A
+
+  [appendix]
+  == Appendix B
+
+  [appendix]
+  == Appendix C
+
+  INPUT
+    expect(File.read("test.err")).not_to include "Document must include (references) Normative References"
+
 end
 
 it "Warning if final section is not named Bibliography" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   #{VALIDATING_BLANK_HDR}
 
   .Foreword
@@ -838,11 +1135,48 @@ it "Warning if final section is not named Bibliography" do
 
   INPUT
     expect(File.read("test.err")).to include "There are sections after the final Bibliography"
+
+    FileUtils.rm_f "test.err"
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  = Document title
+  Author
+  :docfile: test.adoc
+  :nodoc:
+  :no-isobib:
+  :doctype: amendment
+
+  .Foreword
+  Foreword
+
+  == Scope
+
+  [bibliography]
+  == Normative References
+
+  == Terms and Definitions
+
+  == Clause
+
+  [appendix]
+  == Appendix A
+
+  [appendix]
+  == Appendix B
+
+  [bibliography]
+  == Bibliography
+
+  [bibliography]
+  == Appendix C
+
+  INPUT
+    expect(File.read("test.err")).not_to include "There are sections after the final Bibliography"
+
 end
 
 it "Warning if final section is not styled Bibliography" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   #{VALIDATING_BLANK_HDR}
 
   .Foreword
@@ -867,11 +1201,45 @@ it "Warning if final section is not styled Bibliography" do
 
   INPUT
     expect(File.read("test.err")).to include "Section not marked up as [bibliography]"
+
+
+  FileUtils.rm_f "test.err"
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  = Document title
+  Author
+  :docfile: test.adoc
+  :nodoc:
+  :no-isobib:
+  :doctype: amendment
+
+  .Foreword
+  Foreword
+
+  == Scope
+
+  [bibliography]
+  == Normative References
+
+  == Terms and Definitions
+
+  == Clause
+
+  [appendix]
+  == Appendix A
+
+  [appendix]
+  == Appendix B
+
+  == Bibliography
+
+  INPUT
+    expect(File.read("test.err")).not_to include "Section not marked up as [bibliography]"
+
 end
 
 it "Warning if English title intro and no French title intro" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   = Document title
   Author
   :docfile: test.adoc
@@ -885,7 +1253,7 @@ end
 
 it "Warning if French title intro and no English title intro" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   = Document title
   Author
   :docfile: test.adoc
@@ -900,7 +1268,7 @@ end
 
 it "Warning if English title and no French intro" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   = Document title
   Author
   :docfile: test.adoc
@@ -914,7 +1282,7 @@ end
 
 it "Warning if French title and no English title" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   = Document title
   Author
   :docfile: test.adoc
@@ -928,7 +1296,7 @@ end
 
 it "Warning if English title part and no French title part" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   = Document title
   Author
   :docfile: test.adoc
@@ -942,7 +1310,7 @@ end
 
 it "Warning if French title part and no English title part" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   = Document title
   Author
   :docfile: test.adoc
@@ -956,7 +1324,7 @@ end
 
 it "Warning if non-IEC document with subpart" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   = Document title
   Author
   :docfile: test.adoc
@@ -972,14 +1340,14 @@ end
 
 it "No warning if joint IEC/non-IEC document with subpart" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   = Document title
   Author
   :docfile: test.adoc
   :nodoc:
   :docnumber: 10
   :partnumber: 1-1
-  :publisher: ISO,IEC
+  :publisher: ISO;IEC
   :no-isobib:
 
   INPUT
@@ -988,7 +1356,7 @@ end
 
 it "Warning if main title contains document type" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   = Document title
   Author
   :docfile: test.adoc
@@ -1002,7 +1370,7 @@ end
 
 it "Warning if intro title contains document type" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   = Document title
   Author
   :docfile: test.adoc
@@ -1016,7 +1384,7 @@ end
 
 it "Each first-level subclause must have a title" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   #{VALIDATING_BLANK_HDR}
   == Clause
 
@@ -1027,7 +1395,7 @@ end
 
 it "All subclauses must have a title, or none" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   #{VALIDATING_BLANK_HDR}
   == Clause
 
@@ -1042,7 +1410,7 @@ end
 
 it "Warning if subclause is only child of its parent, or none" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   #{VALIDATING_BLANK_HDR}
   == Clause
 
@@ -1054,7 +1422,7 @@ end
 
 it "Warning if invalid technical committee type" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   = Document title
   Author
   :docfile: test.adoc
@@ -1068,7 +1436,7 @@ end
 
 it "Warning if invalid subcommittee type" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   = Document title
   Author
   :docfile: test.adoc
@@ -1082,7 +1450,7 @@ end
 
 it "Warning if invalid subcommittee type" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   = Document title
   Author
   :docfile: test.adoc
@@ -1096,7 +1464,7 @@ end
 
 it "Warning if 'see' crossreference points to normative section" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   #{VALIDATING_BLANK_HDR}
   [[terms]]
   == Terms and Definitions
@@ -1109,7 +1477,7 @@ end
 
 it "Warning if 'see' reference points to normative reference" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   #{VALIDATING_BLANK_HDR}
   [bibliography]
   == Normative References
@@ -1123,7 +1491,7 @@ end
 
 it "Warning if term definition starts with article" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   #{VALIDATING_BLANK_HDR}
   == Terms and Definitions
 
@@ -1136,7 +1504,7 @@ end
 
 it "Warning if term definition ends with period" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   #{VALIDATING_BLANK_HDR}
   == Terms and Definitions
 
@@ -1149,7 +1517,7 @@ end
 
 it "validates document against ISO XML schema" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   #{VALIDATING_BLANK_HDR}
 
   [align=mid-air]
@@ -1160,7 +1528,7 @@ end
 
 it "Warn if more than 7 levels of subclause" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   = Document title
   Author
   :docfile: test.adoc
@@ -1193,7 +1561,7 @@ end
 
 it "Do not warn if not more than 7 levels of subclause" do
     FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   = Document title
   Author
   :docfile: test.adoc
@@ -1223,7 +1591,7 @@ end
 
 it "Warn if term citation in Terms & Definitions not preceded with italicised term" do
     FileUtils.rm_f "test.err"
-    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   #{VALIDATING_BLANK_HDR}
   == Terms and Definitions
 
@@ -1237,7 +1605,7 @@ end
 
 it "Warn if an undated reference has no associated footnote" do
     FileUtils.rm_f "test.err"
-    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
   #{VALIDATING_BLANK_HDR}
 
   [bibliography]