metanorma-standoc 1.4.0 → 1.5.0

data/spec/asciidoctor-standoc/section_spec.rb

@@ -59,7 +59,7 @@ RSpec.describe Asciidoctor::Standoc do
       [.nonterm]
       ==== General
 
-      ==== Symbols 1
+      ==== Symbols
 
       == Abbreviated Terms
 
@@ -82,6 +82,7 @@ RSpec.describe Asciidoctor::Standoc do
     INPUT
              #{BLANK_HDR.sub(/<status>/, "<abstract> <p>Text</p> </abstract><status>")}
     <preface><abstract id="_">
+    <title>Abstract</title>
   <p id="_">Text</p>
 </abstract><foreword id='_' obligation="informative">
   <title>Foreword</title>
@@ -101,7 +102,7 @@ RSpec.describe Asciidoctor::Standoc do
 </preface><sections>
 
 
-<clause id="_" inline-header="false" obligation="normative">
+<clause id="_" inline-header="false" obligation="normative" type="scope">
   <title>Scope</title>
   <p id="_">Text</p>
 </clause>
@@ -143,14 +144,14 @@ RSpec.describe Asciidoctor::Standoc do
   <preferred>Term2</preferred>
 </term>
 </terms>
-<definitions id="_"><title>Symbols and Abbreviated Terms</title><clause id="_" inline-header="false" obligation="normative">
+<definitions id="_" obligation="normative"><title>Symbols and abbreviated terms</title><clause id="_" inline-header="false" obligation="normative">
   <title>General</title>
 </clause>
-<definitions id="_">
-  <title>Symbols 1</title>
+<definitions id="_" obligation="normative" type="symbols">
+  <title>Symbols</title>
 </definitions></definitions></clause>
-<definitions id="_">
-  <title>Abbreviated Terms</title>
+<definitions id="_" obligation="normative" type="abbreviated_terms">
+  <title>Abbreviated terms</title>
 </definitions>
 <clause id="_" inline-header="false" obligation="normative"><title>Clause 4</title><clause id="_" inline-header="false" obligation="normative">
   <title>Introduction</title>
@@ -168,7 +169,7 @@ RSpec.describe Asciidoctor::Standoc do
   <title>Annex A.1</title>
 </clause>
 </annex><bibliography><references id="_" obligation="informative" normative="true">
-  <title>Normative References</title>
+  <title>Normative references</title>
   <p id="_">There are no normative references in this document.</p>
 </references><clause id="_" obligation="informative">
   <title>Bibliography</title>
@@ -256,7 +257,7 @@ RSpec.describe Asciidoctor::Standoc do
       [language=en,script=Latn]
       ==== General
 
-      ==== Symbols 1
+      ==== Symbols
 
       [language=en,script=Latn]
       == Abbreviated Terms
@@ -287,6 +288,7 @@ RSpec.describe Asciidoctor::Standoc do
     INPUT
              #{BLANK_HDR.sub(/<status>/, "<abstract> <p>Text</p> </abstract><status>")}
      <preface><abstract id="_" language="en" script="Latn">
+     <title>Abstract</title>
          <p id="_">Text</p>
        </abstract><foreword id='_' language='en' script='Latn' obligation='informative'>
          <title>Foreword</title>
@@ -306,7 +308,7 @@ RSpec.describe Asciidoctor::Standoc do
 </preface><sections>
 
 
-       <clause id="_" language="en" script="Latn" inline-header="false" obligation="normative">
+       <clause id="_" language="en" script="Latn" inline-header="false" obligation="normative" type="scope">
          <title>Scope</title>
          <p id="_">Text</p>
        </clause>
@@ -348,14 +350,14 @@ RSpec.describe Asciidoctor::Standoc do
          <preferred>Term2</preferred>
        </term>
        </terms>
-       <definitions id="_" language="en" script="Latn"><title>Symbols and Abbreviated Terms</title><clause id="_" language="en" script="Latn" inline-header="false" obligation="normative">
+       <definitions id="_" language="en" script="Latn" obligation="normative"><title>Symbols and abbreviated terms</title><clause id="_" language="en" script="Latn" inline-header="false" obligation="normative">
          <title>General</title>
        </clause>
