asciidoctor-iso 0.7.3 → 0.7.4

data/spec/asciidoctor-iso/base_spec.rb

@@ -34,6 +34,7 @@ RSpec.describe Asciidoctor::ISO do
 </iso-standard>
     OUTPUT
     expect(File.exist?("test.doc")).to be true
+    expect(File.exist?("htmlstyle.css")).to be false
   end
 
   it "processes default metadata" do
@@ -64,7 +65,7 @@ RSpec.describe Asciidoctor::ISO do
       :iteration: 3
       :language: en
       :title-intro-en: Introduction
-      :title-main-en: Main Title
+      :title-main-en: Main Title -- Title
       :title-part-en: Title Part
       :title-intro-fr: Introduction Française
       :title-main-fr: Titre Principal
@@ -76,7 +77,7 @@ RSpec.describe Asciidoctor::ISO do
        <bibdata type="article">
          <title>
            <title-intro language="en" format="text/plain">Introduction</title-intro>
-           <title-main language="en" format="text/plain">Main Title</title-main>
+           <title-main language="en" format="text/plain">Main Title — Title</title-main>
            <title-part language="en" format="text/plain">Title Part</title-part>
          </title>
          <title>

data/spec/asciidoctor-iso/blocks_spec.rb

@@ -96,7 +96,7 @@ RSpec.describe Asciidoctor::ISO do
          <draft>1.2</draft>
        </version>
        <sections><p id="foreword">Foreword</p>
-       <review reviewer="ISO" id="_" date="20170101T0000" from="foreword" to="foreword"><p id="_">A Foreword shall appear in each document. The generic text is shown here. It does not contain requirements, recommendations or permissions.</p>
+       <review reviewer="ISO" id="_" date="20170101T00:00:00Z" from="foreword" to="foreword"><p id="_">A Foreword shall appear in each document. The generic text is shown here. It does not contain requirements, recommendations or permissions.</p>
        <p id="_">For further information on the Foreword, see <strong>ISO/IEC Directives, Part 2, 2016, Clause 12.</strong></p></review></sections>
        </iso-standard>
 
@@ -248,10 +248,10 @@ RSpec.describe Asciidoctor::ISO do
       == Section 1
       INPUT
        #{BLANK_HDR}
-             <foreword obligation="informative">
+             <preface><foreword obligation="informative">
          <title>Foreword</title>
          <p id="_">This is a preamble</p>
-       </foreword><sections>
+       </foreword></preface><sections>
        <clause id="_" inline-header="false" obligation="normative">
          <title>Section 1</title>
        </clause></sections>

data/spec/asciidoctor-iso/cleanup_spec.rb

@@ -179,13 +179,13 @@ r = 1 %</stem>
       * [[[iso216,ISO 216:2001]]], _Reference_
     INPUT
        #{BLANK_HDR}
-              <foreword obligation="informative">
+              <preface><foreword obligation="informative">
          <title>Foreword</title>
          <p id="_">
          <eref type="inline" bibitemid="iso216" citeas="ISO 216: 2001"/>
        </p>
-       </foreword><sections>
-       </sections><references id="_" obligation="informative">
+       </foreword></preface><sections>
+       </sections><bibliography><references id="_" obligation="informative">
          <title>Normative References</title>
          <bibitem id="iso216" type="standard">
          <title format="text/plain">Reference</title>
@@ -202,6 +202,7 @@ r = 1 %</stem>
          </contributor>
        </bibitem>
        </references>
+       </bibliography
        </iso-standard>
     OUTPUT
   end
@@ -209,20 +210,21 @@ r = 1 %</stem>
   it "extracts localities from erefs" do
     expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
       #{ASCIIDOC_BLANK_HDR}
-      <<iso216,whole,clause 3,example 9-11:the reference>>
+      <<iso216,whole,clause 3,example 9-11,locality:prelude 33,locality:entirety:the reference>>
 
       [bibliography]
       == Normative References
       * [[[iso216,ISO 216]]], _Reference_
     INPUT
        #{BLANK_HDR}
+       <preface>
        <foreword obligation="informative">
          <title>Foreword</title>
          <p id="_">
