metanorma-standoc 2.0.6 → 2.1.1

data/spec/metanorma/cleanup_terms_spec.rb

@@ -3,7 +3,6 @@ require "relaton_iec"
 require "fileutils"
 
 RSpec.describe Metanorma::Standoc do
-=begin
   it "processes term and designation metadata and term sources" do
     input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
@@ -88,7 +87,7 @@ RSpec.describe Metanorma::Standoc do
           <terms id='_' obligation='normative'>
             <title>Terms and definitions</title>
             <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
-            <term id='term-first-designation'>
+            <term id='term-First-Designation'>
               <preferred>
                 <expression language='fr' script='Latn' type='prefix' isInternational="true">
                   <name>First Designation</name>
@@ -181,7 +180,7 @@ RSpec.describe Metanorma::Standoc do
     expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
       .to be_equivalent_to xmlpp(output)
   end
-=end
+
   it "permits multiple preferred terms and admitted terms, "\
      "and treats them as synonyms in concepts" do
     input = <<~INPUT
@@ -221,7 +220,7 @@ RSpec.describe Metanorma::Standoc do
                    <terms id='_' obligation='normative'>
         <title>Terms and definitions</title>
         <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
-        <term id='term-first-designation'>
+        <term id='term-First-Designation'>
           <preferred>
             <expression>
               <name>First Designation</name>
@@ -257,7 +256,7 @@ RSpec.describe Metanorma::Standoc do
             term
             <tt>Sixth Designation</tt>
              not resolved via ID
-            <tt>sixth-designation</tt>
+            <tt>Sixth-Designation</tt>
           </strong>
         </related>
         <related type='contrast'>
@@ -265,7 +264,7 @@ RSpec.describe Metanorma::Standoc do
             term
             <tt>Seventh Designation</tt>
              not resolved via ID
-            <tt>seventh-designation</tt>
+            <tt>Seventh-Designation</tt>
           </strong>
         </related>
           <definition><verbal-definition>
@@ -279,21 +278,21 @@ RSpec.describe Metanorma::Standoc do
           <concept>
             <refterm>First Designation</refterm>
             <renderterm>First Designation</renderterm>
-            <xref target='term-first-designation'/>
+            <xref target='term-First-Designation'/>
           </concept>
         </p>
         <p id='_'>
           <concept>
             <refterm>First Designation</refterm>
             <renderterm>Second Designation</renderterm>
-            <xref target='term-first-designation'/>
+            <xref target='term-First-Designation'/>
           </concept>
         </p>
         <p id='_'>
           <concept>
             <refterm>First Designation</refterm>
             <renderterm>Third Designation</renderterm>
-            <xref target='term-first-designation'/>
+            <xref target='term-First-Designation'/>
           </concept>
         </p>
       </clause>
@@ -304,6 +303,81 @@ RSpec.describe Metanorma::Standoc do
       .to be_equivalent_to xmlpp(output)
   end
 
+  it "respects case in tagging of concepts" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+      == Terms and Definitions
+
+      === First Designation
+
+      Definition
+
+      === First designation
+
+      Definition
+
+      == Clause
+
+      {{First Designation}}
+
+      {{First designation}}
+
+    INPUT
+    output = <<~OUTPUT
+      #{BLANK_HDR}
+        <sections>
+          <terms id='_' obligation='normative'>
+            <title>Terms and definitions</title>
+            <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
+            <term id='term-First-Designation'>
+              <preferred>
+                <expression>
+                  <name>First Designation</name>
+                </expression>
+              </preferred>
+              <definition>
+                <verbal-definition>
+                  <p id='_'>Definition</p>
+                </verbal-definition>
+              </definition>
+            </term>
+            <term id='term-First-designation'>
+              <preferred>
+                <expression>
+                  <name>First designation</name>
+                </expression>
+              </preferred>
+              <definition>
+                <verbal-definition>
+                  <p id='_'>Definition</p>
+                </verbal-definition>
+              </definition>
+            </term>
+          </terms>
+          <clause id='_' inline-header='false' obligation='normative'>
+            <title>Clause</title>
+            <p id='_'>
+              <concept>
+                <refterm>First Designation</refterm>
+                <renderterm>First Designation</renderterm>
+                <xref target='term-First-Designation'/>
+              </concept>
+            </p>
+            <p id='_'>
+              <concept>
+                <refterm>First designation</refterm>
+                <renderterm>First designation</renderterm>
+                <xref target='term-First-designation'/>
+              </concept>
+            </p>
+          </clause>
+        </sections>
+      </standard-document>
+    OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
+  end
+
   it "processes letter-symbol designations" do
     input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
