metanorma-iso 2.0.8.1 → 2.1.2

data/spec/isodoc/amd_spec.rb

@@ -128,7 +128,7 @@ RSpec.describe IsoDoc do
           <annex id="annex1" displayorder="5">
             <title>
               <strong>Annex A</strong>
-              <br/>(informative)</title>
+              <br/><span class="obligation">(informative)</span></title>
             <clause id="annex1a" inline-header="true">
               <title>A.1</title>
               <note id="AN">
@@ -252,21 +252,21 @@ RSpec.describe IsoDoc do
               <title>Foreword</title>
               <p id='A'>
                 This is a preamble 
-                <xref target='C'>0.1</xref>
-                <xref target='C1'>0.2</xref>
-                <xref target='D'>Scope</xref>
+                <xref target='C'><span class='citesec'>0.1</span></xref>
+                <xref target='C1'><span class='citesec'>0.2</span></xref>
+                <xref target='D'><span class='citesec'>Scope</span></xref>
                 <xref target='H'>[H]</xref>
                 <xref target='I'>[I]</xref>
                 <xref target='J'>[J]</xref>
                 <xref target='K'>[K]</xref>
                 <xref target='L'>[L]</xref>
-                <xref target='M'>Clause 4</xref>
-                <xref target='N'>Introduction</xref>
-                <xref target='O'>Clause 4.2</xref>
-                <xref target='P'>Annex A</xref>
-                <xref target='Q'>A.1</xref>
-                <xref target='Q1'>A.1.1</xref>
-                <xref target='Q2'>Annex A, Appendix 1</xref>
+                <xref target='M'><span class='citesec'>Clause 4</span></xref>
+                <xref target='N'><span class='citesec'>Introduction</span></xref>
+                <xref target='O'><span class='citesec'>Clause 4.2</span></xref>
+                <xref target='P'><span class='citeapp'>Annex A</span></xref>
+                <xref target='Q'><span class='citeapp'>A.1</span></xref>
+                <xref target='Q1'><span class='citeapp'>A.1.1</span></xref>
+                <xref target='Q2'><span class='citeapp'>Annex A, Appendix 1</span></xref>
                 <xref target='R'>[R]</xref>
               </p>
             </foreword>
@@ -297,7 +297,7 @@ RSpec.describe IsoDoc do
             <title>
               <strong>Annex A</strong>
               <br/>
-              (normative)
+              <span class="obligation">(normative)</span>
               <br/>
               <br/>
               <strong>Annex</strong>
@@ -503,7 +503,7 @@ RSpec.describe IsoDoc do
           </clause>
         </sections>
         <annex id="P" inline-header="false" obligation="normative" displayorder="10">
-          <title><strong>Annex A</strong><br/>(normative)<br/><br/><strong>Annex</strong></title>
+          <title><strong>Annex A</strong><br/><span class="obligation">(normative)</span><br/><br/><strong>Annex</strong></title>
           <clause id="Q" inline-header="false" obligation="normative">
             <title depth="2">A.1<tab/>Annex A.1</title>
             <clause id="Q1" inline-header="false" obligation="normative">
@@ -511,7 +511,8 @@ RSpec.describe IsoDoc do
             </clause>
           </clause>
         </annex>
-        <annex id="P1" inline-header="false" obligation="normative" displayorder="11"><title><strong>Annex B</strong><br/>(normative)</title></annex>
+        <annex id="P1" inline-header="false" obligation="normative" displayorder="11">
+        <title><strong>Annex B</strong><br/><span class="obligation">(normative)</span></title></annex>
         <bibliography>
           <references id="R" normative="true" obligation="informative" displayorder="7">
             <title depth="1">Normative References</title>
@@ -744,32 +745,28 @@ RSpec.describe IsoDoc do
       </iso-standard>
     INPUT
     output = <<~OUTPUT