-       <definitions id="_">
-         <title>Symbols 1</title>
+       <definitions id="_" obligation="normative" type="symbols">
+         <title>Symbols</title>
        </definitions></definitions></clause>
-       <definitions id="_" language="en" script="Latn">
-         <title>Abbreviated Terms</title>
+       <definitions id="_" language="en" script="Latn" obligation="normative" type="abbreviated_terms">
+         <title>Abbreviated terms</title>
        </definitions>
        <clause id="_" language="en" script="Latn" inline-header="false" obligation="normative"><title>Clause 4</title><clause id="_" language="en" script="Latn" inline-header="false" obligation="normative">
          <title>Introduction</title>
@@ -373,7 +375,7 @@ RSpec.describe Asciidoctor::Standoc do
          <title>Annex A.1</title>
        </clause>
        </annex><bibliography><references id="_" language="en" script="Latn" obligation="informative" normative="true">
-         <title>Normative References</title>
+         <title>Normative references</title>
          <p id="_">There are no normative references in this document.</p>
        </references><clause id="_" language="en" script="Latn" obligation="informative">
          <title>Bibliography</title>
@@ -420,10 +422,10 @@ RSpec.describe Asciidoctor::Standoc do
 
       ==== Term2
 
-      [heading=symbols and abbreviated terms]
+      [heading=symbols]
       === Σύμβολα και Συντομογραφίες
 
-      [heading=symbols and abbreviated terms]
+      [heading=abbreviated terms]
       == Σύμβολα και Συντομογραφίες
 
       == Clause 4
@@ -445,6 +447,7 @@ RSpec.describe Asciidoctor::Standoc do
              #{BLANK_HDR.sub(/<status>/, "<abstract> <p>Text</p> </abstract><status>")}
       <preface>
     <abstract id='_'>
+    <title>Abstract</title>
       <p id='_'>Text</p>
     </abstract>
     <foreword id='_' obligation='informative'>
@@ -458,7 +461,7 @@ RSpec.describe Asciidoctor::Standoc do
       </clause>
     </introduction>
     <acknowledgements id='_' obligation='informative'>
-  <title>Ευχαριστίες</title>
+  <title>Acknowledgements</title>
 </acknowledgements>
   </preface>
   <sections>
@@ -470,7 +473,7 @@ RSpec.describe Asciidoctor::Standoc do
       </term>
     </terms>
     <clause id='_' obligation='normative'>
-      <title>Terms and definitions</title>
+      <title>Terms, definitions and symbols</title>
   <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
       <terms id='_' obligation='normative'>
         <title>Normal Terms</title>
@@ -478,12 +481,12 @@ RSpec.describe Asciidoctor::Standoc do
           <preferred>Term2</preferred>
         </term>
       </terms>
-      <definitions id='_'>
-        <title>Σύμβολα και Συντομογραφίες</title>
+      <definitions id='_' obligation="normative" type="symbols">
+        <title>Symbols</title>
       </definitions>
     </clause>
-    <definitions id='_'>
-      <title>Σύμβολα και Συντομογραφίες</title>
+    <definitions id='_' obligation="normative" type="abbreviated_terms">
+      <title>Abbreviated terms</title>
     </definitions>
     <clause id='_' inline-header='false' obligation='normative'>
       <title>Clause 4</title>
@@ -503,7 +506,7 @@ RSpec.describe Asciidoctor::Standoc do
   </annex>
   <bibliography>
     <references id='_' obligation='informative' normative="true">
-      <title>Normative References</title>
+      <title>Normative references</title>
       <p id="_">There are no normative references in this document.</p>
     </references>
     <clause id='_' obligation='informative'>
@@ -537,7 +540,7 @@ RSpec.describe Asciidoctor::Standoc do
       <term id='_'>
         <preferred>Term</preferred>
       </term>
-      <definitions id='_'>
+      <definitions id='_' obligation="normative" type="symbols">
         <title>Symbols</title>
       </definitions>
     </terms>
@@ -554,6 +557,7 @@ RSpec.describe Asciidoctor::Standoc do
 
       === Term
       
+      [heading="abbreviated terms"]
       === Symbols
 
       INPUT