@@ -339,7 +413,7 @@ RSpec.describe Metanorma::Standoc do
           <terms id='_' obligation='normative'>
             <title>Terms and definitions</title>
             <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
-            <term id='term-first-designation'>
+            <term id='term-First-Designation'>
               <preferred>
                 <letter-symbol>
                   <name>First Designation</name>
@@ -846,11 +920,11 @@ RSpec.describe Metanorma::Standoc do
                <terms id="_" obligation="normative">
                <title>Terms and definitions</title>
                <p id="_">For the purposes of this document, the following terms and definitions apply.</p>
-               <term id="term-tempus">
+               <term id="term-Tempus">
                <preferred><expression><name>Tempus</name></expression></preferred>
                <domain>relativity</domain><definition><verbal-definition><p id="_"> Time</p></verbal-definition></definition>
              </term>
-             <term id='term-tempus1'>
+             <term id='term-Tempus1'>
         <preferred><expression><name>Tempus1</name></expression></preferred>
         <domain>relativity2</domain>
         <definition><verbal-definition>
@@ -988,7 +1062,7 @@ RSpec.describe Metanorma::Standoc do
       <terms id="_" obligation="normative">
         <title>Terms and definitions</title>
         <p id="_">For the purposes of this document, the following terms and definitions apply.</p>
-        <term id="term-term"><preferred><expression><name>Term</name></expression></preferred>
+        <term id="term-Term"><preferred><expression><name>Term</name></expression></preferred>
         <definition><verbal-definition><p id='_'>Definition</p></verbal-definition></definition>
       <termnote id="_">
         <p id="_">Note</p>
@@ -1067,7 +1141,7 @@ RSpec.describe Metanorma::Standoc do
             <terms id='_' obligation='normative'>
               <title>Terms and definitions</title>
               <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
-              <term id='term-term'>
+              <term id='term-Term'>
                 <preferred>
                   <expression>
                     <name>Term</name>
@@ -1113,7 +1187,7 @@ RSpec.describe Metanorma::Standoc do
                   </origin>
                 </termsource>
               </term>
-              <term id='term-term-2'>
+              <term id='term-Term-2'>
                 <preferred>
                   <expression>
                     <name>Term 2</name>
@@ -1184,7 +1258,7 @@ RSpec.describe Metanorma::Standoc do
            <terms id='_' obligation='normative'>
              <title>Terms and definitions</title>
              <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
-             <term id='term-term'>
+             <term id='term-Term'>
                <preferred>
                  <expression>
                    <name>Term</name>
@@ -1273,7 +1347,7 @@ RSpec.describe Metanorma::Standoc do
         <terms id='_' obligation='normative'>
           <title>Terms and definitions</title>
           <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
-          <term id='term-term'>
+          <term id='term-Term'>
             <preferred>
               <expression>
                 <name>Term</name>
@@ -1363,7 +1437,7 @@ RSpec.describe Metanorma::Standoc do
           <terms id='_' obligation='normative'>
             <title>Terms and definitions</title>
             <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
-            <term id='term-term'>
+            <term id='term-Term'>
               <preferred>
                 <expression>
                   <name>
@@ -1391,7 +1465,7 @@ RSpec.describe Metanorma::Standoc do
                 </letter-symbol>
               </admitted>
             </term>
-            <term id='term-term2'>
+            <term id='term-Term2'>
               <preferred>
                 <expression>
                   <name>