-      {:accesseddate=>"XXX",
-      :agency=>"ISO",
-      :circulateddate=>"XXX",
-      :confirmeddate=>"XXX",
-      :copieddate=>"XXX",
+      {:agency=>"ISO",
       :createddate=>"2016-05-01",
       :docnumber=>"ISO/PreNWIP3 17301-1:2016/Amd.1",
       :docnumber_lang=>"ISO/PreNWIP3 17301-1:2016/Amd.1(E)",
       :docnumber_reference=>"ISO/PreNWIP3 17301-1:2016/Amd.1:2017(E)",
       :docnumeric=>"17301",
-      :docsubtitle=>"Introduction Fran&#xe7;aise&nbsp;&mdash; Titre Principal&nbsp;&mdash; Partie&nbsp;1: Part du Titre",
+      :docsubtitle=>"Introduction Fran&#xe7;aise&#xa0;&#x2014; Titre Principal&#xa0;&#x2014; Partie&#xa0;1: Part du Titre",
       :docsubtitleamd=>"Fraction massique de mati&#xe8;re &#xe9;trang&#xe8;re, riz usin&#xe9; (non gluant), diviseurs d&#x2019;&#xe9;chantillon et recommandations relatives aux conditions d&#x2019;entreposage et de transport",
-      :docsubtitleamdlabel=>"AMENDMENT&nbsp;1",
-      :docsubtitlecorrlabel=>"RECTIFICATIF TECHNIQUE&nbsp;2",
+      :docsubtitleamdlabel=>"AMENDMENT&#xa0;1",
+      :docsubtitlecorrlabel=>"RECTIFICATIF TECHNIQUE&#xa0;2",
       :docsubtitleintro=>"Introduction Fran&#xe7;aise",
       :docsubtitlemain=>"Titre Principal",
       :docsubtitlepart=>"Part du Titre",
-      :docsubtitlepartlabel=>"Partie&nbsp;1",
-      :doctitle=>"Introduction&nbsp;&mdash; Main Title&#x2009;&#x2014;&#x2009;Title&nbsp;&mdash; Part&nbsp;1: Title Part",
+      :docsubtitlepartlabel=>"Partie&#xa0;1",
+      :doctitle=>"Introduction&#xa0;&#x2014; Main Title&#x2009;&#x2014;&#x2009;Title&#xa0;&#x2014; Part&#xa0;1: Title Part",
       :doctitleamd=>"Mass fraction of extraneous matter, milled rice (nonglutinous), sample dividers and recommendations relating to storage and transport conditions",
-      :doctitleamdlabel=>"AMENDMENT&nbsp;1",
-      :doctitlecorrlabel=>"TECHNICAL CORRIGENDUM&nbsp;2",
+      :doctitleamdlabel=>"AMENDMENT&#xa0;1",
+      :doctitlecorrlabel=>"TECHNICAL CORRIGENDUM&#xa0;2",
       :doctitleintro=>"Introduction",
       :doctitlemain=>"Main Title&#x2009;&#x2014;&#x2009;Title",
       :doctitlepart=>"Title Part",
-      :doctitlepartlabel=>"Part&nbsp;1",
+      :doctitlepartlabel=>"Part&#xa0;1",
       :doctype=>"Amendment",
       :doctype_display=>"Amendment",
       :docyear=>"2017",
@@ -778,13 +775,8 @@ RSpec.describe IsoDoc do
       :edition=>"2",
       :editorialgroup=>["A 1", "B 2", "C 3"],
       :ics=>"1, 2, 3",
-      :implementeddate=>"XXX",
-      :issueddate=>"XXX",
       :lang=>"en",
-      :obsoleteddate=>"XXX",
-      :publisheddate=>"XXX",
       :publisher=>"International Organization for Standardization",
-      :receiveddate=>"XXX",
       :revdate=>"2000-01-01",
       :revdate_monthyear=>"January 2000",
       :sc=>"B 2",
@@ -794,13 +786,9 @@ RSpec.describe IsoDoc do
       :stage_int=>10,
       :stageabbr=>"NWIP",
       :statusabbr=>"PreNWIP3",
+      :substage_int=>"20",
       :tc=>"A 1",
-      :transmitteddate=>"XXX",
-      :unchangeddate=>"XXX",
       :unpublished=>true,
-      :updateddate=>"XXX",
-      :vote_endeddate=>"XXX",
-      :vote_starteddate=>"XXX",
       :wg=>"C 3"}
     OUTPUT
     expect(metadata(c.info(Nokogiri::XML(input), nil)))
@@ -909,32 +897,28 @@ RSpec.describe IsoDoc do
       </iso-standard>
     INPUT
     output = <<~OUTPUT
-      {:accesseddate=>"XXX",
-      :agency=>"ISO",
-      :circulateddate=>"XXX",
-      :confirmeddate=>"XXX",
-      :copieddate=>"XXX",
+      {:agency=>"ISO",
       :createddate=>"2016-05-01",
       :docnumber=>"ISO/PreNWIP3 17301-1:2016/Amd.1",
       :docnumber_lang=>"ISO/PreNWIP3 17301-1:2016/Amd.1(E)",
       :docnumber_reference=>"ISO/PreNWIP3 17301-1:2016/Amd.1:2017(E)",
       :docnumeric=>"17301",
-      :docsubtitle=>"Introduction&nbsp;&mdash; Main Title&#x2009;&#x2014;&#x2009;Title&nbsp;&mdash; Part&nbsp;1: Title Part",
+      :docsubtitle=>"Introduction&#xa0;&#x2014; Main Title&#x2009;&#x2014;&#x2009;Title&#xa0;&#x2014; Part&#xa0;1: Title Part",
       :docsubtitleamd=>"Mass fraction of extraneous matter, milled rice (nonglutinous), sample dividers and recommendations relating to storage and transport conditions",
-      :docsubtitleamdlabel=>"AMENDMENT&nbsp;1",
-      :docsubtitlecorrlabel=>"TECHNICAL CORRIGENDUM&nbsp;2",
+      :docsubtitleamdlabel=>"AMENDMENT&#xa0;1",
+      :docsubtitlecorrlabel=>"TECHNICAL CORRIGENDUM&#xa0;2",
       :docsubtitleintro=>"Introduction",
       :docsubtitlemain=>"Main Title&#x2009;&#x2014;&#x2009;Title",
       :docsubtitlepart=>"Title Part",
-      :docsubtitlepartlabel=>"Part&nbsp;1",
-      :doctitle=>"Introduction Fran&#xe7;aise&nbsp;&mdash; Titre Principal&nbsp;&mdash; Partie&nbsp;1: Part du Titre",
+      :docsubtitlepartlabel=>"Part&#xa0;1",
+      :doctitle=>"Introduction Fran&#xe7;aise&#xa0;&#x2014; Titre Principal&#xa0;&#x2014; Partie&#xa0;1: Part du Titre",
       :doctitleamd=>"Fraction massique de mati&#xe8;re &#xe9;trang&#xe8;re, riz usin&#xe9; (non gluant), diviseurs d&#x2019;&#xe9;chantillon et recommandations relatives aux conditions d&#x2019;entreposage et de transport",
-      :doctitleamdlabel=>"AMENDMENT&nbsp;1",
-      :doctitlecorrlabel=>"RECTIFICATIF TECHNIQUE&nbsp;2",
+      :doctitleamdlabel=>"AMENDMENT&#xa0;1",
+      :doctitlecorrlabel=>"RECTIFICATIF TECHNIQUE&#xa0;2",
       :doctitleintro=>"Introduction Fran&#xe7;aise",
       :doctitlemain=>"Titre Principal",
       :doctitlepart=>"Part du Titre",
-      :doctitlepartlabel=>"Partie&nbsp;1",
+      :doctitlepartlabel=>"Partie&#xa0;1",
       :doctype=>"Amendment",
       :doctype_display=>"Amendment",
       :docyear=>"2017",
@@ -943,13 +927,8 @@ RSpec.describe IsoDoc do
       :edition=>"2",
       :editorialgroup=>["A 1", "B 2", "C 3"],
       :ics=>"1, 2, 3",
-      :implementeddate=>"XXX",
-      :issueddate=>"XXX",
       :lang=>"fr",
-      :obsoleteddate=>"XXX",
-      :publisheddate=>"XXX",
       :publisher=>"International Organization for Standardization",
-      :receiveddate=>"XXX",
       :revdate=>"2000-01-01",
       :revdate_monthyear=>"Janvier 2000",
       :sc=>"B 2",
@@ -959,13 +938,9 @@ RSpec.describe IsoDoc do
       :stage_int=>10,
       :stageabbr=>"NWIP",
       :statusabbr=>"PreNWIP3",
+      :substage_int=>"20",
       :tc=>"A 1",
-      :transmitteddate=>"XXX",
-      :unchangeddate=>"XXX",
       :unpublished=>true,
-      :updateddate=>"XXX",
-      :vote_endeddate=>"XXX",
-      :vote_starteddate=>"XXX",
       :wg=>"C 3"}
     OUTPUT
     expect(metadata(c.info(Nokogiri::XML(input), nil)))