metanorma-standoc 1.9.2 → 1.9.3

data/spec/asciidoctor/section_spec.rb

@@ -198,7 +198,7 @@ RSpec.describe Asciidoctor::Standoc do
       </indexsect>
       </standard-document>
     OUTPUT
-    expect(xmlpp(strip_guid(Asciidoctor.convert(input, backend: :standoc, header_footer: true))))
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
       .to be_equivalent_to xmlpp(output)
   end
 
@@ -339,7 +339,7 @@ RSpec.describe Asciidoctor::Standoc do
            </bibliography>
          </standard-document>
     OUTPUT
-    expect(xmlpp(strip_guid(Asciidoctor.convert(input, backend: :standoc, header_footer: true))))
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
       .to be_equivalent_to xmlpp(output)
   end
 
@@ -544,7 +544,7 @@ RSpec.describe Asciidoctor::Standoc do
              </clause></bibliography>
              </standard-document>
     OUTPUT
-    expect(xmlpp(strip_guid(Asciidoctor.convert(input, backend: :standoc, header_footer: true))))
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
       .to be_equivalent_to xmlpp(output)
   end
 
@@ -682,7 +682,7 @@ RSpec.describe Asciidoctor::Standoc do
         </bibliography>
       </standard-document>
     OUTPUT
-    expect(xmlpp(strip_guid(Asciidoctor.convert(input, backend: :standoc, header_footer: true))))
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
       .to be_equivalent_to xmlpp(output)
   end
 
@@ -698,8 +698,8 @@ RSpec.describe Asciidoctor::Standoc do
 
     INPUT
     output = <<~OUTPUT
-             #{BLANK_HDR}
-              <sections>
+      #{BLANK_HDR}
+      <sections>
           <terms id='_' obligation='normative'>
             <title>Terms, definitions and symbols</title>
             <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
@@ -713,7 +713,7 @@ RSpec.describe Asciidoctor::Standoc do
         </sections>
       </standard-document>
     OUTPUT
-    expect(xmlpp(strip_guid(Asciidoctor.convert(input, backend: :standoc, header_footer: true))))
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
       .to be_equivalent_to xmlpp(output)
   end
 
@@ -745,7 +745,43 @@ RSpec.describe Asciidoctor::Standoc do
         </sections>
       </standard-document>
     OUTPUT
-    expect(xmlpp(strip_guid(Asciidoctor.convert(input, backend: :standoc, header_footer: true))))
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
+  end
+
+  it "varies terms symbols & abbreviated terms title" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+      [heading="terms, definitions, symbols and abbreviated terms"]
+      == Terms, Definitions, Abbreviated Terms Section
+
+      === Term
+
+      === Abbreviated Terms
+
+      === Symbols
+
+    INPUT
+    output = <<~OUTPUT
+      #{BLANK_HDR}
+        <sections>
+          <terms id='_' obligation='normative'>
+            <title>Terms, definitions, symbols and abbreviated terms</title>
+            <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
+            <term id='term-term'>
+              <preferred>Term</preferred>
+            </term>
+            <definitions id='_' type='abbreviated_terms' obligation='normative'>
+                <title>Abbreviated terms</title>
+                </definitions>
+                <definitions id='_' type='symbols' obligation='normative'>
+                <title>Symbols</title>
+                </definitions>
+          </terms>
+        </sections>
+      </standard-document>
+    OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
       .to be_equivalent_to xmlpp(output)
   end
 
@@ -779,7 +815,7 @@ RSpec.describe Asciidoctor::Standoc do
       </annex>
       </standard-document>
     OUTPUT
-    expect(xmlpp(strip_guid(Asciidoctor.convert(input, backend: :standoc, header_footer: true))))
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
       .to be_equivalent_to xmlpp(output)
   end
 
@@ -813,7 +849,7 @@ RSpec.describe Asciidoctor::Standoc do
       </annex>
       </standard-document>
     OUTPUT
-    expect(xmlpp(strip_guid(Asciidoctor.convert(input, backend: :standoc, header_footer: true))))
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
       .to be_equivalent_to xmlpp(output)
   end
 
@@ -836,7 +872,7 @@ RSpec.describe Asciidoctor::Standoc do
       </sections>
       </standard-document>
     OUTPUT
