metanorma-iso 2.1.7 → 2.1.8

data/spec/metanorma/cleanup_spec.rb

@@ -1505,5 +1505,141 @@ RSpec.describe Metanorma::ISO do
       expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
         .to be_equivalent_to xmlpp(output)
     end
+
+    it "does not allows subterms outside of vocabulary document" do
+      input = <<~INPUT
+        = Document title
+        Author
+        :docfile: test.adoc
+        :nodoc:
+        :novalid:
+        :no-isobib:
+
+        == Terms and definitions
+
+        === Term1
+
+        === Term2
+
+        ==== Term2a
+      INPUT
+      output = <<~OUTPUT
+        #{BLANK_HDR}
+        <sections>
+           <clause id='_' obligation='normative'>
+             <title>Terms and definitions</title>
+             <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
+             <p id='_'>
+               ISO and IEC maintain terminology databases for use in standardization at
+               the following addresses:
+             </p>
+             <ul id='_'>
+               <li>
+                 <p id='_'>
+                   ISO Online browsing platform: available at
+                   <link target='https://www.iso.org/obp'/>
+                 </p>
+               </li>
+               <li>
+                 <p id='_'>
+                   IEC Electropedia: available at
+                   <link target='https://www.electropedia.org'/>
+                 </p>
+               </li>
+             </ul>
+             <term id='term-Term1'>
+               <preferred>
+                 <expression>
+                   <name>Term1</name>
+                 </expression>
+               </preferred>
+             </term>
+             <terms id='_' obligation='normative'>
+               <title>Term2</title>
+               <term id='term-Term2a'>
+                 <preferred>
+                   <expression>
+                     <name>Term2a</name>
+                   </expression>
+                 </preferred>
+               </term>
+             </terms>
+           </clause>
+         </sections>
+       </iso-standard>
+      OUTPUT
+      expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+        .to be_equivalent_to xmlpp(output)
+    end
+    
+    it "allows subterms in vocabulary document" do
+      input = <<~INPUT
+        = Document title
+        Author
+        :docfile: test.adoc
+        :nodoc:
+        :novalid:
+        :no-isobib:
+        :docsubtype: vocabulary
+
+        == Terms and definitions
+
+        === Term1
+
+        === Term2
+
+        ==== Term2a
+      INPUT
+      output = <<~OUTPUT
+        #{BLANK_HDR.sub(%r{</doctype>}, '</doctype><subdoctype>vocabulary</subdoctype>')}
+                 <sections>
+           <terms id='_' obligation='normative'>
+             <title>Terms and definitions</title>
+             <p id='_'>
+               ISO and IEC maintain terminology databases for use in standardization at
+               the following addresses:
+             </p>
+             <ul id='_'>
+               <li>
+                 <p id='_'>
+                   ISO Online browsing platform: available at 
+                   <link target='https://www.iso.org/obp'/>
+                 </p>
+               </li>
+               <li>
+                 <p id='_'>
+                   IEC Electropedia: available at 
+                   <link target='https://www.electropedia.org'/>
+                 </p>
+               </li>
+             </ul>
+             <term id='term-Term1'>
+               <preferred>
+                 <expression>
+                   <name>Term1</name>
+                 </expression>
+               </preferred>
+             </term>
+             <term id='term-Term2'>
+               <preferred>
+                 <expression>
+                   <name>Term2</name>
+                 </expression>
+               </preferred>
+               <term id='term-Term2a'>
+                 <preferred>
+                   <expression>
+                     <name>Term2a</name>
+                   </expression>
+                 </preferred>
+               </term>
+             </term>
+           </terms>
+         </sections>
+         </iso-standard>
+      OUTPUT
+      expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+        .to be_equivalent_to xmlpp(output)
+    end
   end
 end

data/spec/metanorma/macros_spec.rb

@@ -0,0 +1,99 @@
+require "spec_helper"
+
+RSpec.describe Metanorma::Standoc do
+  it "processes embed macro with document in a different flavour" do
+    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>standard</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>standard</doctype>
+                 <editorialgroup>
+                   <agency>ISO</agency>
+                 </editorialgroup>
+                 <approvalgroup>
+           <agency>ISO</agency>
+         </approvalgroup>
+                 <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, backend: :standoc, header_footer: true))))
+      .to be_equivalent_to xmlpp(output)
+  end
+end