data/spec/metanorma/inline_spec.rb

@@ -581,7 +581,7 @@ RSpec.describe Metanorma::Standoc do
        <title>Terms and definitions</title><p id="_">For the purposes of this document,
            the following terms and definitions apply.</p>
 
-       <term id="term-term1"><preferred><expression><name>Term1</name></expression><termsource status="identical" type="authoritative">
+       <term id="term-Term1"><preferred><expression><name>Term1</name></expression><termsource status="identical" type="authoritative">
        <origin bibitemid="reference" type="inline" citeas="ABC">
        <em>reference</em>
        </origin>

data/spec/metanorma/macros_spec.rb

@@ -370,12 +370,12 @@ RSpec.describe Metanorma::Standoc do
                                   <concept>
                  <refterm>Clause1</refterm>
                  <renderterm>Clause1</renderterm>
-                 <xref target='term-clause1'/>
+                 <xref target='term-Clause1'/>
                </concept>
                <concept>
                  <refterm>Clause1</refterm>
                  <renderterm>Clause 1</renderterm>
-                 <xref target='term-clause1'/>
+                 <xref target='term-Clause1'/>
                </concept>
                <concept>
                  <refterm>Clause 2</refterm>
@@ -396,12 +396,12 @@ RSpec.describe Metanorma::Standoc do
                <concept>
                  <refterm>Clause1</refterm>
                  <renderterm>Clause1</renderterm>
-                 <xref target='symbol-clause1'/>
+                 <xref target='symbol-Clause1'/>
                </concept>
                <concept>
                  <refterm>Clause1</refterm>
                  <renderterm>word</renderterm>
-                 <xref target='symbol-clause1'/>
+                 <xref target='symbol-Clause1'/>
                </concept>
                <concept>
                  <refterm>Clause 2</refterm>
@@ -446,14 +446,14 @@ RSpec.describe Metanorma::Standoc do
                  <terms id='_' obligation='normative'>
                    <title>Terms and definitions</title>
                    <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
-                   <term id='term-clause1'>
+                   <term id='term-Clause1'>
                      <preferred><expression><name>Clause1</name></expression></preferred>
                    </term>
                  </terms>
                  <definitions id='_' obligation='normative'>
                    <title>Symbols and abbreviated terms</title>
                    <dl id='_'>
-                     <dt id="symbol-clause1">Clause1</dt>
+                     <dt id="symbol-Clause1">Clause1</dt>
                      <dd>
                        <p id='_'>A</p>
                      </dd>
@@ -1314,18 +1314,48 @@ RSpec.describe Metanorma::Standoc do
       embed::spec/assets/xref_error.adoc[]
     INPUT
     output = <<~OUTPUT
-      #{BLANK_HDR}
-        <sections>
-          <clause id='clause1' inline-header='false' obligation='normative'>
-            <title>Clause 1</title>
-          </clause>
-          <clause id='_' inline-header='false' obligation='normative'>
-            <title>Clause</title>
-            <p id='_'>
-              <xref target='a'>b</xref>
-            </p>
-          </clause>
-        </sections>
+      <standard-document xmlns='https://www.metanorma.org/ns/standoc' type='semantic' version='#{Metanorma::Standoc::VERSION}'>
+       <bibdata type='standard'>
+         <title language='en' format='text/plain'>Document title</title>
+         <language>en</language>
+         <script>Latn</script>
+         <status>
+           <stage>published</stage>
+         </status>
+         <copyright>
+           <from>2022</from>
+         </copyright>
+         <ext>
+           <doctype>article</doctype>
+         </ext>
+         <relation type='derivedFrom'>
+           <bibitem>
+             <title language='en' format='text/plain'>X</title>
+             <language>en</language>
+             <script>Latn</script>
+             <status>
+               <stage>published</stage>
+             </status>
+             <copyright>
+               <from>2022</from>
+             </copyright>
+             <ext>
+               <doctype>article</doctype>
+             </ext>
+           </bibitem>
+         </relation>
+              </bibdata>
+              <sections>
+                <clause id='clause1' inline-header='false' obligation='normative'>
+                  <title>Clause 1</title>
+                </clause>
+                <clause id='_' inline-header='false' obligation='normative'>
+                  <title>Clause</title>
+                  <p id='_'>
+                    <xref target='a'>b</xref>
+                  </p>
+                </clause>
+              </sections>
       </standard-document>
     OUTPUT
     expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