-    expect(xmlpp(strip_guid(Asciidoctor.convert(input, backend: :standoc, header_footer: true))))
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
       .to be_equivalent_to xmlpp(output)
   end
 
@@ -867,7 +903,7 @@ RSpec.describe Asciidoctor::Standoc do
       </sections>
              </standard-document>
     OUTPUT
-    expect(xmlpp(strip_guid(Asciidoctor.convert(input, backend: :standoc, header_footer: true))))
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
       .to be_equivalent_to xmlpp(output)
   end
 
@@ -899,7 +935,7 @@ RSpec.describe Asciidoctor::Standoc do
              </terms></sections>
              </standard-document>
     OUTPUT
-    expect(xmlpp(strip_guid(Asciidoctor.convert(input, backend: :standoc, header_footer: true))))
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
       .to be_equivalent_to xmlpp(output)
   end
 
@@ -925,7 +961,7 @@ RSpec.describe Asciidoctor::Standoc do
       </standard-document>
 
     OUTPUT
-    expect(xmlpp(strip_guid(Asciidoctor.convert(input, backend: :standoc, header_footer: true))))
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
       .to be_equivalent_to xmlpp(output)
   end
 
@@ -953,7 +989,7 @@ RSpec.describe Asciidoctor::Standoc do
       </terms></sections>
       </standard-document>
     OUTPUT
-    expect(xmlpp(strip_guid(Asciidoctor.convert(input, backend: :standoc, header_footer: true))))
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
       .to be_equivalent_to xmlpp(output)
   end
 
@@ -986,7 +1022,7 @@ RSpec.describe Asciidoctor::Standoc do
         </terms></sections>
         </standard-document>
     OUTPUT
-    expect(xmlpp(strip_guid(Asciidoctor.convert(input, backend: :standoc, header_footer: true))))
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
       .to be_equivalent_to xmlpp(output)
   end
 
@@ -1018,7 +1054,7 @@ RSpec.describe Asciidoctor::Standoc do
         </terms></sections>
         </standard-document>
     OUTPUT
-    expect(xmlpp(strip_guid(Asciidoctor.convert(input, backend: :standoc, header_footer: true))))
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
       .to be_equivalent_to xmlpp(output)
   end
 
@@ -1030,7 +1066,7 @@ RSpec.describe Asciidoctor::Standoc do
       == Terms and Definitions
       === Term2
     INPUT
-    expect { Asciidoctor.convert(input, backend: :standoc, header_footer: true) }
+    expect { Asciidoctor.convert(input, *OPTIONS) }
       .to output(/not referenced/).to_stderr
   end
 
@@ -1062,7 +1098,7 @@ RSpec.describe Asciidoctor::Standoc do
         </sections>
       </standard-document>
     OUTPUT
-    expect(xmlpp(strip_guid(Asciidoctor.convert(input, backend: :standoc, header_footer: true))))
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
       .to be_equivalent_to xmlpp(output)
   end
 
@@ -1124,7 +1160,7 @@ RSpec.describe Asciidoctor::Standoc do
        </sections>
       </standard-document>
     OUTPUT
-    expect(xmlpp(strip_guid(Asciidoctor.convert(input, backend: :standoc, header_footer: true))))
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
       .to be_equivalent_to xmlpp(output)
   end
 
@@ -1171,7 +1207,7 @@ RSpec.describe Asciidoctor::Standoc do
         </annex>
       </standard-document>
     OUTPUT
-    expect(xmlpp(strip_guid(Asciidoctor.convert(input, backend: :standoc, header_footer: true))))
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
       .to be_equivalent_to xmlpp(output)
   end
 
@@ -1190,7 +1226,7 @@ RSpec.describe Asciidoctor::Standoc do
       </sections>
       </standard-document>
     OUTPUT
-    expect(xmlpp(strip_guid(Asciidoctor.convert(input, backend: :standoc, header_footer: true))))
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
       .to be_equivalent_to xmlpp(output)
   end
 

data/spec/asciidoctor/table_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 RSpec.describe Asciidoctor::Standoc do
   it "processes basic tables" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", *OPTIONS)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       .Table Name
       |===
@@ -36,7 +36,7 @@ RSpec.describe Asciidoctor::Standoc do
   end
 
   it "processes table widths" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", *OPTIONS)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     #{ASCIIDOC_BLANK_HDR}
     [width=75%]
     |===
