metanorma-standoc 2.0.6 → 2.0.7

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}
 

data/spec/metanorma/refs_dl_spec.rb

@@ -163,8 +163,9 @@ RSpec.describe Metanorma::Standoc do
         scale::: medium scale
       place:: bib place
       extent::
-        type::: section
-        reference_from::: 7
+        locality:::
+          type:::: section
+          reference_from:::: 7
       accesslocation::
         . accesslocation1
         . accesslocation2
@@ -439,8 +440,10 @@ RSpec.describe Metanorma::Standoc do
           <scale>medium scale</scale>
         </medium>
         <place>bib place</place>
-        <extent type="section">
+        <extent>
+          <locality type="section">
           <referenceFrom>7</referenceFrom>
+          </locality>
         </extent>
         <accesslocation>accesslocation1</accesslocation>
         <accesslocation>accesslocation2</accesslocation>
@@ -534,8 +537,8 @@ RSpec.describe Metanorma::Standoc do
       medium.size:: medium size
       medium.scale:: medium scale
       place:: bib place
-      extent.type:: section
-      extent.reference_from:: 7
+      extent.locality.type:: section
+      extent.locality.reference_from:: 7
       accesslocation:: accesslocation1
       accesslocation:: accesslocation2
       classification.type:: type
@@ -757,8 +760,10 @@ RSpec.describe Metanorma::Standoc do
           <scale>medium scale</scale>
         </medium>
         <place>bib place</place>
-        <extent type="section">
+        <extent>
+        <locality type="section">
           <referenceFrom>7</referenceFrom>
+          </locality>
         </extent>
         <accesslocation>accesslocation1</accesslocation>
         <accesslocation>accesslocation2</accesslocation>

data/spec/metanorma/section_spec.rb

@@ -124,7 +124,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">
+        <term id="term-Term1">
         <preferred><expression><name>Term1</name></expression></preferred>
       </term>
       </terms>
@@ -146,14 +146,14 @@ RSpec.describe Metanorma::Standoc do
         <title>Intro 4</title>
         <terms id="_" obligation="normative">
         <title>Intro 5</title>
-        <term id="term-term1-1">
+        <term id="term-Term1-1">
         <preferred><expression><name>Term1</name></expression></preferred>
       </term>
       </terms>
       </clause>
       <terms id="_" obligation="normative">
         <title>Normal Terms</title>
-        <term id="term-term2">
+        <term id="term-Term2">
         <preferred><expression><name>Term2</name></expression></preferred>
       </term>
       </terms>
@@ -277,7 +277,7 @@ RSpec.describe Metanorma::Standoc do
              <terms id='_' number='3bis' 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-term1' number='4bis'>
+               <term id='term-Term1' number='4bis'>
                  <preferred><expression><name>Term1</name></expression></preferred>
                </term>
              </terms>
@@ -290,7 +290,7 @@ RSpec.describe Metanorma::Standoc do
                    <title>Intro 1</title>
                  </clause>
                </clause>
-               <term id='term-intro-2' number='8bis'>
+               <term id='term-Intro-2' number='8bis'>
                  <preferred><expression><name>Intro 2</name></expression></preferred>
                </term>
                <definitions id='_' number='9bis' obligation='normative'>
@@ -477,7 +477,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" language="en" script="Latn">
+               <term id="term-Term1" language="en" script="Latn">
                <preferred><expression><name>Term1</name></expression></preferred>
              </term>
              </terms>
@@ -499,14 +499,14 @@ RSpec.describe Metanorma::Standoc do
                <title>Intro 4</title>
                <terms id="_" language="en" script="Latn" obligation="normative">
                <title>Intro 5</title>
-               <term id="term-term1-1">
+               <term id="term-Term1-1">
                <preferred><expression><name>Term1</name></expression></preferred>
              </term>
              </terms>
              </clause>
              <terms id="_" language="en" script="Latn" obligation="normative">
                <title>Normal Terms</title>
-               <term id="term-term2">
+               <term id="term-Term2">
                <preferred><expression><name>Term2</name></expression></preferred>
              </term>
              </terms>
@@ -632,7 +632,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-term1'>
+            <term id='term-Term1'>
               <preferred><expression><name>Term1</name></expression></preferred>
             </term>
           </terms>
@@ -641,7 +641,7 @@ RSpec.describe Metanorma::Standoc do
         <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
             <terms id='_' obligation='normative'>
               <title>Normal Terms</title>
-              <term id='term-term2'>
+              <term id='term-Term2'>
                 <preferred><expression><name>Term2</name></expression></preferred>
               </term>
             </terms>
@@ -701,7 +701,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' language='en' tag='x123' multilingual-rendering='all-columns'>
+             <term id='term-Term' language='en' tag='x123' multilingual-rendering='all-columns'>
                <preferred>
                  <expression>
                    <name>Term</name>
@@ -733,7 +733,7 @@ RSpec.describe Metanorma::Standoc do
           <terms id='_' obligation='normative'>
             <title>Terms, definitions and symbols</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></expression></preferred>
             </term>
             <definitions id='_' obligation="normative" type="symbols">
@@ -765,7 +765,7 @@ RSpec.describe Metanorma::Standoc do
           <terms id='_' obligation='normative'>
             <title>Terms, definitions and abbreviated terms</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></expression></preferred>
             </term>
             <definitions id='_' obligation="normative" type="abbreviated_terms">
@@ -798,7 +798,7 @@ RSpec.describe Metanorma::Standoc do
           <terms id='_' obligation='normative'>
             <title>Terms, definitions, symbols and abbreviated terms</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></expression></preferred>
             </term>
             <definitions id='_' type='abbreviated_terms' obligation='normative'>
@@ -959,7 +959,7 @@ RSpec.describe Metanorma::Standoc do
              <terms id="_" obligation="normative">
                 <title>Terms and definitions</title><p id="_">For the purposes of this document, the terms and definitions
         given in <eref bibitemid="iso1234"/> and <eref bibitemid="iso5678"/> and the following apply.</p>
-        <term id="term-term1">
+        <term id="term-Term1">
         <preferred><expression><name>Term1</name></expression></preferred>
       </term>
              </terms></sections>