metanorma-iso 1.8.5 → 1.9.1

data/spec/asciidoctor/validate_spec.rb

@@ -802,6 +802,18 @@ RSpec.describe Asciidoctor::ISO do
     expect(File.read("test.err"))
       .to include "Symbols and Abbreviated Terms can only contain "\
                   "a definition list"
+
+    Asciidoctor.convert(<<~"INPUT", *OPTIONS)
+      #{VALIDATING_BLANK_HDR}
+
+      == Symbols and Abbreviated Terms
+
+      A:: B
+    INPUT
+    expect(File.read("test.err"))
+      .not_to include "Symbols and Abbreviated Terms can only contain "\
+                  "a definition list"
+
   end
 
   it "Warning if missing foreword" do
@@ -1187,7 +1199,9 @@ RSpec.describe Asciidoctor::ISO do
     expect(File.read("test.err"))
       .not_to include "Only annexes and references can follow clauses"
     expect(File.read("test.err"))
-      .to include "Only terms, annexes and references can follow clauses"
+      .not_to include "Scope must occur before Terms and Definitions"
+    expect(File.read("test.err"))
+      .to include "Only annexes and references can follow terms and clauses"
   end
 
 
@@ -1678,20 +1692,6 @@ RSpec.describe Asciidoctor::ISO do
       .not_to include "exceeds the maximum clause depth of 7"
   end
 
-  it "Warn if term citation in Terms & Definitions not preceded with italicised term" do
-    Asciidoctor.convert(<<~"INPUT", *OPTIONS)
-      #{VALIDATING_BLANK_HDR}
-      == Terms and Definitions
-
-      [[term]]
-      === Term
-
-      The definition of a term (<<term>>) is a part of the specialized vocabulary of a particular field
-    INPUT
-    expect(File.read("test.err"))
-      .to include "term citation not preceded with italicised term"
-  end
-
   it "Warn if an undated reference has no associated footnote" do
     Asciidoctor.convert(<<~"INPUT", *OPTIONS)
       #{VALIDATING_BLANK_HDR}

data/spec/isodoc/amd_spec.rb

@@ -87,7 +87,7 @@ RSpec.describe IsoDoc do
             </foreword>
           </preface>
           <sections>
-            <clause id="scope" displayorder="3">
+            <clause id="scope" displayorder="2">
               <title depth="1">Scope</title>
               <note id="N">
                 <name>NOTE</name>
@@ -99,7 +99,7 @@ RSpec.describe IsoDoc do
                 <xref target="N">Note</xref>
               </p>
             </clause>
-            <terms id="terms" displayorder="2"/>
+            <terms id="terms" displayorder="3"/>
             <clause id="widgets" displayorder="4">
               <title depth="1">Widgets</title>
               <clause id="widgets1" inline-header="true">

data/spec/isodoc/inline_spec.rb

@@ -390,4 +390,474 @@ RSpec.describe IsoDoc do
       </iso-standard>
     OUTPUT
   end