@@ -565,8 +569,8 @@ RSpec.describe Asciidoctor::Standoc do
       <term id='_'>
         <preferred>Term</preferred>
       </term>
-      <definitions id='_'>
-        <title>Symbols</title>
+      <definitions id='_' obligation="normative" type="abbreviated_terms">
+        <title>Abbreviated terms</title>
       </definitions>
     </terms>
   </sections>
@@ -671,12 +675,12 @@ RSpec.describe Asciidoctor::Standoc do
              #{BLANK_HDR}
              <sections>
   <terms id='_' obligation='normative'>
-    <title>Terms, definitions, symbols and abbreviated terms</title>
+    <title>Terms, definitions and symbols</title>
     <p id='_'>No terms and definitions are listed in this document.</p>
     <clause id='_' inline-header='false' obligation='normative'>
       <title>Terms and definitions</title>
     </clause>
-    <definitions id='_'>
+    <definitions id='_' obligation="normative" type="symbols">
       <title>Symbols</title>
     </definitions>
   </terms>
@@ -787,11 +791,11 @@ RSpec.describe Asciidoctor::Standoc do
      #{BLANK_HDR.sub(%r{<language>en</language>}, "<language>fr</language>")}
              <termdocsource bibitemid="iso1234"/><termdocsource bibitemid="iso5678"/>
         <preface><foreword id='_' obligation="informative">
-         <title>Foreword</title>
+         <title>Avant-propos</title>
          <p id="_">Foreword</p>
        </foreword></preface><sections>
        <terms id="_" obligation="normative">
-         <title>Terms and definitions</title>
+         <title>Terms et définitions</title>
         <p id="_">Pour les besoins du présent document, les termes et définitions de <eref bibitemid="iso1234"/> et <eref bibitemid="iso5678"/> s’appliquent.</p>
 
 
@@ -820,11 +824,11 @@ RSpec.describe Asciidoctor::Standoc do
      INPUT
      #{BLANK_HDR.sub(%r{<language>en</language>}, "<language>zh</language>").sub(%r{<script>Latn</script>}, "<script>Hans</script>")}
        <termdocsource bibitemid="iso1234"/><termdocsource bibitemid="iso5678"/><preface><foreword id='_' obligation="informative">
-         <title>Foreword</title>
+         <title>前言</title>
          <p id="_">Foreword</p>
        </foreword></preface><sections>
        <terms id="_" obligation="normative">
-         <title>Terms and definitions</title><p id="_"><eref bibitemid="iso1234"/>和<eref bibitemid="iso5678"/>界定的术语和定义适用于本文件。</p>
+         <title>术语和定义</title><p id="_"><eref bibitemid="iso1234"/>和<eref bibitemid="iso5678"/>界定的术语和定义适用于本文件。</p>
      
          
          
@@ -858,12 +862,12 @@ INPUT
 #{BLANK_HDR}
   <sections>
     <terms id='tda' obligation='normative'>
-      <title>Terms, definitions, symbols and abbreviated terms</title>
+      <title>Terms, definitions and symbols</title>
       <p id='_'>No terms and definitions are listed in this document.</p>
       <clause id='terms' inline-header='false' obligation='normative'>
         <title>Terms and definitions</title>
       </clause>
-      <definitions id='_'>
+      <definitions id='_' obligation="normative" type="symbols">
         <title>Symbols</title>
       </definitions>
     </terms>
@@ -895,7 +899,7 @@ _time_ (<<term-time>>) on the _calendar_ (<<term-calendar>>) _time scale_ (<<ter
 INPUT
 #{BLANK_HDR}
  <sections>
-   <clause id='_' inline-header='false' obligation='normative'>
+   <clause id='_' inline-header='false' obligation='normative' type="scope">
      <title>Scope</title>
    </clause>
    <clause id='tda' obligation='normative'>
@@ -963,7 +967,7 @@ INPUT
   </preface>
   <sections> </sections>
   <annex id='_' obligation='' language='fr' script=''>
-    <definitions id='sym' language='fr'>
+    <definitions id='sym' language='fr' obligation="normative">
       <title>Symbols and abbreviated terms</title>
     </definitions>
   </annex>

data/spec/asciidoctor-standoc/table_spec.rb

@@ -114,7 +114,7 @@ RSpec.describe Asciidoctor::Standoc do
   it "processes complex tables" do
     expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)))).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%]