@@ -96,7 +96,7 @@ RSpec.describe Asciidoctor::Standoc do
   end
 
   it "processes column widths in tables" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", *OPTIONS)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       [cols=".<,.^,^.>"]
       |===
@@ -182,7 +182,7 @@ RSpec.describe Asciidoctor::Standoc do
 
 
   it "inserts header rows in a table with a name and no header" do
-        expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+        expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", *OPTIONS)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       [headerrows=2]
       .Table Name
@@ -222,7 +222,7 @@ RSpec.describe Asciidoctor::Standoc do
 
 
   it "inserts header rows in a table without a name and no header" do
-        expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+        expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", *OPTIONS)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       [headerrows=2]
       |===
@@ -258,7 +258,7 @@ RSpec.describe Asciidoctor::Standoc do
   end
 
   it "processes complex tables" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", *OPTIONS)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       [cols="<.^,^.<,^.>,^,^",options="header,footer",headerrows=2,alt="An extensive summary, and illustration, of tables",subsequence="A",options="unnumbered",summary="This is an extremely long, convoluted summary",width=70%,number="3",keep-with-next=true,keep-lines-together=true]
       .Maximum _permissible_ mass fraction of defects

data/spec/asciidoctor/validate_spec.rb

@@ -13,7 +13,7 @@ RSpec.describe Asciidoctor::Standoc do
   FileUtils.rm_f "test.xml"
   FileUtils.rm_f "test.err"
   begin
-  expect { Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true) }.to raise_error(SystemExit)
+  expect { Asciidoctor.convert(<<~"INPUT", *OPTIONS) }.to raise_error(SystemExit)
   = Document title
   Author
   :docfile: test.adoc
@@ -33,7 +33,7 @@ end
 
   it "warns about missing fields in asciibib" do
   FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true) 
+  Asciidoctor.convert(<<~"INPUT", *OPTIONS) 
       #{VALIDATING_BLANK_HDR}
   
       [bibliography]
@@ -70,7 +70,7 @@ end
 
     it "warns about missing fields in asciibib" do
   FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", *OPTIONS)
       #{VALIDATING_BLANK_HDR}
       
       [bibliography]
@@ -86,7 +86,7 @@ end
 INPUT
   errf = File.read("test.err")
   expect(errf).to include "The following reference is missing an anchor"
-  Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", *OPTIONS)
       #{VALIDATING_BLANK_HDR}
 
       [bibliography]
@@ -108,7 +108,7 @@ INPUT
 =begin
   it "warns about malformed LaTeX" do
   FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true) 
+  Asciidoctor.convert(<<~"INPUT", *OPTIONS) 
   #{VALIDATING_BLANK_HDR}
 
   == Clause 1
@@ -126,7 +126,7 @@ INPUT
 =begin
   it "warns about reparsing LaTeX" do
     FileUtils.rm_f "test.err"
-    expect { Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true) }.to output(/Retrying/).to_stderr
+    expect { Asciidoctor.convert(<<~"INPUT", *OPTIONS) }.to output(/Retrying/).to_stderr
   #{VALIDATING_BLANK_HDR}
 
   == Clause 1
@@ -146,7 +146,7 @@ INPUT
 
   it "warns about hanging paragraphs" do
   FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true) 
+  Asciidoctor.convert(<<~"INPUT", *OPTIONS) 
   #{VALIDATING_BLANK_HDR}
 
   == Clause 1
@@ -162,7 +162,7 @@ INPUT
 
   it "warns that video is a skipped node" do
   FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true) 
+  Asciidoctor.convert(<<~"INPUT", *OPTIONS) 
   #{VALIDATING_BLANK_HDR}
 
   video::video_file.mp4[]
@@ -172,7 +172,7 @@ INPUT
 
 it "warns that figure does not have title" do
   FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true) 
+  Asciidoctor.convert(<<~"INPUT", *OPTIONS) 
   #{VALIDATING_BLANK_HDR}
 
   image::spec/examples/rice_images/rice_image1.png[]
@@ -182,7 +182,7 @@ end
 
 it "warns that callouts do not match annotations" do
   FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", *OPTIONS)
       #{VALIDATING_BLANK_HDR}
       [source,ruby]
       --