data/spec/metanorma/processor_spec.rb

@@ -9,95 +9,95 @@ RSpec.describe Metanorma::Iso::Processor do
   processor = registry.find_processor(:iso)
 
   inputxml = <<~INPUT
-      <iso-standard xmlns="http://riboseinc.com/isoxml">
-<bibdata type="standard">
-<title language="en" format="text/plain" type="main">English</title>
-<title language="en" format="text/plain" type="title-main">English</title>
-<title language="fr" format="text/plain" type="main">French</title>
-<title language="fr" format="text/plain" type="title-main">French</title>
-<docidentifier type="ISO">ISO DIR 1</docidentifier><docidentifier type="iso-with-lang">ISO DIR 1(F)</docidentifier><docidentifier type="iso-reference">ISO DIR 1(F)</docidentifier>
-<docnumber>1</docnumber>
-<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>fr</language>
-<script>Latn</script>
-<status>
-<stage abbreviation="IS">60</stage>
-<substage>60</substage>
-</status>
-<copyright>
-<from>#{Time.new.year}</from>
-<owner>
-<organization>
-<name>International Organization for Standardization</name>
-<abbreviation>ISO</abbreviation>
-</organization>
-</owner>
-</copyright>
-<ext>
-<doctype>directive</doctype>
-<subdoctype>vocabulary</subdoctype>
-<editorialgroup>
-<technical-committee/>
-<subcommittee/>
-<workgroup/>
-</editorialgroup>
-<structuredidentifier>
-<project-number>ISO 1</project-number>
-</structuredidentifier>
-<stagename>International standard</stagename>
-</ext>
-</bibdata>
-<boilerplate>
-  <copyright-statement>
-    <clause>
-      <title>DOCUMENT PROT&#201;G&#201; PAR COPYRIGHT</title>
-    <p id="boilerplate-year">&#169; ISO 2021</p>
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <bibdata type="standard">
+    <title language="en" format="text/plain" type="main">English</title>
+    <title language="en" format="text/plain" type="title-main">English</title>
+    <title language="fr" format="text/plain" type="main">French</title>
+    <title language="fr" format="text/plain" type="title-main">French</title>
+    <docidentifier type="ISO">ISO DIR 1</docidentifier><docidentifier type="iso-with-lang">ISO DIR 1(F)</docidentifier><docidentifier type="iso-reference">ISO DIR 1(F)</docidentifier>
+    <docnumber>1</docnumber>
+    <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>fr</language>
+    <script>Latn</script>
+    <status>
+    <stage abbreviation="IS">60</stage>
+    <substage>60</substage>
+    </status>
+    <copyright>
+    <from>#{Time.new.year}</from>
+    <owner>
+    <organization>
+    <name>International Organization for Standardization</name>
+    <abbreviation>ISO</abbreviation>
+    </organization>
+    </owner>
+    </copyright>
+    <ext>
+    <doctype>directive</doctype>
+    <subdoctype>vocabulary</subdoctype>
+    <editorialgroup>
+    <technical-committee/>
+    <subcommittee/>
+    <workgroup/>
+    </editorialgroup>
+    <structuredidentifier>
+    <project-number>ISO 1</project-number>
+    </structuredidentifier>
+    <stagename>International standard</stagename>
+    </ext>
+    </bibdata>
+    <boilerplate>
+      <copyright-statement>
+        <clause>
+          <title>DOCUMENT PROT&#201;G&#201; PAR COPYRIGHT</title>
+        <p id="boilerplate-year">&#169; ISO 2021</p>
 