-         <eref type="inline" bibitemid="iso216" citeas="ISO 216"><locality type="whole"/><locality type="clause"><referenceFrom>3</referenceFrom></locality><locality type="example"><referenceFrom>9</referenceFrom><referenceTo>11</referenceTo></locality>the reference</eref>
+         <eref type="inline" bibitemid="iso216" citeas="ISO 216"><locality type="whole"/><locality type="clause"><referenceFrom>3</referenceFrom></locality><locality type="example"><referenceFrom>9</referenceFrom><referenceTo>11</referenceTo></locality><locality type="locality:prelude"><referenceFrom>33</referenceFrom></locality><locality type="locality:entirety"/>the reference</eref>
        </p>
-       </foreword><sections>
-       </sections><references id="_" obligation="informative">
+       </foreword></preface><sections>
+       </sections><bibliography><references id="_" obligation="informative">
          <title>Normative References</title>
          <bibitem id="iso216" type="standard">
          <title format="text/plain">Reference</title>
@@ -236,6 +238,7 @@ r = 1 %</stem>
          </contributor>
        </bibitem>
        </references>
+       </bibliography>
        </iso-standard>
     OUTPUT
   end
@@ -251,12 +254,13 @@ r = 1 %</stem>
       * [[[iso216,ISO 216]]], _Reference_
     INPUT
        #{BLANK_HDR}
+       <preface>
        <foreword obligation="informative">
          <title>Foreword</title>
          <p id="_">
          <eref type="inline" bibitemid="iso216" citeas=""/>
        </p>
-       </foreword><sections>
+       </foreword></preface><sections>
        <clause id="_" inline-header="false" obligation="normative">
          <title>Clause</title>
          <ul id="_">
@@ -308,7 +312,7 @@ r = 1 %</stem>
        #{BLANK_HDR}
               <sections>
          
-       </sections><references id="_" obligation="informative"><title>Normative References</title>
+       </sections><bibliography><references id="_" obligation="informative"><title>Normative References</title>
        <bibitem id="iso216" type="standard">
          <title format="text/plain">Reference</title>
          <docidentifier>ISO 216</docidentifier>
@@ -320,6 +324,7 @@ r = 1 %</stem>
            </organization>
          </contributor>
        </bibitem></references>
+       </bibliography>
        </iso-standard>
     OUTPUT
   end
@@ -628,13 +633,13 @@ r = 1 %</stem>
       footnote:[Footnote2]
     INPUT
        #{BLANK_HDR}
-       <foreword obligation="informative">
+       <preface><foreword obligation="informative">
          <title>Foreword</title>
          <p id="_"><fn reference="1">
          <p id="_">Footnote</p>
        </fn>
        </p>
-       </foreword><sections>
+       </foreword></preface><sections>
      
        <clause id="_" inline-header="false" obligation="normative">
          <title>Clause</title>
@@ -642,7 +647,7 @@ r = 1 %</stem>
          <p id="_">Footnote2</p>
        </fn>
        </p>
-       </clause></sections><references id="_" obligation="informative">
+       </clause></sections><bibliography><references id="_" obligation="informative">
          <title>Normative References</title>
          <bibitem id="iso123" type="standard">
          <title format="text/plain">Standard</title>
@@ -658,6 +663,7 @@ r = 1 %</stem>
          <note format="text/plain" reference="2">ISO DATE: The standard is in press</note>
        </bibitem>
        </references>
+       </bibliography>
        </iso-standard>
     OUTPUT
   end

data/spec/asciidoctor-iso/inline_spec.rb

@@ -127,7 +127,7 @@ RSpec.describe Asciidoctor::ISO do
             #{BLANK_HDR}
        <sections>
 
-       </sections><references id="_" obligation="informative">
+       </sections><bibliography><references id="_" obligation="informative">
          <title>Normative References</title>
          <bibitem id="ISO712">
          <formattedref format="application/x-isodoc+xml">Reference</formattedref>
@@ -138,6 +138,7 @@ RSpec.describe Asciidoctor::ISO do
          <docidentifier>ISO713</docidentifier>
        </bibitem>
        </references>
