metanorma-bsi 0.0.1 → 0.1.0

data/spec/asciidoctor/validate_spec.rb

@@ -253,7 +253,7 @@ RSpec.describe Asciidoctor::BSI do
 
         [bibliography]
         == Normative References
-        * [[[XYZ,ISO 639:1967]]] _Standard_
+        * [[[XYZ,ISO 639:1988]]] _Standard_
       INPUT
       expect(File.read("test.err"))
         .to include "Do not cite withdrawn standards"
@@ -377,6 +377,31 @@ RSpec.describe Asciidoctor::BSI do
       .to include "Third annex should be annex #1"
   end
 
+  it "Warning if annexes do not appear in citation order: ignore uncited annexes" do
+    Asciidoctor.convert(<<~"INPUT", *OPTIONS)
+      #{VALIDATING_BLANK_HDR}
+
+      <<a3>>
+      <<a2>>
+
+      [[a1]]
+      [appendix]
+      == First annex
+
+      [[a2]]
+      [appendix]
+      == Second annex
+
+      [[a3]]
+      [appendix]
+      == Third annex
+    INPUT
+    expect(File.read("test.err"))
+      .not_to include "First annex should be annex #3"
+    expect(File.read("test.err"))
+      .to include "Third annex should be annex #1"
+  end
+
   it "Warning if annexes not cited properly" do
     Asciidoctor.convert(<<~"INPUT", *OPTIONS)
       = Document title

data/spec/isodoc/blocks_spec.rb

@@ -14,7 +14,7 @@ RSpec.describe IsoDoc::BSI do
     INPUT
       #{HTML_HDR}
                <div>
-                 <h1 class='ForewordTitle'>FOREWORD</h1>
+                 <h1 class='ForewordTitle'>Foreword</h1>
                  <div class='boilerplate_legal'/>
                  <div id='_70234f78-64e5-4dfc-8b6f-f3f037348b6a' class='Note'>
                    <p>
@@ -73,13 +73,20 @@ RSpec.describe IsoDoc::BSI do
           </table>
         </clause>
       </sections>
+      <annex id="sec_C" inline-header="false" obligation="informative"><title>Recognized levels of competence in SM</title><admonition id="_0a120252-23b6-423c-b5b5-e5e5fcb9c8e7" type="commentary" target="sec_C">
+<p id="_70c1c77a-dba1-4239-a76f-5610db24835d">This annex provides examples of the levels of competence in SM expected
+from individuals working in various roles throughout an organization.
+The level of competence required for an individual is determined by the organization.</p>
+</admonition>
+<p id="_c873a8f4-a2ea-4509-b28c-b85212cca301">Hello</p>
+      </annex>
       </iso-standard>
     INPUT
 
     presxml = <<~OUTPUT
            <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
            <sections>
-         <clause id="reag2" inline-header="false" obligation="normative">
+         <clause id="reag2" inline-header="false" obligation="normative"  displayorder='1'>
            <title depth="1">1<tab/>Reagents</title>
            <admonition id="A1" type="commentary" target="reag"><name>COMMENTARY ON ???</name>
              <p id="p2">This is a commentary on the reagents</p>
@@ -100,11 +107,12 @@ RSpec.describe IsoDoc::BSI do
              </tbody>
            </table>
          </clause>
-         <clause id="reag3" inline-header="false" obligation="normative">
+         <clause id="reag3" inline-header="false" obligation="normative" displayorder='2'>
            <title depth="1">2<tab/>Reagents</title>
-           <admonition id="A4" type="commentary" target="table3"><name>COMMENTARY ON TABLE 2</name>
-             <p id="p3">This is a commentary on the reagents</p>
-           </admonition>
+           <admonition id='A4' type='commentary' target='table3'>
+  <name>COMMENTARY ON TABLE 2</name>
+  <p id='p3'>This is a commentary on the reagents</p>
+</admonition>
            <table id="table3">
              <name>Table 2&#xA0;&#x2014; Reagents in use</name>
              <tbody>
@@ -116,13 +124,32 @@ RSpec.describe IsoDoc::BSI do
            </table>
          </clause>
        </sections>