-  <p id="boilerplate-message">
-Droits de reproduction r&#233;serv&#233;s. Sauf indication contraire, aucune partie de cette publication ne
-peut &#234;tre reproduite ni utilis&#233;e sous quelque forme que ce soit et par aucun proc&#233;d&#233;, &#233;lectronique
-ou m&#233;canique, y compris la photocopie, l&#8217;affichage sur l&#8217;internet ou sur un Intranet, sans
-autorisation &#233;crite pr&#233;alable. Les demandes d&#8217;autorisation peuvent &#234;tre adress&#233;es &#224; l&#8217;ISO &#224;
-l&#8217;adresse ci-apr&#232;s ou au comit&#233; membre de l&#8217;ISO dans le pays du demandeur.
-  </p>
+      <p id="boilerplate-message">
+    Droits de reproduction r&#233;serv&#233;s. Sauf indication contraire, aucune partie de cette publication ne
+    peut &#234;tre reproduite ni utilis&#233;e sous quelque forme que ce soit et par aucun proc&#233;d&#233;, &#233;lectronique
+    ou m&#233;canique, y compris la photocopie, l&#8217;affichage sur l&#8217;internet ou sur un Intranet, sans
+    autorisation &#233;crite pr&#233;alable. Les demandes d&#8217;autorisation peuvent &#234;tre adress&#233;es &#224; l&#8217;ISO &#224;
+    l&#8217;adresse ci-apr&#232;s ou au comit&#233; membre de l&#8217;ISO dans le pays du demandeur.
+      </p>
 
-  <p id="boilerplate-address" align="left">
-    ISO copyright office<br/>
-    Ch. de Blandonnet 8 &#8226; CP 401<br/>
-    CH-1214 Vernier, Geneva, Switzerland<br/>
-    Phone: +41 22 749 01 11<br/>
-    Email: copyright@iso.org<br/>
-    Website: www.iso.org
-  </p>
-    <p id="boilerplate-place">
-    Publi&#233; en Suisse
-  </p>
-</clause>
-  </copyright-statement>
+      <p id="boilerplate-address" align="left">
+        ISO copyright office<br/>
+        Ch. de Blandonnet 8 &#8226; CP 401<br/>
+        CH-1214 Vernier, Geneva, Switzerland<br/>
+        Phone: +41 22 749 01 11<br/>
+        Email: copyright@iso.org<br/>
+        Website: www.iso.org
+      </p>
+        <p id="boilerplate-place">
+        Publi&#233; en Suisse
+      </p>
+    </clause>
+      </copyright-statement>
 
 
-</boilerplate>
-      <sections>
-        <terms id="H" obligation="normative"><title>1&#xA0; Terms, Definitions, Symbols and Abbreviated Terms</title>
-          <term id="J">
-            <name>1.1</name>
-            <preferred>Term2</preferred>
-          </term>
-        </terms>
-      </sections>
+    </boilerplate>
+          <sections>
+            <terms id="H" obligation="normative"><title>1&#xA0; Terms, Definitions, Symbols and Abbreviated Terms</title>
+              <term id="J">
+                <name>1.1</name>
+                <preferred>Term2</preferred>
+              </term>
+            </terms>
+          </sections>
     </iso-standard>
   INPUT
 
@@ -152,7 +152,7 @@ l&#8217;adresse ci-apr&#232;s ou au comit&#233; membre de l&#8217;ISO dans le pa
     FileUtils.rm_f "test.xml"
     FileUtils.rm_f "test.sts.xml"
     FileUtils.rm_f "test.iso.sts.xml"
-    File.open("test.xml", "w") { |f| f.write inputxml }
+    File.write("test.xml", inputxml)
     processor.output(inputxml, "test.xml", "test.sts.xml", :sts)
     processor.output(inputxml, "test.xml", "test.iso.sts.xml", :isosts)
     expect(File.exist?("test.sts.xml")).to be true

data/spec/metanorma/validate_spec.rb

@@ -35,102 +35,103 @@ RSpec.describe Metanorma::ISO do
       :partnumber: 1
       :edition: 2
       :amendment-number: 3
+      :data-uri-image: false
 
       .Split-it-right sample divider
-      image::spec/examples/rice_images/rice_image1.png[]
-      image::spec/examples/rice_images/SL1000-1_ed2amd3fig1.png[]
-      image::spec/examples/rice_images/1001_ed2amd3fig1.png[]
-      image::spec/examples/rice_images/ISO_1213_1.png[]
-      image::spec/examples/rice_images/1000-1_ed2amd3figA.png[]
+      image::spec/examples/rice_img/rice_image1.png[]
+      image::spec/examples/rice_img/SL1000-1_ed2amd3fig1.png[]
+      image::spec/examples/rice_img/1001_ed2amd3fig1.png[]
+      image::spec/examples/rice_img/ISO_1213_1.png[]
+      image::spec/examples/rice_img/1000-1_ed2amd3figA.png[]
 
       |===
       |a |b
 
