metanorma-iso 1.5.14 → 1.7.2

data/lib/isodoc/iso/sections.rb

@@ -1,7 +1,7 @@
 module IsoDoc
   module Iso
     module BaseConvert
-      def middle_title(out)
+      def middle_title(isoxml, out)
         middle_title_main(out)
         middle_title_amd(out)
       end

data/lib/isodoc/iso/word_convert.rb

@@ -16,9 +16,9 @@ module IsoDoc
 
       def default_fonts(options)
         {
-          bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' :
+          bodyfont: (options[:script] == "Hans" ? '"Source Han Sans",serif' :
                      '"Cambria",serif'),
-                     headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' :
+                     headerfont: (options[:script] == "Hans" ? '"Source Han Sans",sans-serif' :
                                   '"Cambria",serif'),
                                   monospacefont: '"Courier New",monospace',
                                   normalfontsize: "11.0pt",

data/lib/isodoc/iso/xref.rb

@@ -1,10 +1,14 @@
 module IsoDoc
   module Iso
+    class Counter < IsoDoc::XrefGen::Counter
+    end
+
     class Xref < IsoDoc::Xref
       def initial_anchor_names(d)
         if @klass.amd(d)
           d.xpath(ns("//preface/*")).each { |c| c.element? and preface_names(c) }
           sequential_asset_names(d.xpath(ns("//preface/*")))
+          d.xpath(ns("//sections/clause")).each { |c| c.element? and preface_names(c) }
           middle_section_asset_names(d)
           termnote_anchor_names(d)
           termexample_anchor_names(d)
@@ -19,8 +23,10 @@ module IsoDoc
         return if clause.nil?
         clause.at(ns("./clause")) and @anchors[clause["id"]] = 
           { label: "0", level: 1, xref: clause.at(ns("./title"))&.text, type: "clause" }
-        clause.xpath(ns("./clause")).each_with_index do |c, i|
-          section_names1(c, "0.#{i + 1}", 2)
+        i = Counter.new
+        clause.xpath(ns("./clause")).each do |c|
+          i.increment(c)
+          section_names1(c, "0.#{i.print}", 2)
         end
       end
 
@@ -30,12 +36,16 @@ module IsoDoc
       end
 
       def appendix_names(clause, num)
-        clause.xpath(ns("./appendix")).each_with_index do |c, i|
-          @anchors[c["id"]] = anchor_struct(i + 1, nil, @labels["appendix"], "clause")
+        i = Counter.new
+        clause.xpath(ns("./appendix")).each do |c|
+          i.increment(c)
+          @anchors[c["id"]] = anchor_struct(i.print, nil, @labels["appendix"], "clause")
           @anchors[c["id"]][:level] = 2
           @anchors[c["id"]][:container] = clause["id"]
-          c.xpath(ns("./clause | ./references")).each_with_index do |c, j|
-            appendix_names1(c, l10n("#{@labels["appendix"]} #{i + 1}.#{j + 1}"), 3, clause["id"])
+          j = Counter.new
+          c.xpath(ns("./clause | ./references")).each do |c1|
+            j.increment(c1)
+            appendix_names1(c1, l10n("#{@labels["appendix"]} #{i.print}.#{j.print}"), 3, clause["id"])
           end
         end
       end
@@ -44,24 +54,30 @@ module IsoDoc
         @anchors[clause["id"]] =
           { label: num, level: level, xref: num }
         # subclauses are not prefixed with "Clause"
+        i = Counter.new
         clause.xpath(ns("./clause | ./terms | ./term | ./definitions | "\
                         "./references")).
-                       each_with_index do |c, i|
-          section_names1(c, "#{num}.#{i + 1}", level + 1)
+                       each do |c|
+          i.increment(c)
+          section_names1(c, "#{num}.#{i.print}", level + 1)
         end
       end
 
       def annex_names1(clause, num, level)
         @anchors[clause["id"]] = { label: num, xref: num, level: level }
-        clause.xpath(ns("./clause | ./references")).each_with_index do |c, i|
-          annex_names1(c, "#{num}.#{i + 1}", level + 1)
+        i = Counter.new
+        clause.xpath(ns("./clause | ./references")).each do |c|
+          i.increment(c)
+          annex_names1(c, "#{num}.#{i.print}", level + 1)
         end
       end
 
       def appendix_names1(clause, num, level, container)
         @anchors[clause["id"]] = { label: num, xref: num, level: level, container: container }
-        clause.xpath(ns("./clause | ./references")).each_with_index do |c, i|
-          appendix_names1(c, "#{num}.#{i + 1}", level + 1, container)
+        i = Counter.new
+        clause.xpath(ns("./clause | ./references")).each do |c|
+          i.increment(c)
+          appendix_names1(c, "#{num}.#{i.print}", level + 1, container)
         end
       end
 

data/lib/metanorma/iso/processor.rb

@@ -25,6 +25,17 @@ module Metanorma
         "Metanorma::ISO #{Metanorma::ISO::VERSION}"
       end
 
+      def fonts_manifest
+        {
+          "Cambria" => nil,
+          "Cambria Math" => nil,
+          "Times New Roman" => nil,
+          "Source Han Sans" => nil,
+          "Courier" => nil,
+          "Courier New" => nil,
+        }
+      end
+
       def use_presentation_xml(ext)
         return true if ext == :html_alt
         super

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "1.5.14".freeze
+    VERSION = "1.7.2".freeze
   end
 end

data/metanorma-iso.gemspec

@@ -30,8 +30,8 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
   spec.add_dependency "ruby-jing"
-  spec.add_dependency "isodoc", "~> 1.3.0"
-  spec.add_dependency "metanorma-standoc", "~> 1.6.0"
+  spec.add_dependency "isodoc", "~> 1.5.0"
+  spec.add_dependency "metanorma-standoc", "~> 1.8.0"
   spec.add_dependency "tokenizer", "~> 0.3.0"
   spec.add_dependency "twitter_cldr"
   spec.add_dependency "mn2sts", "~> 1.5.0"

data/spec/asciidoctor-iso/amd_spec.rb

@@ -1,9 +1,8 @@
 require "spec_helper"
-require "fileutils"
 
 RSpec.describe Asciidoctor::ISO do
-    it "processes amendment sections" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+  it "processes amendment sections" do
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", *OPTIONS)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{AMD_BLANK_HDR}
       == Foreword
 
@@ -55,84 +54,83 @@ RSpec.describe Asciidoctor::ISO do
 
       === Bibliography Subsection
     INPUT
-    #{BLANK_HDR.sub(%r{<doctype>article</doctype>}, "<doctype>amendment</doctype>")}
-  <sections>
-    <clause id='_' obligation='normative'>
-      <title>Foreword</title>
-      <p id='_'>Text</p>
-    </clause>
-    <clause id='_' obligation='normative'>
-      <title>Introduction</title>
-      <clause id='_' obligation='normative'>
-        <title>Introduction Subsection</title>
-      </clause>
-    </clause>
-    <clause id='_' obligation='normative'>
-      <title>Scope</title>
-      <p id='_'>Text</p>
-    </clause>
-    <clause id='_' obligation='normative'>
-      <title>Acknowledgements</title>
-    </clause>
-    <clause id='_' obligation='normative'>
-      <title>Normative References</title>
-    </clause>
-    <clause id='_' obligation='normative'>
-      <title>Terms and Definitions</title>
-      <clause id='_' obligation='normative'>
-        <title>Term1</title>
-      </clause>
-    </clause>
-    <clause id='_' obligation='normative'>
-      <title>Terms, Definitions, Symbols and Abbreviated Terms</title>
-      <clause id='_' obligation='normative'>
-        <title>Normal Terms</title>
-        <clause id='_' obligation='normative'>
-          <title>Term2</title>
-        </clause>
-      </clause>
-      <clause id='_' obligation='normative'>
-        <title>Symbols and Abbreviated Terms</title>
-      </clause>
-    </clause>
-    <clause id='_' obligation='normative'>
-      <title>Symbols and Abbreviated Terms</title>
-    </clause>
-    <clause id='_' obligation='normative'>
-      <title>Clause 4</title>
-      <clause id='_' obligation='normative'>
-        <title>Introduction</title>
-      </clause>
-      <clause id='_' obligation='normative'>
-        <title>Clause 4.2</title>
-      </clause>
-    </clause>
-    <clause id='_' obligation='normative'>
-      <title>Terms and Definitions</title>
-    </clause>
-    <clause id='_' obligation='normative'>
-      <title>Bibliography</title>
-      <clause id='_' obligation='normative'>
-        <title>Bibliography Subsection</title>
-      </clause>
-    </clause>
-  </sections>
-  <annex id='_' obligation='normative'>
-    <title>Annex</title>
-    <clause id='_' obligation='normative'>
-      <title>Annex A.1</title>
-    </clause>
-    <appendix id='_' obligation='normative'>
-      <title>Appendix 1</title>
-    </appendix>
-  </annex>
-</iso-standard>
-
-OUTPUT
-    end
+      #{BLANK_HDR.sub(%r{<doctype>article</doctype>}, '<doctype>amendment</doctype>')}
+        <sections>
+          <clause id="_" obligation="normative">
+            <title>Foreword</title>
+            <p id="_">Text</p>
+          </clause>
+          <clause id="_" obligation="normative">
+            <title>Introduction</title>
+            <clause id="_" obligation="normative">
+              <title>Introduction Subsection</title>
+            </clause>
+          </clause>
+          <clause id="_" obligation="normative">
+            <title>Scope</title>
+            <p id="_">Text</p>
+          </clause>
+          <clause id="_" obligation="normative">
+            <title>Acknowledgements</title>
+          </clause>
+          <clause id="_" obligation="normative">
+            <title>Normative References</title>
+          </clause>
+          <clause id="_" obligation="normative">
+            <title>Terms and Definitions</title>
+            <clause id="_" obligation="normative">
+              <title>Term1</title>
+            </clause>
+          </clause>
+          <clause id="_" obligation="normative">
+            <title>Terms, Definitions, Symbols and Abbreviated Terms</title>
+            <clause id="_" obligation="normative">
+              <title>Normal Terms</title>
+              <clause id="_" obligation="normative">
+                <title>Term2</title>
+              </clause>
+            </clause>
+            <clause id="_" obligation="normative">
+              <title>Symbols and Abbreviated Terms</title>
+            </clause>
+          </clause>
+          <clause id="_" obligation="normative">
+            <title>Symbols and Abbreviated Terms</title>
+          </clause>
+          <clause id="_" obligation="normative">
+            <title>Clause 4</title>
+            <clause id="_" obligation="normative">
+              <title>Introduction</title>
+            </clause>
+            <clause id="_" obligation="normative">
+              <title>Clause 4.2</title>
+            </clause>
+          </clause>
+          <clause id="_" obligation="normative">
+            <title>Terms and Definitions</title>
+          </clause>
+          <clause id="_" obligation="normative">
+            <title>Bibliography</title>
+            <clause id="_" obligation="normative">
+              <title>Bibliography Subsection</title>
+            </clause>
+          </clause>
+        </sections>
+        <annex id='_' obligation='normative'>
+          <title>Annex</title>
+          <clause id='_' obligation='normative'>
+            <title>Annex A.1</title>
+          </clause>
+          <appendix id='_' obligation='normative'>
+            <title>Appendix 1</title>
+          </appendix>
+        </annex>
+      </iso-standard>
+    OUTPUT
+  end
 
   it "processes default metadata, amendment" do
-    expect(xmlpp(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true).sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    output = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
       = Document title
       Author
       :docfile: test.adoc
@@ -183,512 +181,516 @@ OUTPUT
       :doctype: amendment
       :updates-document-type: international-standard
     INPUT
-    <iso-standard xmlns='https://www.metanorma.org/ns/iso'  type="semantic" version="#{Metanorma::ISO::VERSION}">
-  <bibdata type='standard'>
-    <title language='en' format='text/plain' type='main'>Introduction — Main Title — Title — Title Part — Mass fraction of
-       extraneous matter, milled rice (nonglutinous), sample dividers and
-       recommendations relating to storage and transport conditions</title>
-    <title language='en' format='text/plain' type='title-intro'>Introduction</title>
-    <title language='en' format='text/plain' type='title-main'>Main Title — Title</title>
-    <title language='en' format='text/plain' type='title-part'>Title Part</title>
-    <title language='en' format='text/plain' type='title-amd'>
-  Mass fraction of extraneous matter, milled rice (nonglutinous), sample
-  dividers and recommendations relating to storage and transport conditions
-</title>
-<title language='fr' format='text/plain' type='main'>
-  Introduction Française — Titre Principal — Part du Titre — Fraction
-  massique de matière étrangère, riz usiné (non gluant), diviseurs
-  d’échantillon et recommandations relatives aux conditions d’entreposage et
-  de transport
-</title>
-    <title language='fr' format='text/plain' type='title-intro'>Introduction Française</title>
-    <title language='fr' format='text/plain' type='title-main'>Titre Principal</title>
-    <title language='fr' format='text/plain' type='title-part'>Part du Titre</title>
-    <title language='fr' format='text/plain' type='title-amd'>
-  Fraction massique de matière étrangère, riz usiné (non gluant), diviseurs
-  d’échantillon et recommandations relatives aux conditions d’entreposage et
-  de transport
-</title>
-    <docidentifier type='ISO'>ISO 17301-1:2016/PreNP Amd 1</docidentifier>
-    <docidentifier type='iso-with-lang'>ISO 17301-1:2016/PreNP Amd 1(E)</docidentifier>
-    <docidentifier type='iso-reference'>ISO 17301-1:2016/PreNP Amd 1:2017(E)</docidentifier>
-    <docnumber>17301</docnumber>
-    <date type='created'>
-      <on>2016-05-01</on>
-    </date>
-    <contributor>
-      <role type='author'/>
-      <organization>
-        <name>International Organization for Standardization</name>
-        <abbreviation>ISO</abbreviation>
-      </organization>
-    </contributor>
-    <contributor>
-      <role type='publisher'/>
-      <organization>
-        <name>International Organization for Standardization</name>
-        <abbreviation>ISO</abbreviation>
-      </organization>
-    </contributor>
-    <edition>2</edition>
-    <version>
-      <revision-date>2000-01-01</revision-date>
-      <draft>0.3.4</draft>
-    </version>
-    <language>en</language>
-    <script>Latn</script>
-    <status>
-      <stage abbreviation='NP'>10</stage>
-      <substage>20</substage>
-      <iteration>3</iteration>
-    </status>
-    <copyright>
-      <from>2017</from>
-      <owner>
-        <organization>
-          <name>International Organization for Standardization</name>
-          <abbreviation>ISO</abbreviation>
-        </organization>
-      </owner>
-    </copyright>
-    <ext>
-      <doctype>amendment</doctype>
-      <editorialgroup>
-        <technical-committee number='1' type='A'>TC</technical-committee>
-        <technical-committee number='11' type='A1'>TC1</technical-committee>
-        <subcommittee number='2' type='B'>SC</subcommittee>
-        <subcommittee number='21' type='B1'>SC1</subcommittee>
-        <workgroup number='3' type='C'>WG</workgroup>
-        <workgroup number='31' type='C1'>WG1</workgroup>
-        <secretariat>SECRETARIAT</secretariat>
-      </editorialgroup>
-      <ics>
-        <code>1</code>
-      </ics>
-      <ics>
-        <code>2</code>
-      </ics>
-      <ics>
-        <code>3</code>
-      </ics>
-      <structuredidentifier>
-        <project-number part='1' amendment='1' origyr='2016-05-01'>17301</project-number>
-      </structuredidentifier>
-      <stagename>New work item proposal</stagename>
-      <updates-document-type>international-standard</updates-document-type>
-    </ext>
-  </bibdata>
-  <sections/>
-</iso-standard>
-OUTPUT
+
+    expect(xmlpp(output.sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+      <iso-standard type="semantic" version="#{Metanorma::ISO::VERSION}" xmlns="https://www.metanorma.org/ns/iso">
+        <bibdata type="standard">
+          <title format="text/plain" language="en" type="main">Introduction — Main Title — Title — Title Part — Mass fraction of
+             extraneous matter, milled rice (nonglutinous), sample dividers and
+             recommendations relating to storage and transport conditions</title>
+          <title format="text/plain" language="en" type="title-intro">Introduction</title>
+          <title format="text/plain" language="en" type="title-main">Main Title — Title</title>
+          <title format="text/plain" language="en" type="title-part">Title Part</title>
+          <title format="text/plain" language="en" type="title-amd">Mass fraction of extraneous matter, milled rice (nonglutinous), sample
+        dividers and recommendations relating to storage and transport conditions
+      </title>
+          <title format="text/plain" language="fr" type="main">Introduction Française — Titre Principal — Part du Titre — Fraction
+        massique de matière étrangère, riz usiné (non gluant), diviseurs
+        d’échantillon et recommandations relatives aux conditions d’entreposage et
+        de transport
+      </title>
+          <title format="text/plain" language="fr" type="title-intro">Introduction Française</title>
+          <title format="text/plain" language="fr" type="title-main">Titre Principal</title>
+          <title format="text/plain" language="fr" type="title-part">Part du Titre</title>
+          <title format="text/plain" language="fr" type="title-amd">Fraction massique de matière étrangère, riz usiné (non gluant), diviseurs
+        d’échantillon et recommandations relatives aux conditions d’entreposage et
+        de transport
+      </title>
+          <docidentifier type="ISO">ISO 17301-1:2016/PreNP Amd 1</docidentifier>
+          <docidentifier type="iso-with-lang">ISO 17301-1:2016/PreNP Amd 1(E)</docidentifier>
+          <docidentifier type="iso-reference">ISO 17301-1:2016/PreNP Amd 1:2017(E)</docidentifier>
+          <docnumber>17301</docnumber>
+          <date type="created">
+            <on>2016-05-01</on>
+          </date>
+          <contributor>
+            <role type="author"/>
+            <organization>
+              <name>International Organization for Standardization</name>
+              <abbreviation>ISO</abbreviation>
+            </organization>
+          </contributor>
+          <contributor>
+            <role type="publisher"/>
+            <organization>
+              <name>International Organization for Standardization</name>
+              <abbreviation>ISO</abbreviation>
+            </organization>
+          </contributor>
+          <edition>2</edition>
+          <version>
+            <revision-date>2000-01-01</revision-date>
+            <draft>0.3.4</draft>
+          </version>
+          <language>en</language>
+          <script>Latn</script>
+          <status>
+            <stage abbreviation="NP">10</stage>
+            <substage>20</substage>
+            <iteration>3</iteration>
+          </status>
+          <copyright>
+            <from>2017</from>
+            <owner>
+              <organization>
+                <name>International Organization for Standardization</name>
+                <abbreviation>ISO</abbreviation>
+              </organization>
+            </owner>
+          </copyright>
+          <ext>
+            <doctype>amendment</doctype>
+            <editorialgroup>
+              <technical-committee number="1" type="A">TC</technical-committee>
+              <technical-committee number="11" type="A1">TC1</technical-committee>
+              <subcommittee number="2" type="B">SC</subcommittee>
+              <subcommittee number="21" type="B1">SC1</subcommittee>
+              <workgroup number="3" type="C">WG</workgroup>
+              <workgroup number="31" type="C1">WG1</workgroup>
+              <secretariat>SECRETARIAT</secretariat>
+            </editorialgroup>
+            <ics>
+              <code>1</code>
+            </ics>
+            <ics>
+              <code>2</code>
+            </ics>
+            <ics>
+              <code>3</code>
+            </ics>
+            <structuredidentifier>
+              <project-number amendment="1" origyr="2016-05-01" part="1">17301</project-number>
+            </structuredidentifier>
+            <stagename>New work item proposal</stagename>
+            <updates-document-type>international-standard</updates-document-type>
+          </ext>
+        </bibdata>
+        <sections/>
+      </iso-standard>
+    OUTPUT
   end
 
-    it "processes metadata, amendment" do
-    expect(xmlpp(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true).sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-= Document title
-Author
-:docfile: test.adoc
-:nodoc:
-:novalid:
-:no-isobib:
-:docnumber: 17301
-:partnumber: 1
-:doctype: amendment
-:docstage: 30
-:updates: ISO 17301-1:2030
-:amendment-number: 1
-INPUT
- <iso-standard xmlns='https://www.metanorma.org/ns/iso'  type="semantic" version="#{Metanorma::ISO::VERSION}">
-   <bibdata type='standard'>
-     <docidentifier type='ISO'>ISO 17301-1:2030/CD Amd 1</docidentifier>
-     <docidentifier type='iso-with-lang'>ISO 17301-1:2030/CD Amd 1(E)</docidentifier>
-     <docidentifier type='iso-reference'>ISO 17301-1:2030/CD Amd 1(E)</docidentifier>
-     <docnumber>17301</docnumber>
-     <contributor>
-       <role type='author'/>
-       <organization>
-         <name>International Organization for Standardization</name>
-         <abbreviation>ISO</abbreviation>
-       </organization>
-     </contributor>
-     <contributor>
-       <role type='publisher'/>
-       <organization>
-         <name>International Organization for Standardization</name>
-         <abbreviation>ISO</abbreviation>
-       </organization>
-     </contributor>
-     <language>en</language>
-     <script>Latn</script>
-     <status>
-       <stage abbreviation='CD'>30</stage>
-       <substage>00</substage>
-     </status>
-     <copyright>
-       <from>2020</from>
-       <owner>
-         <organization>
-           <name>International Organization for Standardization</name>
-           <abbreviation>ISO</abbreviation>
-         </organization>
-       </owner>
-     </copyright>
-     <ext>
-       <doctype>amendment</doctype>
-       <editorialgroup>
-         <technical-committee/>
-         <subcommittee/>
-         <workgroup/>
-       </editorialgroup>
-       <structuredidentifier>
-         <project-number part='1' amendment='1'>17301</project-number>
-       </structuredidentifier>
-       <stagename>Committee draft</stagename>
-     </ext>
-   </bibdata>
-   <sections/>
- </iso-standard>
-OUTPUT
+  it "processes metadata, amendment" do
+    output = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
+      = Document title
+      Author
+      :docfile: test.adoc
+      :nodoc:
+      :novalid:
+      :no-isobib:
+      :docnumber: 17301
+      :partnumber: 1
+      :doctype: amendment
+      :docstage: 30
+      :updates: ISO 17301-1:2030
+      :amendment-number: 1
+    INPUT
+    expect(xmlpp(output.sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+
+      <iso-standard type="semantic" version="#{Metanorma::ISO::VERSION}" xmlns="https://www.metanorma.org/ns/iso">
+        <bibdata type="standard">
+          <docidentifier type="ISO">ISO 17301-1:2030/CD Amd 1</docidentifier>
+          <docidentifier type="iso-with-lang">ISO 17301-1:2030/CD Amd 1(E)</docidentifier>
+          <docidentifier type="iso-reference">ISO 17301-1:2030/CD Amd 1(E)</docidentifier>
+          <docnumber>17301</docnumber>
+          <contributor>
+            <role type="author"/>
+            <organization>
+              <name>International Organization for Standardization</name>
+              <abbreviation>ISO</abbreviation>
+            </organization>
+          </contributor>
+          <contributor>
+            <role type="publisher"/>
+            <organization>
+              <name>International Organization for Standardization</name>
+              <abbreviation>ISO</abbreviation>
+            </organization>
+          </contributor>
+          <language>en</language>
+          <script>Latn</script>
+          <status>
+            <stage abbreviation="CD">30</stage>
+            <substage>00</substage>
+          </status>
+          <copyright>
+            <from>#{Time.now.year}</from>
+            <owner>
+              <organization>
+                <name>International Organization for Standardization</name>
+                <abbreviation>ISO</abbreviation>
+              </organization>
+            </owner>
+          </copyright>
+          <ext>
+            <doctype>amendment</doctype>
+            <editorialgroup>
+              <technical-committee/>
+              <subcommittee/>
+              <workgroup/>
+            </editorialgroup>
+            <structuredidentifier>
+              <project-number amendment="1" part="1">17301</project-number>
+            </structuredidentifier>
+            <stagename>Committee draft</stagename>
+          </ext>
+        </bibdata>
+        <sections/>
+      </iso-standard>
+    OUTPUT
   end
 
-    it "processes metadata, amendment" do
-    expect(xmlpp(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true).sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-= Document title
-Author
-:docfile: test.adoc
-:nodoc:
-:novalid:
-:no-isobib:
-:docnumber: 17301
-:partnumber: 1
-:doctype: amendment
-:docstage: 40
-:updates: ISO 17301-1:2030
-:amendment-number: 1
-INPUT
-<iso-standard xmlns='https://www.metanorma.org/ns/iso'  type="semantic" version="#{Metanorma::ISO::VERSION}">
-         <bibdata type='standard'>
-           <docidentifier type='ISO'>ISO 17301-1:2030/DAmd 1</docidentifier>
-           <docidentifier type='iso-with-lang'>ISO 17301-1:2030/DAmd 1(E)</docidentifier>
-           <docidentifier type='iso-reference'>ISO 17301-1:2030/DAmd 1(E)</docidentifier>
-           <docnumber>17301</docnumber>
-           <contributor>
-             <role type='author'/>
-             <organization>
-               <name>International Organization for Standardization</name>
-               <abbreviation>ISO</abbreviation>
-             </organization>
-           </contributor>
-           <contributor>
-             <role type='publisher'/>
-             <organization>
-               <name>International Organization for Standardization</name>
-               <abbreviation>ISO</abbreviation>
-             </organization>
-           </contributor>
-           <language>en</language>
-           <script>Latn</script>
-           <status>
-             <stage abbreviation='D'>40</stage>
-             <substage>00</substage>
-           </status>
-           <copyright>
-             <from>2020</from>
-             <owner>
-               <organization>
-                 <name>International Organization for Standardization</name>
-                 <abbreviation>ISO</abbreviation>
-               </organization>
-             </owner>
-           </copyright>
-           <ext>
-             <doctype>amendment</doctype>
-             <editorialgroup>
-               <technical-committee/>
-               <subcommittee/>
-               <workgroup/>
-             </editorialgroup>
-             <structuredidentifier>
-               <project-number part='1' amendment='1'>17301</project-number>
-             </structuredidentifier>
-             <stagename>Draft</stagename>
-           </ext>
-         </bibdata>
-         <sections/>
-       </iso-standard>
-OUTPUT
+  it "processes metadata, amendment" do
+    output = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
+      = Document title
+      Author
+      :docfile: test.adoc
+      :nodoc:
+      :novalid:
+      :no-isobib:
+      :docnumber: 17301
+      :partnumber: 1
+      :doctype: amendment
+      :docstage: 40
+      :updates: ISO 17301-1:2030
+      :amendment-number: 1
+    INPUT
+    expect(xmlpp(output.sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+      <iso-standard type="semantic" version="#{Metanorma::ISO::VERSION}" xmlns="https://www.metanorma.org/ns/iso">
+        <bibdata type="standard">
+          <docidentifier type="ISO">ISO 17301-1:2030/DAmd 1</docidentifier>
+          <docidentifier type="iso-with-lang">ISO 17301-1:2030/DAmd 1(E)</docidentifier>
+          <docidentifier type="iso-reference">ISO 17301-1:2030/DAmd 1(E)</docidentifier>
+          <docnumber>17301</docnumber>
+          <contributor>
+            <role type="author"/>
+            <organization>
+              <name>International Organization for Standardization</name>
+              <abbreviation>ISO</abbreviation>
+            </organization>
+          </contributor>
+          <contributor>
+            <role type="publisher"/>
+            <organization>
+              <name>International Organization for Standardization</name>
+              <abbreviation>ISO</abbreviation>
+            </organization>
+          </contributor>
+          <language>en</language>
+          <script>Latn</script>
+          <status>
+            <stage abbreviation="D">40</stage>
+            <substage>00</substage>
+          </status>
+          <copyright>
+            <from>#{Time.now.year}</from>
+            <owner>
+              <organization>
+                <name>International Organization for Standardization</name>
+                <abbreviation>ISO</abbreviation>
+              </organization>
+            </owner>
+          </copyright>
+          <ext>
+            <doctype>amendment</doctype>
+            <editorialgroup>
+              <technical-committee/>
+              <subcommittee/>
+              <workgroup/>
+            </editorialgroup>
+            <structuredidentifier>
+              <project-number amendment="1" part="1">17301</project-number>
+            </structuredidentifier>
+            <stagename>Draft</stagename>
+          </ext>
+        </bibdata>
+        <sections/>
+      </iso-standard>
+    OUTPUT
   end
 
-      it "processes metadata, amendment" do
-    expect(xmlpp(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true).sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-= Document title
-Author
-:docfile: test.adoc
-:nodoc:
-:novalid:
-:no-isobib:
-:docnumber: 17301
-:partnumber: 1
-:doctype: amendment
-:updates: ISO 17301-1:2030
-:amendment-number: 1
-INPUT
-<iso-standard xmlns='https://www.metanorma.org/ns/iso'  type="semantic" version="#{Metanorma::ISO::VERSION}">
-         <bibdata type='standard'>
-           <docidentifier type='ISO'>ISO 17301-1:2030/Amd 1</docidentifier>
-           <docidentifier type='iso-with-lang'>ISO 17301-1:2030/Amd 1(E)</docidentifier>
-           <docidentifier type='iso-reference'>ISO 17301-1:2030/Amd 1(E)</docidentifier>
-           <docnumber>17301</docnumber>
-           <contributor>
-             <role type='author'/>
-             <organization>
-               <name>International Organization for Standardization</name>
-               <abbreviation>ISO</abbreviation>
-             </organization>
-           </contributor>
-           <contributor>
-             <role type='publisher'/>
-             <organization>
-               <name>International Organization for Standardization</name>
-               <abbreviation>ISO</abbreviation>
-             </organization>
-           </contributor>
-           <language>en</language>
-           <script>Latn</script>
-           <status>
-             <stage abbreviation='IS'>60</stage>
-             <substage>60</substage>
-           </status>
-           <copyright>
-             <from>2020</from>
-             <owner>
-               <organization>
-                 <name>International Organization for Standardization</name>
-                 <abbreviation>ISO</abbreviation>
-               </organization>
-             </owner>
-           </copyright>
-           <ext>
-             <doctype>amendment</doctype>
-             <editorialgroup>
-               <technical-committee/>
-               <subcommittee/>
-               <workgroup/>
-             </editorialgroup>
-             <structuredidentifier>
-               <project-number part='1' amendment='1'>17301</project-number>
-             </structuredidentifier>
-             <stagename>International standard</stagename>
-           </ext>
-         </bibdata>
-         <sections/>
-       </iso-standard>
-OUTPUT
+  it "processes metadata, amendment" do
+    output = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
+      = Document title
+      Author
+      :docfile: test.adoc
+      :nodoc:
+      :novalid:
+      :no-isobib:
+      :docnumber: 17301
+      :partnumber: 1
+      :doctype: amendment
+      :updates: ISO 17301-1:2030
+      :amendment-number: 1
+    INPUT
+    expect(xmlpp(output.sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+      <iso-standard type="semantic" version="#{Metanorma::ISO::VERSION}" xmlns="https://www.metanorma.org/ns/iso">
+        <bibdata type="standard">
+          <docidentifier type="ISO">ISO 17301-1:2030/Amd 1</docidentifier>
+          <docidentifier type="iso-with-lang">ISO 17301-1:2030/Amd 1(E)</docidentifier>
+          <docidentifier type="iso-reference">ISO 17301-1:2030/Amd 1(E)</docidentifier>
+          <docnumber>17301</docnumber>
+          <contributor>
+            <role type="author"/>
+            <organization>
+              <name>International Organization for Standardization</name>
+              <abbreviation>ISO</abbreviation>
+            </organization>
+          </contributor>
+          <contributor>
+            <role type="publisher"/>
+            <organization>
+              <name>International Organization for Standardization</name>
+              <abbreviation>ISO</abbreviation>
+            </organization>
+          </contributor>
+          <language>en</language>
+          <script>Latn</script>
+          <status>
+            <stage abbreviation="IS">60</stage>
+            <substage>60</substage>
+          </status>
+          <copyright>
+            <from>#{Time.now.year}</from>
+            <owner>
+              <organization>
+                <name>International Organization for Standardization</name>
+                <abbreviation>ISO</abbreviation>
+              </organization>
+            </owner>
+          </copyright>
+          <ext>
+            <doctype>amendment</doctype>
+            <editorialgroup>
+              <technical-committee/>
+              <subcommittee/>
+              <workgroup/>
+            </editorialgroup>
+            <structuredidentifier>
+              <project-number amendment="1" part="1">17301</project-number>
+            </structuredidentifier>
+            <stagename>International standard</stagename>
+          </ext>
+        </bibdata>
+        <sections/>
+      </iso-standard>
+    OUTPUT
   end
 
   it "processes metadata, corrigendum" do
-    expect(xmlpp(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true).sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-= Document title
-Author
-:docfile: test.adoc
-:nodoc:
-:novalid:
-:no-isobib:
-:docnumber: 17301
-:partnumber: 1
-:doctype: technical-corrigendum
-:docstage: 30
-:updates: ISO 17301-1:2030
-:corrigendum-number: 3
-INPUT
-<iso-standard xmlns='https://www.metanorma.org/ns/iso'  type="semantic" version="#{Metanorma::ISO::VERSION}">
-  <bibdata type='standard'>
-    <docidentifier type='ISO'>ISO 17301-1:2030/CD Cor.3</docidentifier>
-    <docidentifier type='iso-with-lang'>ISO 17301-1:2030/CD Cor.3(E)</docidentifier>
-    <docidentifier type='iso-reference'>ISO 17301-1:2030/CD Cor.3(E)</docidentifier>
-    <docnumber>17301</docnumber>
-    <contributor>
-      <role type='author'/>
-      <organization>
-        <name>International Organization for Standardization</name>
-        <abbreviation>ISO</abbreviation>
-      </organization>
-    </contributor>
-    <contributor>
-      <role type='publisher'/>
-      <organization>
-        <name>International Organization for Standardization</name>
-        <abbreviation>ISO</abbreviation>
-      </organization>
-    </contributor>
-    <language>en</language>
-    <script>Latn</script>
-    <status>
-      <stage abbreviation='CD'>30</stage>
-      <substage>00</substage>
-    </status>
-    <copyright>
-      <from>2020</from>
-      <owner>
-        <organization>
-          <name>International Organization for Standardization</name>
-          <abbreviation>ISO</abbreviation>
-        </organization>
-      </owner>
-    </copyright>
-    <ext>
-      <doctype>technical-corrigendum</doctype>
-      <editorialgroup>
-        <technical-committee/>
-        <subcommittee/>
-        <workgroup/>
-      </editorialgroup>
-      <structuredidentifier>
-        <project-number part='1' corrigendum='3'>17301</project-number>
-      </structuredidentifier>
-      <stagename>Committee draft</stagename>
-    </ext>
-  </bibdata>
-  <sections/>
-</iso-standard>
-OUTPUT
+    output = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
+      = Document title
+      Author
+      :docfile: test.adoc
+      :nodoc:
+      :novalid:
+      :no-isobib:
+      :docnumber: 17301
+      :partnumber: 1
+      :doctype: technical-corrigendum
+      :docstage: 30
+      :updates: ISO 17301-1:2030
+      :corrigendum-number: 3
+    INPUT
+    expect(xmlpp(output.sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+      #{'      '}
+      <iso-standard type="semantic" version="#{Metanorma::ISO::VERSION}" xmlns="https://www.metanorma.org/ns/iso">
+        <bibdata type="standard">
+          <docidentifier type="ISO">ISO 17301-1:2030/CD Cor.3</docidentifier>
+          <docidentifier type="iso-with-lang">ISO 17301-1:2030/CD Cor.3(E)</docidentifier>
+          <docidentifier type="iso-reference">ISO 17301-1:2030/CD Cor.3(E)</docidentifier>
+          <docnumber>17301</docnumber>
+          <contributor>
+            <role type="author"/>
+            <organization>
+              <name>International Organization for Standardization</name>
+              <abbreviation>ISO</abbreviation>
+            </organization>
+          </contributor>
+          <contributor>
+            <role type="publisher"/>
+            <organization>
+              <name>International Organization for Standardization</name>
+              <abbreviation>ISO</abbreviation>
+            </organization>
+          </contributor>
+          <language>en</language>
+          <script>Latn</script>
+          <status>
+            <stage abbreviation="CD">30</stage>
+            <substage>00</substage>
+          </status>
+          <copyright>
+            <from>#{Time.now.year}</from>
+            <owner>
+              <organization>
+                <name>International Organization for Standardization</name>
+                <abbreviation>ISO</abbreviation>
+              </organization>
+            </owner>
+          </copyright>
+          <ext>
+            <doctype>technical-corrigendum</doctype>
+            <editorialgroup>
+              <technical-committee/>
+              <subcommittee/>
+              <workgroup/>
+            </editorialgroup>
+            <structuredidentifier>
+              <project-number corrigendum="3" part="1">17301</project-number>
+            </structuredidentifier>
+            <stagename>Committee draft</stagename>
+          </ext>
+        </bibdata>
+        <sections/>
+      </iso-standard>
+    OUTPUT
   end
 
-    it "processes metadata, corrigendum" do
-    expect(xmlpp(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true).sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-= Document title
-Author
-:docfile: test.adoc
-:nodoc:
-:novalid:
-:no-isobib:
-:docnumber: 17301
-:partnumber: 1
-:doctype: technical-corrigendum
-:docstage: 50
-:updates: ISO 17301-1:2030
-:corrigendum-number: 3
-INPUT
-<iso-standard xmlns='https://www.metanorma.org/ns/iso'  type="semantic" version="#{Metanorma::ISO::VERSION}">
-  <bibdata type='standard'>
-    <docidentifier type='ISO'>ISO 17301-1:2030/FDCor.3</docidentifier>
-    <docidentifier type='iso-with-lang'>ISO 17301-1:2030/FDCor.3(E)</docidentifier>
-    <docidentifier type='iso-reference'>ISO 17301-1:2030/FDCor.3(E)</docidentifier>
-    <docnumber>17301</docnumber>
-    <contributor>
-      <role type='author'/>
-      <organization>
-        <name>International Organization for Standardization</name>
-        <abbreviation>ISO</abbreviation>
-      </organization>
-    </contributor>
-    <contributor>
-      <role type='publisher'/>
-      <organization>
-        <name>International Organization for Standardization</name>
-        <abbreviation>ISO</abbreviation>
-      </organization>
-    </contributor>
-    <language>en</language>
-    <script>Latn</script>
-    <status>
-      <stage abbreviation='FD'>50</stage>
-      <substage>00</substage>
-    </status>
-    <copyright>
-      <from>2020</from>
-      <owner>
-        <organization>
-          <name>International Organization for Standardization</name>
-          <abbreviation>ISO</abbreviation>
-        </organization>
-      </owner>
-    </copyright>
-    <ext>
-      <doctype>technical-corrigendum</doctype>
-      <editorialgroup>
-        <technical-committee/>
-        <subcommittee/>
-        <workgroup/>
-      </editorialgroup>
-      <structuredidentifier>
-        <project-number part='1' corrigendum='3'>17301</project-number>
-      </structuredidentifier>
-      <stagename>Final draft</stagename>
-    </ext>
-  </bibdata>
-  <sections/>
-</iso-standard>
-OUTPUT
+  it "processes metadata, corrigendum" do
+    output = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
+      = Document title
+      Author
+      :docfile: test.adoc
+      :nodoc:
+      :novalid:
+      :no-isobib:
+      :docnumber: 17301
+      :partnumber: 1
+      :doctype: technical-corrigendum
+      :docstage: 50
+      :updates: ISO 17301-1:2030
+      :corrigendum-number: 3
+    INPUT
+    expect(xmlpp(output.sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+      <iso-standard xmlns='https://www.metanorma.org/ns/iso'  type="semantic" version="#{Metanorma::ISO::VERSION}">
+        <bibdata type='standard'>
+          <docidentifier type='ISO'>ISO 17301-1:2030/FDCor.3</docidentifier>
+          <docidentifier type='iso-with-lang'>ISO 17301-1:2030/FDCor.3(E)</docidentifier>
+          <docidentifier type='iso-reference'>ISO 17301-1:2030/FDCor.3(E)</docidentifier>
+          <docnumber>17301</docnumber>
+          <contributor>
+            <role type='author'/>
+            <organization>
+              <name>International Organization for Standardization</name>
+              <abbreviation>ISO</abbreviation>
+            </organization>
+          </contributor>
+          <contributor>
+            <role type='publisher'/>
+            <organization>
+              <name>International Organization for Standardization</name>
+              <abbreviation>ISO</abbreviation>
+            </organization>
+          </contributor>
+          <language>en</language>
+          <script>Latn</script>
+          <status>
+            <stage abbreviation='FD'>50</stage>
+            <substage>00</substage>
+          </status>
+          <copyright>
+            <from>#{Time.now.year}</from>
+            <owner>
+              <organization>
+                <name>International Organization for Standardization</name>
+                <abbreviation>ISO</abbreviation>
+              </organization>
+            </owner>
+          </copyright>
+          <ext>
+            <doctype>technical-corrigendum</doctype>
+            <editorialgroup>
+              <technical-committee/>
+              <subcommittee/>
+              <workgroup/>
+            </editorialgroup>
+            <structuredidentifier>
+              <project-number part='1' corrigendum='3'>17301</project-number>
+            </structuredidentifier>
+            <stagename>Final draft</stagename>
+          </ext>
+        </bibdata>
+        <sections/>
+      </iso-standard>
+    OUTPUT
   end
 
-      it "processes metadata, corrigendum" do
-    expect(xmlpp(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true).sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-= Document title
-Author
-:docfile: test.adoc
-:nodoc:
-:novalid:
-:no-isobib:
-:docnumber: 17301
-:partnumber: 1
-:doctype: technical-corrigendum
-:updates: ISO 17301-1:2030
-:corrigendum-number: 3
-INPUT
-<iso-standard xmlns='https://www.metanorma.org/ns/iso'  type="semantic" version="#{Metanorma::ISO::VERSION}">
-         <bibdata type='standard'>
-           <docidentifier type='ISO'>ISO 17301-1:2030/Cor.3</docidentifier>
-           <docidentifier type='iso-with-lang'>ISO 17301-1:2030/Cor.3(E)</docidentifier>
-           <docidentifier type='iso-reference'>ISO 17301-1:2030/Cor.3(E)</docidentifier>
-           <docnumber>17301</docnumber>
-           <contributor>
-             <role type='author'/>
-             <organization>
-               <name>International Organization for Standardization</name>
-               <abbreviation>ISO</abbreviation>
-             </organization>
-           </contributor>
-           <contributor>
-             <role type='publisher'/>
-             <organization>
-               <name>International Organization for Standardization</name>
-               <abbreviation>ISO</abbreviation>
-             </organization>
-           </contributor>
-           <language>en</language>
-           <script>Latn</script>
-           <status>
-             <stage abbreviation='IS'>60</stage>
-             <substage>60</substage>
-           </status>
-           <copyright>
-             <from>2020</from>
-             <owner>
-               <organization>
-                 <name>International Organization for Standardization</name>
-                 <abbreviation>ISO</abbreviation>
-               </organization>
-             </owner>
-           </copyright>
-           <ext>
-             <doctype>technical-corrigendum</doctype>
-             <editorialgroup>
-               <technical-committee/>
-               <subcommittee/>
-               <workgroup/>
-             </editorialgroup>
-             <structuredidentifier>
-               <project-number part='1' corrigendum='3'>17301</project-number>
-             </structuredidentifier>
-             <stagename>International standard</stagename>
-           </ext>
-         </bibdata>
-         <sections/>
-       </iso-standard>
-OUTPUT
+  it "processes metadata, corrigendum" do
+    output = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
+      = Document title
+      Author
+      :docfile: test.adoc
+      :nodoc:
+      :novalid:
+      :no-isobib:
+      :docnumber: 17301
+      :partnumber: 1
+      :doctype: technical-corrigendum
+      :updates: ISO 17301-1:2030
+      :corrigendum-number: 3
+    INPUT
+    expect(xmlpp(output.sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+      <iso-standard type="semantic" version="#{Metanorma::ISO::VERSION}" xmlns="https://www.metanorma.org/ns/iso">
+        <bibdata type="standard">
+          <docidentifier type="ISO">ISO 17301-1:2030/Cor.3</docidentifier>
+          <docidentifier type="iso-with-lang">ISO 17301-1:2030/Cor.3(E)</docidentifier>
+          <docidentifier type="iso-reference">ISO 17301-1:2030/Cor.3(E)</docidentifier>
+          <docnumber>17301</docnumber>
+          <contributor>
+            <role type="author"/>
+            <organization>
+              <name>International Organization for Standardization</name>
+              <abbreviation>ISO</abbreviation>
+            </organization>
+          </contributor>
+          <contributor>
+            <role type="publisher"/>
+            <organization>
+              <name>International Organization for Standardization</name>
+              <abbreviation>ISO</abbreviation>
+            </organization>
+          </contributor>
+          <language>en</language>
+          <script>Latn</script>
+          <status>
+            <stage abbreviation="IS">60</stage>
+            <substage>60</substage>
+          </status>
+          <copyright>
+            <from>#{Time.now.year}</from>
+            <owner>
+              <organization>
+                <name>International Organization for Standardization</name>
+                <abbreviation>ISO</abbreviation>
+              </organization>
+            </owner>
+          </copyright>
+          <ext>
+            <doctype>technical-corrigendum</doctype>
+            <editorialgroup>
+              <technical-committee/>
+              <subcommittee/>
+              <workgroup/>
+            </editorialgroup>
+            <structuredidentifier>
+              <project-number corrigendum="3" part="1">17301</project-number>
+            </structuredidentifier>
+            <stagename>International standard</stagename>
+          </ext>
+        </bibdata>
+        <sections/>
+      </iso-standard>
+    OUTPUT
   end
-
-
-
 end