+      [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
       |===
       .2+|Defect 4+^| Maximum permissible mass fraction of defects in husked rice +
@@ -144,13 +144,13 @@ RSpec.describe Asciidoctor::Standoc do
     INPUT
             #{BLANK_HDR}
        <sections>
-         <table id="_" alt="An extensive summary, and illustration, of tables" unnumbered="true" subsequence="A" summary="This is an extremely long, convoluted summary" width="70%">
+         <table id="_" alt="An extensive summary, and illustration, of tables" unnumbered="true" subsequence="A" summary="This is an extremely long, convoluted summary" width="70%" number="3" keep-with-next="true" keep-lines-together="true">
          <name>Maximum <em>permissible</em> mass fraction of defects</name>
          <thead>
            <tr>
              <th rowspan="2" align="left">Defect</th>
              <th colspan="4" align="center">Maximum permissible mass fraction of defects in husked rice<br/>
-             <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mi>w</mi><mi>max</mi></msub></math></stem></th>
+             <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub><mi>w</mi><mo>max</mo></msub></math></stem></th>
            </tr>
          <tr>
              <th align="left">in husked rice</th>

data/spec/asciidoctor-standoc/validate_spec.rb

@@ -9,6 +9,62 @@ RSpec.describe Asciidoctor::Standoc do
   expect(File.exist?("spec/assets/xref_error.err")).to be true
   end
 
+  it "warns about missing fields in asciibib" do
+  FileUtils.rm_f "test.err"
+  Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true) 
+      #{VALIDATING_BLANK_HDR}
+  
+      [bibliography]
+      == Normative References
+
+      [%bibitem]
+      === Standard
+      id:: iso123
+      type:: standard
+      contributor:: 
+        role::: publisher
+        organization:::
+          name:::: ISO
+      contributor::
+        role::: author
+        person:::
+          name::::
+      +
+      --
+      completename::
+        language::: en
+        content::: Fred
+      --
+      contributor::
+        role::: author
+        person:::
+        name::::
+          completename::::: Jack
+
+    INPUT
+  errf = File.read("test.err")
+  expect(errf).to include "Reference iso123 is missing a document identifier (docid)"
+  end
+
+    it "warns about missing fields in asciibib" do
+  FileUtils.rm_f "test.err"
+  Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)
+      #{VALIDATING_BLANK_HDR}
+      
+      [bibliography]
+      == Normative References
+
+      [%bibitem]
+      === Standard
+      type:: standard
+      contributor::
+        role::: publisher
+        organization:::
+          name:::: ISO
+INPUT
+  errf = File.read("test.err")
+  expect(errf).to include "The following reference is missing an anchor"
+  end
   it "warns about malformed LaTeX" do
   FileUtils.rm_f "test.err"
   Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true) 

data/spec/assets/i18n.yaml

@@ -1,2 +1,17 @@
-foreword: Enkonduko
-
+foreword: Antaŭparolo
+introduction: Enkonduko
+clause: klaŭzo
+table: Tabelo
+source: SOURCE
+modified: modified
+scope: Amplekso
+symbols: Simboloj kai mallongigitaj terminoj
+annex: Aldono
+normref: Normaj citaĵoj
+bibliography: Bibliografio
+inform_annex: informa
+norm_annex: norma
+all_parts: ĉiuj partoj
+locality: {
+  table: Tabelo
+}

data/spec/assets/iso123.rxl