-      a|image::spec/examples/rice_images/1000-1_ed2amd3figTab1.png[]#{' '}
-      a|image::spec/examples/rice_images/1000-1_ed2amd3fig2.png[]
+      a|image::spec/examples/rice_img/1000-1_ed2amd3figTab1.png[]
+      a|image::spec/examples/rice_img/1000-1_ed2amd3fig2.png[]
       |===
 
-      image::spec/examples/rice_images/1000-1_ed2amd3figTab2.png[]
+      image::spec/examples/rice_img/1000-1_ed2amd3figTab2.png[]
 
-      image::spec/examples/rice_images/1000-1_ed2amd3figA1.png[]
-      image::spec/examples/rice_images/1000-1_ed2amd3fig1a.png[]
+      image::spec/examples/rice_img/1000-1_ed2amd3figA1.png[]
+      image::spec/examples/rice_img/1000-1_ed2amd3fig1a.png[]
 
       .Stages of gelatinization
       ====
-      image::spec/examples/rice_images/1000-1_ed2amd3fig1b.png[]
+      image::spec/examples/rice_img/1000-1_ed2amd3fig1b.png[]
 
-      image::spec/examples/rice_images/1000-1_ed2amd3fig4.png[]
+      image::spec/examples/rice_img/1000-1_ed2amd3fig4.png[]
       ====
 
-      image::spec/examples/rice_images/1000-1_ed2amd3fig5_f.png[]
+      image::spec/examples/rice_img/1000-1_ed2amd3fig5_f.png[]
 
       [appendix]
       == Annex
-      image::spec/examples/rice_images/1000-1_ed2amd3figA2.png[]
-      image::spec/examples/rice_images/1000-1_ed2amd3fig3.png[]
+      image::spec/examples/rice_img/1000-1_ed2amd3figA2.png[]
+      image::spec/examples/rice_img/1000-1_ed2amd3fig3.png[]
 
     INPUT
     expect(File.read("test.err")).to include \
-      "image name spec/examples/rice_images/rice_image1.png does not match "\
+      "image name spec/examples/rice_img/rice_image1.png does not match "\
       "DRG requirements: expect 1000-1_ed2amd3fig"
     expect(File.read("test.err")).to include \
-      "image name spec/examples/rice_images/1001_ed2amd3fig1.png does not "\
+      "image name spec/examples/rice_img/1001_ed2amd3fig1.png does not "\
       "match DRG requirements: " \
       "expect 1000-1_ed2amd3fig"
     expect(File.read("test.err")).not_to include \
-      "image name spec/examples/rice_images/SL1000-1_ed2amd3fig1.png does not "\
+      "image name spec/examples/rice_img/SL1000-1_ed2amd3fig1.png does not "\
       "match DRG requirements: " \
       "expect 1000-1_ed2amd3fig"
     expect(File.read("test.err")).not_to include \
-      "image name spec/examples/rice_images/ISO_1213_1.png does not match DRG "\
+      "image name spec/examples/rice_img/ISO_1213_1.png does not match DRG "\
       "requirements: expect 1000-1_ed2amd3fig"
     expect(File.read("test.err")).to include \
-      "image name spec/examples/rice_images/1000-1_ed2amd3figA.png does not "\
+      "image name spec/examples/rice_img/1000-1_ed2amd3figA.png does not "\
       "match DRG requirements"
     expect(File.read("test.err")).not_to include \
-      "image name spec/examples/rice_images/1000-1_ed2amd3figTab1.png does "\
+      "image name spec/examples/rice_img/1000-1_ed2amd3figTab1.png does "\
       "not match DRG requirements"
     expect(File.read("test.err")).not_to include \
-      "image name spec/examples/rice_images/1000-1_ed2amd3figTab1.png is "\
+      "image name spec/examples/rice_img/1000-1_ed2amd3figTab1.png is "\
       "under a table but is not so labelled"
     expect(File.read("test.err")).to include \