+       </bibliography>
        </iso-standard>
     OUTPUT
   end

data/spec/asciidoctor-iso/refs_spec.rb

@@ -11,7 +11,7 @@ RSpec.describe Asciidoctor::ISO do
     INPUT
        #{BLANK_HDR}
               <sections>
-       </sections><references id="_" obligation="informative">
+       </sections><bibliography><references id="_" obligation="informative">
          <title>Normative References</title>
          <bibitem id="iso123" type="standard">
          <title format="text/plain">Standard</title>
@@ -25,6 +25,7 @@ RSpec.describe Asciidoctor::ISO do
          </contributor>
        </bibitem>
        </references>
+       </bibliography>
        </iso-standard>
     OUTPUT
   end
@@ -39,7 +40,7 @@ RSpec.describe Asciidoctor::ISO do
     INPUT
        #{BLANK_HDR}
               <sections>
-       </sections><references id="_" obligation="informative">
+       </sections><bibliography><references id="_" obligation="informative">
          <title>Normative References</title>
          <bibitem id="iso123" type="standard">
          <title format="text/plain">Standard</title>
@@ -53,6 +54,7 @@ RSpec.describe Asciidoctor::ISO do
          </contributor>
        </bibitem>
        </references>
+       </bibliography>
        </iso-standard>
     OUTPUT
   end
@@ -69,7 +71,7 @@ RSpec.describe Asciidoctor::ISO do
        #{BLANK_HDR}
               <sections>
          
-       </sections><references id="_" obligation="informative">
+       </sections><bibliography><references id="_" obligation="informative">
          <title>Normative References</title>
          <bibitem id="iso123" type="standard">
          <title format="text/plain">Standard</title>
@@ -108,6 +110,7 @@ RSpec.describe Asciidoctor::ISO do
          </contributor>
        </bibitem>
        </references>
+       </bibliography>
        </iso-standard>
     OUTPUT
   end
@@ -122,7 +125,7 @@ RSpec.describe Asciidoctor::ISO do
     INPUT
        #{BLANK_HDR}
        <sections>
-              </sections><references id="_" obligation="informative">
+              </sections><bibliography><references id="_" obligation="informative">
          <title>Normative References</title>
          <bibitem id="iso123" type="standard">
          <title format="text/plain">Standard</title>
@@ -140,6 +143,7 @@ RSpec.describe Asciidoctor::ISO do
          <note format="text/plain" reference="1">ISO DATE: The standard is in press</note>
        </bibitem>
        </references>
+       </bibliography>
        </iso-standard>
     OUTPUT
   end
@@ -155,7 +159,7 @@ RSpec.describe Asciidoctor::ISO do
        #{BLANK_HDR}
               <sections>
          
-       </sections><references id="_" obligation="informative">
+       </sections><bibliography><references id="_" obligation="informative">
          <title>Normative References</title>
          <bibitem id="iso123" type="standard">
          <title format="text/plain">Standard</title>
@@ -172,6 +176,7 @@ RSpec.describe Asciidoctor::ISO do
          </contributor>
        </bibitem>
        </references>
+       </bibliography>
        </iso-standard>
     OUTPUT
   end
@@ -187,7 +192,7 @@ RSpec.describe Asciidoctor::ISO do
        #{BLANK_HDR}
               <sections>
          
-       </sections><references id="_" obligation="informative">
+       </sections><bibliography><references id="_" obligation="informative">
          <title>Normative References</title>
          <bibitem id="iso123">
          <formattedref format="application/x-isodoc+xml">
@@ -196,6 +201,7 @@ RSpec.describe Asciidoctor::ISO do
          <docidentifier>XYZ 123:1066 (all parts)</docidentifier>
        </bibitem>
        </references>
+       </bibliography>
        </iso-standard>
     OUTPUT
   end
@@ -211,7 +217,7 @@ RSpec.describe Asciidoctor::ISO do
        #{BLANK_HDR}
               <sections>
          
-       </sections><references id="_" obligation="informative">
+       </sections><bibliography><references id="_" obligation="informative">
          <title>Bibliography</title>
          <bibitem id="iso123">
          <formattedref format="application/x-isodoc+xml">