@@ -0,0 +1,107 @@
+ <bibdata id='iso123' xmlns='http://www.example.com' type='standard'>
+               <fetched>2020-06-12</fetched>
+               <title type='title-intro' format='text/plain' language='en' script='Latn'>Rubber latex</title>
+               <title type='title-main' format='text/plain' language='en' script='Latn'>Sampling</title>
+               <title type='main' format='text/plain' language='en' script='Latn'>Rubber latex – Sampling</title>
+               <title type='title-intro' format='text/plain' language='fr' script='Latn'>Latex de caoutchouc</title>
+               <title type='title-main' format='text/plain' language='fr' script='Latn'>Échantillonnage</title>
+               <title type='main' format='text/plain' language='fr' script='Latn'>Latex de caoutchouc – Échantillonnage</title>
+               <uri type='src'>https://www.iso.org/standard/23281.html</uri>
+               <uri type='obp'>https://www.iso.org/obp/ui/#!iso:std:23281:en</uri>
+               <uri type='rss'>https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</uri>
+               <docidentifier type='ISO'>ISO 123 (all parts)</docidentifier>
+               <docnumber>123</docnumber>
+               <date type='published'>
+                 <on>2001</on>
+               </date>
+               <contributor>
+                 <role type='publisher'/>
+                 <organization>
+                   <name>International Organization for Standardization</name>
+                   <abbreviation>ISO</abbreviation>
+                   <uri>www.iso.org</uri>
+                 </organization>
+               </contributor>
+               <edition>3</edition>
+               <language>en</language>
+               <language>fr</language>
+               <script>Latn</script>
+               <status>
+                 <stage>90</stage>
+                 <substage>93</substage>
+               </status>
+               <copyright>
+                 <from>2001</from>
+                 <owner>
+                   <organization>
+                     <name>ISO</name>
+                   </organization>
+                 </owner>
+               </copyright>
+               <relation type='obsoletes'>
+                 <bibitem type='standard'>
+                   <formattedref format='text/plain'>ISO 123:1985</formattedref>
+                 </bibitem>
+               </relation>
+               <relation type='instance'>
+                 <bibitem type='standard'>
+                   <fetched>2020-06-12</fetched>
+                   <title type='title-intro' format='text/plain' language='en' script='Latn'>Rubber latex</title>
+                   <title type='title-main' format='text/plain' language='en' script='Latn'>Sampling</title>
+                   <title type='main' format='text/plain' language='en' script='Latn'>Rubber latex – Sampling</title>
+                   <title type='title-intro' format='text/plain' language='fr' script='Latn'>Latex de caoutchouc</title>
+                   <title type='title-main' format='text/plain' language='fr' script='Latn'>Échantillonnage</title>
+                   <title type='main' format='text/plain' language='fr' script='Latn'>Latex de caoutchouc – Échantillonnage</title>
+                   <uri type='src'>https://www.iso.org/standard/23281.html</uri>
+                   <uri type='obp'>https://www.iso.org/obp/ui/#!iso:std:23281:en</uri>
+                   <uri type='rss'>https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</uri>
+                   <docidentifier type='ISO'>ISO 123:2001</docidentifier>
+                   <docnumber>123</docnumber>
+                   <date type='published'>
+                     <on>2001</on>
+                   </date>
+                   <contributor>
+                     <role type='publisher'/>
+                     <organization>
+                       <name>International Organization for Standardization</name>
+                       <abbreviation>ISO</abbreviation>
+                       <uri>www.iso.org</uri>
+                     </organization>
+                   </contributor>
+                   <edition>3</edition>
+                   <language>en</language>
+                   <language>fr</language>
+                   <script>Latn</script>
+                   <status>
+                     <stage>90</stage>
+                     <substage>93</substage>
+                   </status>
+                   <copyright>
+                     <from>2001</from>
+                     <owner>
+                       <organization>
+                         <name>ISO</name>
+                       </organization>
+                     </owner>
+                   </copyright>
+                   <relation type='obsoletes'>
+                     <bibitem type='standard'>
+                       <formattedref format='text/plain'>ISO 123:1985</formattedref>
+                     </bibitem>
+                   </relation>
+                   <place>Geneva</place>
+                 </bibitem>
+               </relation>
+               <relation type='instance'>
+                 <bibitem type='standard'>
+                   <formattedref format='text/plain'>ISO 123:1985</formattedref>
+                 </bibitem>
+               </relation>
+               <relation type='instance'>
+                 <bibitem type='standard'>
+                   <formattedref format='text/plain'>ISO 123:1974</formattedref>
+                 </bibitem>
+               </relation>
+               <place>Geneva</place>
+             </bibdata>
+