-      "image name spec/examples/rice_images/1000-1_ed2amd3fig2.png is under "\
+      "image name spec/examples/rice_img/1000-1_ed2amd3fig2.png is under "\
       "a table but is not so labelled"
     expect(File.read("test.err")).to include \
-      "image name spec/examples/rice_images/1000-1_ed2amd3figTab2.png is "\
+      "image name spec/examples/rice_img/1000-1_ed2amd3figTab2.png is "\
       "labelled as under a table but is not"
     expect(File.read("test.err")).not_to include \
-      "image name spec/examples/rice_images/1000-1_ed2amd3fig1.png is "\
+      "image name spec/examples/rice_img/1000-1_ed2amd3fig1.png is "\
       "labelled as under a table but is not"
     expect(File.read("test.err")).not_to include \
-      "image name spec/examples/rice_images/1000-1_ed2amd3figA2.png is "\
+      "image name spec/examples/rice_img/1000-1_ed2amd3figA2.png is "\
       "under an annex but is not so labelled"
     expect(File.read("test.err")).to include \
-      "image name spec/examples/rice_images/1000-1_ed2amd3fig3.png is "\
+      "image name spec/examples/rice_img/1000-1_ed2amd3fig3.png is "\
       "under an annex but is not so labelled"
     expect(File.read("test.err")).to include \
-      "image name spec/examples/rice_images/1000-1_ed2amd3figA1.png is "\
+      "image name spec/examples/rice_img/1000-1_ed2amd3figA1.png is "\
       "labelled as under an annex but is not"
     expect(File.read("test.err")).not_to include \
-      "image name spec/examples/rice_images/1000-1_ed2amd3fig1.png is "\
+      "image name spec/examples/rice_img/1000-1_ed2amd3fig1.png is "\
       "labelled as under an annex but is not"
     expect(File.read("test.err")).not_to include \
-      "image name spec/examples/rice_images/1000-1_ed2amd3fig1b.png has a "\
+      "image name spec/examples/rice_img/1000-1_ed2amd3fig1b.png has a "\
       "subfigure letter but is not a subfigure"
     expect(File.read("test.err")).to include \
-      "image name spec/examples/rice_images/1000-1_ed2amd3fig4.png does not "\
+      "image name spec/examples/rice_img/1000-1_ed2amd3fig4.png does not "\
       "have a subfigure letter but is a subfigure"
     expect(File.read("test.err")).to include \
-      "image name spec/examples/rice_images/1000-1_ed2amd3fig1a.png has a "\
+      "image name spec/examples/rice_img/1000-1_ed2amd3fig1a.png has a "\
       "subfigure letter but is not a subfigure"
     expect(File.read("test.err")).not_to include \
-      "image name spec/examples/rice_images/1000-1_ed2amd3fig1.png has a "\
+      "image name spec/examples/rice_img/1000-1_ed2amd3fig1.png has a "\
       "subfigure letter but is not a subfigure"
     expect(File.read("test.err")).to include \
-      "image name spec/examples/rice_images/1000-1_ed2amd3fig5_f.png expected "\
+      "image name spec/examples/rice_img/1000-1_ed2amd3fig5_f.png expected "\
       "to have suffix _e"
     expect(File.read("test.err")).not_to include \
-      "image name spec/examples/rice_images/1000-1_ed2amd3fig1.png expected "\
+      "image name spec/examples/rice_img/1000-1_ed2amd3fig1.png expected "\
       "to have suffix _e"
   end
 
@@ -487,7 +488,7 @@ RSpec.describe Metanorma::ISO do
     Asciidoctor.convert(<<~"INPUT", *OPTIONS)
       #{VALIDATING_BLANK_HDR}
 
-      image::spec/examples/rice_images/rice_image1.png[]
+      image::spec/examples/rice_img/rice_image1.png[]
     INPUT
     expect(File.read("test.err")).to include "Figure should have title"
   end
@@ -2136,12 +2137,12 @@ RSpec.describe Metanorma::ISO do
 
       [[b]]
       === Term 1
-      <<b>>
-      <<c>>
+      _<<b>>_
+      _<<c>>_
 
       == Clause
-      <<b>>
-      <<c>>
+      _<<b>>_
+      _<<c>>_
 
     INPUT
     expect(File.read("test.err"))