@@ -220,6 +226,7 @@ RSpec.describe Asciidoctor::ISO do
          <docidentifier>[1]</docidentifier>
        </bibitem>
        </references>
+       </bibliography>
        </iso-standard>
     OUTPUT
   end

data/spec/asciidoctor-iso/section_spec.rb

@@ -6,6 +6,8 @@ RSpec.describe Asciidoctor::ISO do
       #{ASCIIDOC_BLANK_HDR}
       .Foreword
 
+      Text
+
       == Introduction
 
       === Introduction Subsection
@@ -43,15 +45,21 @@ RSpec.describe Asciidoctor::ISO do
 
       === Annex A.1
 
+      [%appendix]
+      === Appendix 1
+
       == Bibliography
 
       === Bibliography Subsection
     INPUT
             #{BLANK_HDR}
-       <introduction id="_" obligation="informative"><title>Introduction</title><subsection id="_" inline-header="false" obligation="informative">
+       <preface><foreword obligation="informative">
+         <title>Foreword</title>
+         <p id="_">Text</p>
+       </foreword><introduction id="_" obligation="informative"><title>Introduction</title><clause id="_" inline-header="false" obligation="informative">
          <title>Introduction Subsection</title>
-       </subsection>
-       </introduction><sections>
+       </clause>
+       </introduction></preface><sections>
        <clause id="_" obligation="normative">
          <title>Scope</title>
          <p id="_">Text</p>
@@ -71,19 +79,21 @@ RSpec.describe Asciidoctor::ISO do
        </terms>
        <definitions id="_"/></clause>
        <definitions id="_"/>
-       <clause id="_" inline-header="false" obligation="normative"><title>Clause 4</title><subsection id="_" inline-header="false" obligation="normative">
+       <clause id="_" inline-header="false" obligation="normative"><title>Clause 4</title><clause id="_" inline-header="false" obligation="normative">
          <title>Introduction</title>
-       </subsection>
-       <subsection id="_" inline-header="false" obligation="normative">
+       </clause>
+       <clause id="_" inline-header="false" obligation="normative">
          <title>Clause 4.2</title>
-       </subsection></clause>
+       </clause></clause>
 
        </sections><annex id="_" inline-header="false" obligation="normative">
          <title>Annex</title>
-         <subsection id="_" inline-header="false" obligation="normative">
+         <clause id="_" inline-header="false" obligation="normative">
          <title>Annex A.1</title>
-       </subsection>
-       </annex><references id="_" obligation="informative">
+       </clause>
+       <appendix id="_" inline-header="false" obligation="normative">
+          <title>Appendix 1</title>
+       </appendix></annex><bibliography><references id="_" obligation="informative">
          <title>Normative References</title>
        </references><clause id="_" obligation="informative">
          <title>Bibliography</title>
@@ -91,6 +101,7 @@ RSpec.describe Asciidoctor::ISO do
          <title>Bibliography Subsection</title>
        </references>
        </clause>
+       </bibliography>
        </iso-standard>
     OUTPUT
   end
@@ -100,6 +111,8 @@ RSpec.describe Asciidoctor::ISO do
       #{ASCIIDOC_BLANK_HDR}
       .Foreword
 
+      Text
+
       [heading=introduction]
       == Εισαγωγή
 
@@ -144,16 +157,26 @@ RSpec.describe Asciidoctor::ISO do
 
       === Annex A.1
 
+      [%appendix]
+      === Appendx 1
+
       [heading=bibliography]
       == Βιβλιογραφία
 
       === Bibliography Subsection
     INPUT
             #{BLANK_HDR}
-       <introduction id="_" obligation="informative"><title>Introduction</title><subsection id="_" inline-header="false" obligation="informative">
+       <preface>     
+       <foreword obligation="informative">
+         <title>Foreword</title>
+         <p id="_">Text</p>
+       </foreword>
+       <introduction id="_" obligation="informative"><title>Introduction</title><clause id="_" inline-header="false" obligation="informative">
          <title>Introduction Subsection</title>