+       <annex id='sec_C' inline-header='false' obligation='informative' displayorder='3'>
+  <title>
+    <strong>Annex A</strong>
+    <tab/>
+    (informative)
+    <br/>
+    <strong>Recognized levels of competence in SM</strong>
+  </title>
+  <admonition id='_0a120252-23b6-423c-b5b5-e5e5fcb9c8e7' type='commentary' target='sec_C'>
+  <name>COMMENTARY ON ANNEX A</name>
+    <p id='_70c1c77a-dba1-4239-a76f-5610db24835d'>
+      This annex provides examples of the levels of competence in SM expected
+      from individuals working in various roles throughout an organization.
+      The level of competence required for an individual is determined by the
+      organization.
+    </p>
+  </admonition>
+  <p id='_c873a8f4-a2ea-4509-b28c-b85212cca301'>Hello</p>
+</annex>
        </iso-standard>
     OUTPUT
 
     html = <<~OUTPUT
       #{HTML_HDR}
              <div id=''>
-               <h1 class='ForewordTitle'>FOREWORD</h1>
+               <h1 class='ForewordTitle'>Foreword</h1>
                <div class='boilerplate_legal'/>
              </div>
              <p class='zzSTDTitle1'>
@@ -135,23 +162,14 @@ RSpec.describe IsoDoc::BSI do
                  <span class='note_label'>COMMENTARY ON ???</span>
                </p>
                <p id='p2'>This is a commentary on the reagents</p>
-               <div id='A1' class='Admonition'>
-                 <p>This is a commentary on the reagents</p>
-               </div>
                <p>
                  <span class='note_label'>COMMENTARY 1 ON CLAUSE 1</span>
                </p>
                <p id='p2'>This is a commentary on the reagents</p>
-               <div id='A2' class='Admonition'>
-                 <p>This is a commentary on the reagents</p>
-               </div>
                <p>
                  <span class='note_label'>COMMENTARY 2 ON CLAUSE 1</span>
                </p>
                <p id='p2'>This is a commentary on the reagents</p>
-               <div id='A3' class='Admonition'>
-                 <p>This is a commentary on the reagents</p>
-               </div>
                <p class='TableTitle' style='text-align:center;'>Table 1&#160;&#8212; Reagents in use</p>
                <table id='table2' class='MsoISOTable' style='border-width:1px;border-spacing:0;'>
                  <tbody>
@@ -168,9 +186,6 @@ RSpec.describe IsoDoc::BSI do
                  <span class='note_label'>COMMENTARY ON TABLE 2</span>
                </p>
                <p id='p3'>This is a commentary on the reagents</p>
-               <div id='A4' class='Admonition'>
-                 <p>This is a commentary on the reagents</p>
-               </div>
                <p class='TableTitle' style='text-align:center;'>Table 2&#160;&#8212; Reagents in use</p>
                <table id='table3' class='MsoISOTable' style='border-width:1px;border-spacing:0;'>
                  <tbody>
@@ -181,6 +196,26 @@ RSpec.describe IsoDoc::BSI do
                  </tbody>
                </table>
              </div>
+             <br/>
+<div id='sec_C' class='Section3'>
+  <h1 class='Annex'>
+    <b>Annex A</b>
+    &#8195;
+     (informative)
+    <br/>
+    <b>Recognized levels of competence in SM</b>
+  </h1>
+  <p>
+  <span class='note_label'>COMMENTARY ON ANNEX A</span>
+  </p>
+  <p id='_70c1c77a-dba1-4239-a76f-5610db24835d'>
+     This annex provides examples of the levels of competence in SM
+    expected from individuals working in various roles throughout an
+    organization. The level of competence required for an individual is
+    determined by the organization.
+  </p>
+  <p id='_c873a8f4-a2ea-4509-b28c-b85212cca301'>Hello</p>
+</div>
            </div>
          </body>
        </html>
@@ -207,7 +242,7 @@ RSpec.describe IsoDoc::BSI do
       INPUT
         #{HTML_HDR}
                <div>
-                 <h1 class='ForewordTitle'>FOREWORD</h1>
+                 <h1 class='ForewordTitle'>Foreword</h1>
                  <div class='boilerplate_legal'/>
                  <div id='_70234f78-64e5-4dfc-8b6f-f3f037348b6a' class='Admonition'>
                    <p>
@@ -240,7 +275,7 @@ RSpec.describe IsoDoc::BSI do
     INPUT
       #{HTML_HDR}
                 <div>
-                  <h1 class='ForewordTitle'>FOREWORD</h1>
+                  <h1 class='ForewordTitle'>Foreword</h1>
                   <div class='boilerplate_legal'/>
                   <div id='_70234f78-64e5-4dfc-8b6f-f3f037348b6a' class='Admonition'>
                     <p><b>Title</b>.</p>