+
+  it "processes concept markup" do
+    input = <<~INPUT
+          <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <sections>
+          <terms id="Terms">
+          <p>
+          <ul>
+                    <li><concept><refterm>term0</refterm>
+              <xref target='clause1'/>
+            </concept></li>
+            <li><concept><refterm>term1</refterm>
+              <renderterm>term</renderterm>
+              <xref target='clause1'/>
+            </concept></li>
+          <li><concept><refterm>term2</refterm>
+              <renderterm>w[o]rd</renderterm>
+              <xref target='clause1'>Clause #1</xref>
+            </concept></li>
+            <li><concept><refterm>term3</refterm>
+              <renderterm>term</renderterm>
+              <eref bibitemid="ISO712" type="inline" citeas="ISO 712"/>
+            </concept></li>
+            <li><concept><refterm>term4</refterm>
+              <renderterm>word</renderterm>
+              <eref bibitemid="ISO712" type="inline" citeas="ISO 712">The Aforementioned Citation</eref>
+            </concept></li>
+            <li><concept><refterm>term5</refterm>
+              <renderterm>word</renderterm>
+              <eref bibitemid="ISO712" type="inline" citeas="ISO 712">
+                <locality type='clause'>
+                  <referenceFrom>3.1</referenceFrom>
+                </locality>
+                <locality type='figure'>
+                  <referenceFrom>a</referenceFrom>
+                </locality>
+              </eref>
+            </concept></li>
+            <li><concept><refterm>term6</refterm>
+              <renderterm>word</renderterm>
+              <eref bibitemid="ISO712" type="inline" citeas="ISO 712">
+              <localityStack>
+                <locality type='clause'>
+                  <referenceFrom>3.1</referenceFrom>
+                </locality>
+              </localityStack>
+              <localityStack>
+                <locality type='figure'>
+                  <referenceFrom>b</referenceFrom>
+                </locality>
+              </localityStack>
+              </eref>
+            </concept></li>
+            <li><concept><refterm>term7</refterm>
+              <renderterm>word</renderterm>
+              <eref bibitemid="ISO712" type="inline" citeas="ISO 712">
+              <localityStack>
+                <locality type='clause'>
+                  <referenceFrom>3.1</referenceFrom>
+                </locality>
+              </localityStack>
+              <localityStack>
+                <locality type='figure'>
+                  <referenceFrom>b</referenceFrom>
+                </locality>
+              </localityStack>
+              The Aforementioned Citation
+              </eref>
+            </concept></li>
+            <li><concept><refterm>term8</refterm>
+              <renderterm>word</renderterm>
+              <termref base='IEV' target='135-13-13'/>
+            </concept></li>
+            <li><concept><refterm>term9</refterm>
+              <renderterm>word</renderterm>
+              <termref base='IEV' target='135-13-13'>The IEV database</termref>
+            </concept></li>
+            <li><concept><refterm>term10</refterm>
+              <renderterm>word</renderterm>
+              <strong>error!</strong>
+            </concept></li>
+            </ul>
+          </p>
+          </terms>
+          <clause id="clause1"><title>Clause 1</title></clause>
+          </sections>
+          <bibliography><references id="_normative_references" obligation="informative" normative="true"><title>Normative References</title>
+          <p>The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
+      <bibitem id="ISO712" type="standard">
+        <title format="text/plain">Cereals or cereal products</title>
+        <title type="main" format="text/plain">Cereals and cereal products</title>
+        <docidentifier type="ISO">ISO 712</docidentifier>
+        <contributor>
+          <role type="publisher"/>
+          <organization>
+            <name>International Organization for Standardization</name>
+          </organization>
+        </contributor>
+      </bibitem>
+      </references></bibliography>
+          </iso-standard>
+    INPUT
+    presxml = <<~OUTPUT
+          <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
+          <sections>
+          <terms id="Terms" displayorder="2"><title>2</title>
+          <p>
+          <ul>
+                    <li>
+              (<xref target="clause1">Clause 3</xref>)
+            </li>
+            <li>
+              <em>term</em>
+              (<xref target="clause1">Clause 3</xref>)
+            </li>
+          <li>
+              <em>w[o]rd</em>
+              (<xref target="clause1">Clause #1</xref>)
+            </li>
+            <li>
+              <em>term</em>
+              (<eref bibitemid="ISO712" type="inline" citeas="ISO 712">ISO 712</eref>)
+            </li>
+            <li>
+              <em>word</em>
+              (<eref bibitemid="ISO712" type="inline" citeas="ISO 712">The Aforementioned Citation</eref>)
+            </li>
+            <li>
+              <em>word</em>
+              (<eref bibitemid="ISO712" type="inline" citeas="ISO 712"><locality type="clause">
+                  <referenceFrom>3.1</referenceFrom>
+                </locality><locality type="figure">
+                  <referenceFrom>a</referenceFrom>
+                </locality>ISO 712, 3.1, Figure a</eref>)
+            </li>
+            <li>
+              <em>word</em>
+              (<eref bibitemid="ISO712" type="inline" citeas="ISO 712"><localityStack>
+                <locality type="clause">
+                  <referenceFrom>3.1</referenceFrom>
+                </locality>
+              </localityStack><localityStack>
+                <locality type="figure">
+                  <referenceFrom>b</referenceFrom>
+                </locality>
+              </localityStack>ISO 712, 3.1; Figure b</eref>)
+            </li>
+            <li>
+              <em>word</em>
+              (<eref bibitemid="ISO712" type="inline" citeas="ISO 712">
+              <localityStack>
+                <locality type="clause">
+                  <referenceFrom>3.1</referenceFrom>
+                </locality>
+              </localityStack>
+              <localityStack>
+                <locality type="figure">
+                  <referenceFrom>b</referenceFrom>
+                </locality>
+              </localityStack>
+              The Aforementioned Citation
+              </eref>)
+            </li>
+            <li>
+              <em>word</em>
+              [term defined in <termref base="IEV" target="135-13-13"/>]
+            </li>
+            <li>
+              <em>word</em>
+              [term defined in <termref base="IEV" target="135-13-13">The IEV database</termref>]
+            </li>
+            <li>
+              <em>word</em>
+              <strong>error!</strong>
+            </li>
+            </ul>
+          </p>
+          </terms>
+          <clause id="clause1" displayorder="3"><title depth="1">3<tab/>Clause 1</title></clause>
+          </sections>
+          <bibliography><references id="_normative_references" obligation="informative" normative="true" displayorder="1"><title depth="1">1<tab/>Normative References</title>
+          <p>The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
+      <bibitem id="ISO712" type="standard">
+        <title format="text/plain">Cereals or cereal products</title>
+        <title type="main" format="text/plain">Cereals and cereal products</title>
+        <docidentifier type="ISO">ISO 712</docidentifier>
+        <contributor>
+          <role type="publisher"/>
+          <organization>
+            <name>International Organization for Standardization</name>
+          </organization>
+        </contributor>
+      </bibitem>
+      </references></bibliography>
+          </iso-standard>
+    OUTPUT
+    output = <<~OUTPUT
+      #{HTML_HDR}
+             <p class='zzSTDTitle1'/>
+             <div>
+               <h1>1&#160; Normative References</h1>
+               <p>
+                 The following documents are referred to in the text in such a way that
+                 some or all of their content constitutes requirements of this
+                 document. For dated references, only the edition cited applies. For
+                 undated references, the latest edition of the referenced document
+                 (including any amendments) applies.
+               </p>
+               <p id='ISO712' class='NormRef'>
+                 ISO 712,
+                 <i>Cereals and cereal products</i>
+               </p>
+             </div>
+             <div id='Terms'>
+               <h1>2</h1>
+               <p>
+                 <ul>
+                   <li>
+                      (
+                     <a href='#clause1'>Clause 3</a>
+                     )
+                   </li>
+                   <li>
+                     <i>term</i>
+                      (
+                     <a href='#clause1'>Clause 3</a>
+                     )
+                   </li>
+                   <li>
+                     <i>w[o]rd</i>
+                      (
+                     <a href='#clause1'>Clause #1</a>
+                     )
+                   </li>
+                   <li>
+                     <i>term</i>
+                      (
+                     <a href='#ISO712'>ISO 712</a>
+                     )
+                   </li>
+                   <li>
+                     <i>word</i>
+                      (
+                     <a href='#ISO712'>The Aforementioned Citation</a>
+                     )
+                   </li>
+                   <li>
+                     <i>word</i>
+                      (
+                     <a href='#ISO712'>ISO 712, 3.1, Figure a</a>
+                     )
+                   </li>
+                   <li>
+                     <i>word</i>
+                      (
+                     <a href='#ISO712'>ISO 712, 3.1; Figure b</a>
+                     )
+                   </li>
+                   <li>
+                     <i>word</i>
+                      (
+                     <a href='#ISO712'> The Aforementioned Citation </a>
+                     )
+                   </li>
+                   <li>
+                     <i>word</i>
+                      [term defined in Termbase IEV, term ID 135-13-13]
+                   </li>
+                   <li>
+                     <i>word</i>
+                      [term defined in The IEV database]
+                   </li>
+                   <li>
+                     <i>word</i>
+                     <b>error!</b>
+                   </li>
+                 </ul>
+               </p>
+             </div>
+             <div id='clause1'>
+               <h1>3&#160; Clause 1</h1>
+             </div>
+           </div>
+         </body>
+       </html>
+    OUTPUT
+    expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({})
+      .convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::Iso::HtmlConvert.new({})
+      .convert("test", presxml, true))).to be_equivalent_to xmlpp(output)
+  end
+
+  it "processes concept markup by context" do
+    input = <<~INPUT
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+      <preface><foreword id="A">
+      <ul>
+      <li><concept><refterm>term1</refterm>
+          <renderterm>term</renderterm>
+          <xref target='clause1'/>
+        </concept></li>
+        </ul>
+      </foreword></preface>
+      <sections>
+      <terms id="Terms">
+      <term id="clause1">
+       <ul>
+      <li><concept><refterm>term1</refterm>
+          <renderterm>term</renderterm>
+          <xref target='clause1'/>
+        </concept></li>
+      <li><concept><refterm>term1</refterm>
+          <renderterm>term</renderterm>
+          <xref target='clause1'/>
+        </concept></li>
+        </ul>
+        </term>
+      </terms>
+      </sections>
+      </iso-standard>
+    INPUT
+    presxml = <<~OUTPUT
+          <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+        <preface>
+          <foreword id='A' displayorder='1'>
+            <ul>
+              <li>term</li>
+            </ul>
+          </foreword>
+        </preface>
+        <sections>
+          <terms id='Terms' displayorder='2'>
+            <title>1</title>
+            <term id='clause1'>
+              <name>1.1</name>
+              <ul>
+                <li>
+                  <em>term</em>
+                   (
+                  <xref target='clause1'>1.1</xref>
+                  )
+                </li>
+                <li>term</li>
+              </ul>
+            </term>
+          </terms>
+        </sections>
+      </iso-standard>
+    OUTPUT
+    expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({})
+       .convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+  end
+ 
+  it "processes concept attributes" do
+    input = <<~INPUT
+       <iso-standard xmlns="http://riboseinc.com/isoxml">
+       <sections>
+       <clause id="clause1"><title>Clause 1</title></clause>
+       <terms id="A">
+       <p>
+       <ul>
+       <li>
+              <concept ital="true"><refterm>term</refterm>
+           <renderterm>term</renderterm>
+           <xref target='clause1'/>
+         </concept></li>
+         <li><concept ref="true"><refterm>term</refterm>
+           <renderterm>term</renderterm>
+           <xref target='clause1'/>
+         </concept></li>
+       <li><concept ital="true" ref="true"><refterm>term</refterm>
+           <renderterm>term</renderterm>
+           <xref target='clause1'/>
+         </concept></li>
+        <li><concept ital="false"><refterm>term</refterm>
+           <renderterm>term</renderterm>
+           <xref target='clause1'/>
+         </concept></li>
+         <li><concept ref="false"><refterm>term</refterm>
+           <renderterm>term</renderterm>
+           <xref target='clause1'/>
+         </concept></li>
+       <li><concept ital="false" ref="false"><refterm>term</refterm>
+           <renderterm>term</renderterm>
+           <xref target='clause1'/>
+         </concept></li>
+        </ul></p>
+       </terms>
+       </sections>
+      </iso-standard>
+    INPUT
+    presxml = <<~OUTPUT
+           <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
+        <sections>
+        <clause id="clause1" displayorder="1"><title depth="1">1<tab/>Clause 1</title></clause>
+        <terms id="A" displayorder="2"><title>2</title>
+        <p>
+        <ul>
+        <li>
+
+            <em>term</em>
+            (<xref target="clause1">Clause 1</xref>)
+          </li>
+          <li>
+            term
+            (<xref target="clause1">Clause 1</xref>)
+          </li>
+        <li>
+            <em>term</em>
+            (<xref target="clause1">Clause 1</xref>)
+          </li>
+         <li>
+            term
+
+          </li>
+          <li>
+            term
+
+          </li>
+        <li>
+            term
+
+          </li>
+         </ul></p>
+        </terms>
+        </sections>
+       </iso-standard>
+    OUTPUT
+    output = <<~OUTPUT
+    #{HTML_HDR}
+       <p class='zzSTDTitle1'/>
+       <div id='clause1'>
+         <h1>1&#160; Clause 1</h1>
+       </div>
+       <div id='A'>
+         <h1>2</h1>
+         <p>
+                          <ul>
+                   <li>
+                     <i>term</i>
+                      (
+                     <a href='#clause1'>Clause 1</a>
+                     )
+                   </li>
+                   <li>
+                      term (
+                     <a href='#clause1'>Clause 1</a>
+                     )
+                   </li>
+                   <li>
+                     <i>term</i>
+                      (
+                     <a href='#clause1'>Clause 1</a>
+                     )
+                   </li>
+                   <li> term </li>
+                   <li> term </li>
+                   <li> term </li>
+                 </ul>
+         </p>
+       </div>
+     </div>
+   </body>
+ </html>
+    OUTPUT
+    expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({})
+      .convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::Iso::HtmlConvert.new({})
+      .convert("test", presxml, true))).to be_equivalent_to xmlpp(output)
+  end
 end