@@ -199,7 +199,7 @@ end
 
 it "warns that term source is not a real reference" do
   FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true) 
+  Asciidoctor.convert(<<~"INPUT", *OPTIONS) 
   #{VALIDATING_BLANK_HDR}
 
   [.source]
@@ -210,7 +210,7 @@ end
 
 it "warns of Non-reference in bibliography" do
   FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true) 
+  Asciidoctor.convert(<<~"INPUT", *OPTIONS) 
   #{VALIDATING_BLANK_HDR}
 
   == Normative References
@@ -221,7 +221,7 @@ end
 
 it "warns that Table should have title" do
   FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true) 
+  Asciidoctor.convert(<<~"INPUT", *OPTIONS) 
   #{VALIDATING_BLANK_HDR}     
 
   |===
@@ -233,7 +233,7 @@ end
 
 it "validates document against ISO XML schema" do
   FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true) 
+  Asciidoctor.convert(<<~"INPUT", *OPTIONS) 
   #{VALIDATING_BLANK_HDR}
 
   [align=mid-air]
@@ -247,7 +247,7 @@ it "Warning if terms mismatches IEV" do
   FileUtils.mv File.expand_path("~/.iev/cache"), File.expand_path("~/.iev.pstore1"), force: true
   FileUtils.rm_f "test_iev/pstore"
   mock_open_uri('103-01-02')
-  Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true) 
+  Asciidoctor.convert(<<~"INPUT", *OPTIONS) 
   = Document title
   Author
   :docfile: test.adoc
@@ -271,7 +271,7 @@ it "No warning if English term matches IEV" do
   FileUtils.mv File.expand_path("~/.iev/cache"), File.expand_path("~/.iev.pstore1"), force: true
   FileUtils.rm_f "test_iev/cache"
   mock_open_uri('103-01-02')
-  Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true) 
+  Asciidoctor.convert(<<~"INPUT", *OPTIONS) 
   = Document title
   Author
   :docfile: test.adoc
@@ -295,7 +295,7 @@ it "No warning if French term matches IEV" do
   FileUtils.mv File.expand_path("~/.iev/cache"), File.expand_path("~/.iev.pstore1"), force: true
   FileUtils.rm_f "test_iev/cache"
   mock_open_uri('103-01-02')
-  Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true) 
+  Asciidoctor.convert(<<~"INPUT", *OPTIONS) 
   = Document title
   Author
   :docfile: test.adoc
@@ -330,7 +330,7 @@ it "warns and aborts if id used twice" do
   FileUtils.rm_f "test.xml"
   FileUtils.rm_f "test.err"
   begin
-  expect { Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true) }.to raise_error(SystemExit) 
+  expect { Asciidoctor.convert(<<~"INPUT", *OPTIONS) }.to raise_error(SystemExit) 
   = Document title
   Author
   :docfile: test.adoc
@@ -352,7 +352,7 @@ it "warns and aborts if numeric normative reference" do
   FileUtils.rm_f "test.xml"
   FileUtils.rm_f "test.err"
   begin
-  expect { Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true) }.to raise_error(SystemExit)
+  expect { Asciidoctor.convert(<<~"INPUT", *OPTIONS) }.to raise_error(SystemExit)
   = Document title
   Author
   :docfile: test.adoc
@@ -371,7 +371,7 @@ end
 it "err file succesfully created for docfile path" do
   FileUtils.rm_rf "test"
   FileUtils.mkdir_p "test"
-  Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", *OPTIONS)
   = Document title
   Author
   :docfile: test#{File::ALT_SEPARATOR || File::SEPARATOR}test.adoc
@@ -391,7 +391,7 @@ end
 
 it "Warning if no block for footnoteblock" do
   FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)
+  Asciidoctor.convert(<<~"INPUT", *OPTIONS)
   = Document title
   Author
   :docfile: test.adoc

data/spec/spec_helper.rb

@@ -48,6 +48,8 @@ RSpec.configure do |config|
   end
 end
 
+OPTIONS = [backend: :standoc, header_footer: true, agree_to_terms: true].freeze
+
 def strip_guid(xml)
   xml.gsub(%r{ id="_[^"]+"}, ' id="_"')
     .gsub(%r{ target="_[^"]+"}, ' target="_"')