-       </subsection>
-       </introduction><sections>
+       </clause>
+       </introduction>
+       </preface>
+       <sections>
        <clause id="_" obligation="normative">
          <title>Scope</title>
          <p id="_">Text</p>
@@ -173,19 +196,21 @@ RSpec.describe Asciidoctor::ISO do
        </clause>
        <definitions id="_"/></terms>
        <definitions id="_"/>
-       <clause id="_" inline-header="false" obligation="normative"><title>Clause 4</title><subsection id="_" inline-header="false" obligation="normative">
+       <clause id="_" inline-header="false" obligation="normative"><title>Clause 4</title><clause id="_" inline-header="false" obligation="normative">
          <title>Introduction</title>
-       </subsection>
-       <subsection id="_" inline-header="false" obligation="normative">
+       </clause>
+       <clause id="_" inline-header="false" obligation="normative">
          <title>Clause 4.2</title>
-       </subsection></clause>
+       </clause></clause>
      
        </sections><annex id="_" inline-header="false" obligation="normative">
          <title>Annex</title>
-         <subsection id="_" inline-header="false" obligation="normative">
+         <clause id="_" inline-header="false" obligation="normative">
          <title>Annex A.1</title>
-       </subsection>
-       </annex><references id="_" obligation="informative">
+       </clause>
+       <appendix id="_" inline-header="false" obligation="normative">
+         <title>Appendx 1</title>
+       </appendix></annex><bibliography><references id="_" obligation="informative">
          <title>Normative References</title>
        </references><clause id="_" obligation="informative">
          <title>Bibliography</title>
@@ -193,6 +218,7 @@ RSpec.describe Asciidoctor::ISO do
          <title>Bibliography Subsection</title>
        </references>
        </clause>
+       </bibliography>
        </iso-standard>
     OUTPUT
   end
@@ -214,9 +240,9 @@ RSpec.describe Asciidoctor::ISO do
              #{BLANK_HDR}
        <sections><clause id="_" inline-header="false" obligation="informative">
          <title>Clause 1</title>
-         <subsection id="_" inline-header="false" obligation="informative">
+         <clause id="_" inline-header="false" obligation="informative">
          <title>Clause 1a</title>
-       </subsection>
+       </clause>
        </clause>
        <clause id="_" inline-header="false" obligation="normative">
          <title>Clause 2</title>
@@ -245,15 +271,15 @@ RSpec.describe Asciidoctor::ISO do
              #{BLANK_HDR}
        <sections><clause id="_" inline-header="false" obligation="normative">
          <title>Clause 1</title>
-         <subsection id="_" inline-header="true" obligation="normative">
+         <clause id="_" inline-header="true" obligation="normative">
          <title>Clause 1a</title>
-       </subsection>
+       </clause>
        </clause>
        </sections><annex id="_" inline-header="false" obligation="normative">
          <title>Annex A</title>
-         <subsection id="_" inline-header="true" obligation="normative">
+         <clause id="_" inline-header="true" obligation="normative">
          <title>Clause Aa</title>
-       </subsection>
+       </clause>
        </annex>
        </iso-standard>
      OUTPUT
@@ -271,8 +297,8 @@ RSpec.describe Asciidoctor::ISO do
        <sections>
          <clause id="_" inline-header="false" obligation="normative">
          <title>Clause 1</title>
-         <subsection id="_" inline-header="false" obligation="normative">
-       </subsection>
+         <clause id="_" inline-header="false" obligation="normative">
+       </clause>
        </clause>
        </sections>
        </iso-standard>
@@ -290,10 +316,11 @@ RSpec.describe Asciidoctor::ISO do
 
      INPUT
              #{BLANK_HDR}
-             <termdocsource target="iso1234" type="inline"/><termdocsource target="iso5678" type="inline"/><foreword obligation="informative">
+             <termdocsource target="iso1234" type="inline"/><termdocsource target="iso5678" type="inline"/>
+        <preface><foreword obligation="informative">
          <title>Foreword</title>
          <p id="_">Foreword</p>
-       </foreword><sections>
+       </foreword></preface><sections>
        <terms id="_" obligation="normative">
          <title>Terms and Definitions</title>