@@ -1342,12 +1372,42 @@ RSpec.describe Metanorma::Standoc do
       embed::spec/assets/xref_error.adoc[]
     INPUT
     output = <<~OUTPUT
-      #{BLANK_HDR}
-        <sections>
-          <clause id='clause1' inline-header='false' obligation='normative'>
-            <title>Clause</title>
-          </clause>
-        </sections>
+      <standard-document xmlns='https://www.metanorma.org/ns/standoc' type='semantic' version='#{Metanorma::Standoc::VERSION}'>
+              <bibdata type='standard'>
+                  <title language='en' format='text/plain'>Document title</title>
+          <language>en</language>
+          <script>Latn</script>
+          <status>
+            <stage>published</stage>
+          </status>
+          <copyright>
+            <from>2022</from>
+          </copyright>
+          <ext>
+            <doctype>article</doctype>
+          </ext>
+          <relation type='derivedFrom'>
+            <bibitem>
+              <title language='en' format='text/plain'>X</title>
+              <language>en</language>
+              <script>Latn</script>
+              <status>
+                <stage>published</stage>
+              </status>
+              <copyright>
+                <from>2022</from>
+              </copyright>
+              <ext>
+                <doctype>article</doctype>
+              </ext>
+            </bibitem>
+          </relation>
+              </bibdata>
+              <sections>
+                <clause id='clause1' inline-header='false' obligation='normative'>
+                  <title>Clause</title>
+                </clause>
+              </sections>
       </standard-document>
     OUTPUT
     expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
@@ -1380,7 +1440,7 @@ RSpec.describe Metanorma::Standoc do
            </ext>
            <relation type='derivedFrom'>
              <bibitem>
-               <title language='en' format='text/plain'>A2</title>
+               <title language='en' format='text/plain'>X</title>
                <language>en</language>
                <script>Latn</script>
                <status>
@@ -1394,23 +1454,7 @@ RSpec.describe Metanorma::Standoc do
                </ext>
                <relation type='derivedFrom'>
                  <bibitem>
-                   <title language='en' format='text/plain'>A3</title>
-                   <language>en</language>
-                   <script>Latn</script>
-                   <status>
-                     <stage>published</stage>
-                   </status>
-                   <copyright>
-                     <from>2022</from>
-                   </copyright>
-                   <ext>
-                     <doctype>article</doctype>
-                   </ext>
-                 </bibitem>
-               </relation>
-               <relation type='derivedFrom'>
-                 <bibitem>
-                   <title language='en' format='text/plain'>A3a</title>
+                   <title language='en' format='text/plain'>A2</title>
                    <language>en</language>
                    <script>Latn</script>
                    <status>
@@ -1422,6 +1466,38 @@ RSpec.describe Metanorma::Standoc do
                    <ext>
                      <doctype>article</doctype>
                    </ext>
+                   <relation type='derivedFrom'>
+                      <bibitem>
+                        <title language='en' format='text/plain'>A3</title>
+                        <language>en</language>
+                        <script>Latn</script>
+                        <status>
+                          <stage>published</stage>
+                        </status>
+                        <copyright>
+                          <from>2022</from>
+                        </copyright>
+                        <ext>
+                          <doctype>article</doctype>
+                        </ext>
+                      </bibitem>
+                    </relation>
+                    <relation type='derivedFrom'>
+                      <bibitem>
+                        <title language='en' format='text/plain'>A3a</title>
+                        <language>en</language>
+                        <script>Latn</script>
+                        <status>
+                          <stage>published</stage>
+                        </status>
+                        <copyright>
+                          <from>2022</from>
+                        </copyright>
+                        <ext>
+                          <doctype>article</doctype>
+                        </ext>
+                      </bibitem>
+                    </relation>
                  </bibitem>
                </relation>
              </bibitem>
@@ -1444,11 +1520,11 @@ RSpec.describe Metanorma::Standoc do
              <p id='_'>X</p>
            </clause>
            <clause id='_' inline-header='false' obligation='normative'>
-              <title>Clause 3a</title>
+              <title>Clause 4</title>
               <p id='_'>X</p>
             </clause>
            <clause id='_' inline-header='false' obligation='normative'>
-             <title>Clause 4</title>
+             <title>Clause 3a</title>
              <p id='_'>X</p>
            </clause>
          </sections>
@@ -1458,8 +1534,103 @@ RSpec.describe Metanorma::Standoc do
       .to be_equivalent_to xmlpp(output)
   end
 
+  it "processes embed macro with document in a different flavour" do
+    require "metanorma-iso"
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+
+      [[clause1]]
+      == Clause 1
+
+      embed::spec/assets/iso.adoc[]
+    INPUT
+    output = <<~OUTPUT
+      <standard-document xmlns='https://www.metanorma.org/ns/standoc' type='semantic' version='#{Metanorma::Standoc::VERSION}'>
+       <bibdata type='standard'>
+         <title language='en' format='text/plain'>Document title</title>
+         <language>en</language>
+         <script>Latn</script>
+         <status>
+           <stage>published</stage>
+         </status>
+         <copyright>
+           <from>2022</from>
+         </copyright>
+         <ext>
+           <doctype>article</doctype>
+         </ext>
+                    <relation type='derivedFrom'>
+             <bibitem>
+               <title language='en' format='text/plain' type='main'>
+                 Medical devices — Quality management systems — Requirements for
+                 regulatory purposes
+               </title>
+               <title language='en' format='text/plain' type='title-main'>
+                 Medical devices — Quality management systems — Requirements for
+                 regulatory purposes
+               </title>
+               <title language='fr' format='text/plain' type='main'>
+                 Dispositifs médicaux — Systèmes de management de la qualité —
+                 Exigences à des fins réglementaires
+               </title>
+               <title language='fr' format='text/plain' type='title-main'>
+                 Dispositifs médicaux — Systèmes de management de la qualité —
+                 Exigences à des fins réglementaires
+               </title>
+               <contributor>
+                 <role type='author'/>
+                 <organization>
+                   <name>International Organization for Standardization</name>
+                   <abbreviation>ISO</abbreviation>
+                 </organization>
+               </contributor>
+               <contributor>
+                 <role type='publisher'/>
+                 <organization>
+                   <name>International Organization for Standardization</name>
+                   <abbreviation>ISO</abbreviation>
+                 </organization>
+               </contributor>
+               <language>en</language>
+               <script>Latn</script>
+               <status>
+                 <stage abbreviation='IS'>60</stage>
+                 <substage>60</substage>
+               </status>
+               <copyright>
+                 <from>2022</from>
+                 <owner>
+                   <organization>
+                     <name>International Organization for Standardization</name>
+                     <abbreviation>ISO</abbreviation>
+                   </organization>
+                 </owner>
+               </copyright>
+               <ext>
+                 <doctype>article</doctype>
+                 <editorialgroup>
+                   <technical-committee/>
+                   <subcommittee/>
+                   <workgroup/>
+                 </editorialgroup>
+                 <stagename>International standard</stagename>
+               </ext>
+             </bibitem>
+           </relation>
+              </bibdata>
+              <sections>
+                <clause id='clause1' inline-header='false' obligation='normative'>
+                  <title>Clause 1</title>
+                </clause>
+              </sections>
+      </standard-document>
+    OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
+  end
+
   it "processes std-link macro" do
-    VCR.use_cassette "std-link" do
+    VCR.use_cassette("std-link", match_requests_on: %i[method uri body]) do
       input = <<~INPUT
         #{ISOBIB_BLANK_HDR}