metanorma-iso 1.5.11 → 1.5.12

data/spec/asciidoctor-iso/cleanup_spec.rb

@@ -430,7 +430,7 @@ RSpec.describe Asciidoctor::ISO do
              <td valign="top" align="left">c</td>
            </tr>
          </tbody>
-       <dl id="_">
+       <dl id="_" key="true">
          <dt>a</dt>
          <dd>
            <p id="_">b</p>
@@ -572,7 +572,7 @@ RSpec.describe Asciidoctor::ISO do
        #{BLANK_HDR}
        <sections><formula id="_">
           <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mi>F</mi><mi>or</mi><mi>μ</mi><mi>l</mi><mi>a</mi></math></stem>
-       <dl id="_">
+       <dl id="_" key="true">
          <dt>a</dt>
          <dd>
            <p id="_">b</p>
@@ -620,7 +620,7 @@ RSpec.describe Asciidoctor::ISO do
        #{BLANK_HDR}
        <sections><figure id="_">
          <image src="spec/examples/rice_images/rice_image1.png" id="_" mimetype="image/png" height="auto" width="auto"/>
-       <dl id="_">
+       <dl id="_" key="true">
          <dt>a</dt>
          <dd>
            <p id="_">b</p>
@@ -678,7 +678,7 @@ RSpec.describe Asciidoctor::ISO do
              <abbreviation>ISO</abbreviation>
            </organization>
          </contributor>
-         <note format="text/plain" type="ISO DATE">The standard is in press</note>
+         <note format="text/plain" type="Unpublished-Status">The standard is in press</note>
        </bibitem>
       </references>
       </bibliography>

data/spec/asciidoctor-iso/refs_spec.rb

@@ -4,38 +4,177 @@ require "relaton_ietf"
 
 RSpec.describe Asciidoctor::ISO do
   it "processes draft ISO reference" do
-    #stub_fetch_ref no_year: true, note: "The standard is in press"
-
+    mock_fdis
+    #mock_isobib_get_123
     expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-      #{ASCIIDOC_BLANK_HDR}
+      #{ISOBIB_BLANK_HDR}
+      == Clause
+      <<iso123>>
+      <<iso123>>
+      A.footnote:[a footnote]
+      <<fdis>>
+      <<fdis>>
+
       [bibliography]
       == Normative References
 
       * [[[iso123,ISO 123:--]]] footnote:[The standard is in press] _Standard_
+      * [[[fdis,ISO/FDIS 17664-1]]] Title
     INPUT
        #{BLANK_HDR}
-       <sections>
-              </sections><bibliography><references id="_" obligation="informative" normative="true">
-         <title>Normative references</title>
-         <p id="_">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="iso123" type="standard">
-         <title format="text/plain">Standard</title>
-         <docidentifier>ISO 123:—</docidentifier>
-         <docnumber>123</docnumber>
-         <date type="published">
-           <on>–</on>
-         </date>
-         <contributor>
-           <role type="publisher"/>
-           <organization>
-             <name>International Organization for Standardization</name>
-             <abbreviation>ISO</abbreviation>
-           </organization>
-         </contributor>
-         <note format="text/plain" type="ISO DATE">The standard is in press</note>
-       </bibitem>
-       </references>
-       </bibliography>
+                <sections>
+           <clause id='_' inline-header='false' obligation='normative'>
+             <title>Clause</title>
+             <p id='_'>
+               <eref type='inline' bibitemid='iso123' citeas='ISO 123:--'/>
+               <fn reference='1'>The standard is in press</fn>
+               <eref type='inline' bibitemid='iso123' citeas='ISO 123:--'/>
+                A.
+               <fn reference='2'>
+                 <p id='_'>a footnote</p>
+               </fn>
+               <eref type='inline' bibitemid='fdis' citeas='ISO/FDIS 17664-1'/>
+               <fn reference='3'>
+                 <p id='_'>Under preparation. (Stage at the time of publication ISO/FDIS 17664-1).</p>
+               </fn>
+               <eref type='inline' bibitemid='fdis' citeas='ISO/FDIS 17664-1'/>
+             </p>
+           </clause>
+         </sections>
+         <bibliography>
+           <references id='_' normative='true' obligation='informative'>
+             <title>Normative references</title>
+             <p id='_'>
+               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='iso123' type='standard'>
+               <title format='text/plain'>Standard</title>
+               <docidentifier type='ISO'>ISO 123:—</docidentifier>
+               <docnumber>123</docnumber>
+               <date type='published'>
+                 <on>–</on>
+               </date>
+               <contributor>
+                 <role type='publisher'/>
+                 <organization>
+                   <name>International Organization for Standardization</name>
+                   <abbreviation>ISO</abbreviation>
+                 </organization>
+               </contributor>
+               <note format='text/plain' type='Unpublished-Status'>The standard is in press</note>
+             </bibitem>
+             <bibitem id='fdis' type='standard'>
+               <fetched>2020-11-09</fetched>
+               <title type='title-intro' format='text/plain' language='fr' script='Latn'>Traitement de produits de soins de santé</title>
+               <title type='title-main' format='text/plain' language='fr' script='Latn'>
+                 Informations relatives au traitement des dispositifs médicaux à
+                 fournir par le fabricant du dispositif
+               </title>
+               <title type='title-part' format='text/plain' language='fr' script='Latn'>Partie 1: Titre manque</title>
+               <title type='main' format='text/plain' language='fr' script='Latn'>
+                 Traitement de produits de soins de santé — Informations relatives au
+                 traitement des dispositifs médicaux à fournir par le fabricant du
+                 dispositif — Partie 1: Titre manque
+               </title>
+               <uri type='src'>https://www.iso.org/standard/81720.html</uri>
+               <uri type='rss'>https://www.iso.org/contents/data/standard/08/17/81720.detail.rss</uri>
+               <docidentifier type='ISO'>ISO/FDIS 17664-1</docidentifier>
+               <docidentifier type='URN'>urn:iso:std:iso-fdis:17664:-1:stage-50.00:ed-1:fr</docidentifier>
+               <docnumber>17664</docnumber>
+               <contributor>
+                 <role type='publisher'/>
+                 <organization>
+                   <name>International Organization for Standardization</name>
+                   <abbreviation>ISO</abbreviation>
+                   <uri>www.iso.org</uri>
+                 </organization>
+               </contributor>
+               <edition>1</edition>
+               <note type='Unpublished-Status'>
+                 <p id='_'>Under preparation. (Stage at the time of publication ISO/FDIS 17664-1).</p>
+               </note>
+               <language>en</language>
+               <language>fr</language>
+               <script>Latn</script>
+               <status>
+                 <stage>50</stage>
+                 <substage>00</substage>
+               </status>
+               <copyright>
+                 <from>unknown</from>
+                 <owner>
+                   <organization>
+                     <name>ISO/FDIS</name>
+                   </organization>
+                 </owner>
+               </copyright>
+               <relation type='obsoletes'>
+                 <bibitem type='standard'>
+                   <formattedref format='text/plain'>ISO 17664:2017</formattedref>
+                 </bibitem>
+               </relation>
+               <relation type='instance'>
+                 <bibitem type='standard'>
+                   <fetched>2020-11-03</fetched>
+                   <title type='title-intro' format='text/plain' language='fr' script='Latn'>Traitement de produits de soins de santé</title>
+                   <title type='title-main' format='text/plain' language='fr' script='Latn'>
+                     Informations relatives au traitement des dispositifs médicaux à
+                     fournir par le fabricant du dispositif
+                   </title>
+                   <title type='title-part' format='text/plain' language='fr' script='Latn'>Partie 1: Titre manque</title>
+                   <title type='main' format='text/plain' language='fr' script='Latn'>
+                     Traitement de produits de soins de santé — Informations relatives
+                     au traitement des dispositifs médicaux à fournir par le fabricant
+                     du dispositif — Partie 1: Titre manque
+                   </title>
+                   <uri type='src'>https://www.iso.org/standard/81720.html</uri>
+                   <uri type='rss'>https://www.iso.org/contents/data/standard/08/17/81720.detail.rss</uri>
+                   <docidentifier type='ISO'>ISO/FDIS 17664-1</docidentifier>
+                   <docidentifier type='URN'>urn:iso:std:iso-fdis:17664:-1:stage-50.00:ed-1:fr</docidentifier>
+                   <docnumber>17664</docnumber>
+                   <contributor>
+                     <role type='publisher'/>
+                     <organization>
+                       <name>International Organization for Standardization</name>
+                       <abbreviation>ISO</abbreviation>
+                       <uri>www.iso.org</uri>
+                     </organization>
+                   </contributor>
+                   <edition>1</edition>
+                   <note type='Unpublished-Status'>
+                     <p id='_'>Under preparation. (Stage at the time of publication ISO/FDIS 17664-1).</p>
+                   </note>
+                   <language>en</language>
+                   <language>fr</language>
+                   <script>Latn</script>
+                   <status>
+                     <stage>50</stage>
+                     <substage>00</substage>
+                   </status>
+                   <copyright>
+                     <from>unknown</from>
+                     <owner>
+                       <organization>
+                         <name>ISO/FDIS</name>
+                       </organization>
+                     </owner>
+                   </copyright>
+                   <relation type='obsoletes'>
+                     <bibitem type='standard'>
+                       <formattedref format='text/plain'>ISO 17664:2017</formattedref>
+                     </bibitem>
+                   </relation>
+                   <place>Geneva</place>
+                 </bibitem>
+               </relation>
+               <place>Geneva</place>
+             </bibitem>
+           </references>
+         </bibliography>
        </iso-standard>
     OUTPUT
   end
@@ -141,132 +280,16 @@ RSpec.describe Asciidoctor::ISO do
     OUTPUT
   end
 
-  private
-
       private
 
     def mock_isobib_get_123
-      expect(Isobib::IsoBibliography).to receive(:get).with("ISO 123", nil, {}) do
-        IsoBibItem::XMLParser.from_xml(<<~"OUTPUT")
+      expect(RelatonIso::IsoBibliography).to receive(:get).with("ISO 123", nil, {:lang=>"en", :title=>"Title", :usrlbl=>nil}) do
+      RelatonIsoBib::XMLParser.from_xml(<<~"OUTPUT")
         <bibitem type=\"international-standard\" id=\"ISO123\">\n  <fetched>#{Date.today}</fetched>\n<title format=\"text/plain\" language=\"en\" script=\"Latn\">Rubber latex -- Sampling</title>\n  <title format=\"text/plain\" language=\"fr\" script=\"Latn\">Latex de caoutchouc -- ?chantillonnage</title>\n  <uri type=\"src\">https://www.iso.org/standard/23281.html</uri>\n  <uri type=\"obp\">https://www.iso.org/obp/ui/#!iso:std:23281:en</uri>\n  <uri type=\"rss\">https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</uri>\n  <docidentifier type="ISO">ISO 123:2001</docidentifier>\n  <date type=\"published\">\n    <on>2001</on>\n  </date>\n  <contributor>\n    <role type=\"publisher\"/>\n    <organization>\n      <name>International Organization for Standardization</name>\n      <abbreviation>ISO</abbreviation>\n      <uri>www.iso.org</uri>\n    </organization>\n  </contributor>\n  <edition>3</edition>\n  <language>en</language>\n  <language>fr</language>\n  <script>Latn</script>\n  <status>Published</status>\n  <copyright>\n    <from>2001</from>\n    <owner>\n      <organization>\n        <name>ISO</name>\n        <abbreviation></abbreviation>\n      </organization>\n    </owner>\n  </copyright>\n  <relation type=\"obsoletes\">\n    <bibitem>\n      <formattedref>ISO 123:1985</formattedref>\n      </bibitem>\n  </relation>\n  <relation type=\"updates\">\n    <bibitem>\n      <formattedref>ISO 123:2001</formattedref>\n      </bibitem>\n  </relation>\n</bibitem>
         OUTPUT
       end
     end
 
-    def mock_isobib_get_124
-      expect(Isobib::IsoBibliography).to receive(:get).with("ISO 124", "2014", {}) do
-        IsoBibItem::XMLParser.from_xml(<<~"OUTPUT")
-                 <bibitem type="international-standard" id="iso124">
-      <fetched>#{Date.today}</fetched>
-         <title format="text/plain" language="en" script="Latn">Latex, rubber -- Determination of total solids content</title>
-         <title format="text/plain" language="fr" script="Latn">Latex de caoutchouc -- Détermination des matières solides totales</title>
-         <uri type="src">https://www.iso.org/standard/61884.html</uri>
-         <uri type="obp">https://www.iso.org/obp/ui/#!iso:std:61884:en</uri>
-         <uri type="rss">https://www.iso.org/contents/data/standard/06/18/61884.detail.rss</uri>
-         <docidentifier type="ISO">ISO 124:2014</docidentifier>
-         <date type="published">
-           <on>2014</on>
-         </date>
-         <contributor>
-           <role type="publisher"/>
-           <organization>
-             <name>International Organization for Standardization</name>
-             <abbreviation>ISO</abbreviation>
-             <uri>www.iso.org</uri>
-           </organization>
-         </contributor>
-         <edition>7</edition>
-         <language>en</language>
-         <language>fr</language>
-         <script>Latn</script>
-         <abstract format="plain" language="en" script="Latn">ISO 124:2014 specifies methods for the determination of the total solids content of natural rubber field and concentrated latices and synthetic rubber latex. These methods are not necessarily suitable for latex from natural sources other than the Hevea brasiliensis, for vulcanized latex, for compounded latex, or for artificial dispersions of rubber.</abstract>
-         <status>Published</status>
-         <copyright>
-           <from>2014</from>
-           <owner>
-             <organization>
-               <name>ISO</name>
-               <abbreviation/>
-             </organization>
-           </owner>
-         </copyright>
-         <relation type="obsoletes">
-           <bibitem>
-             <formattedref>ISO 124:2011</formattedref>
-           </bibitem>
-         </relation>
-        <ics>
-          <code>83.040.10</code>
-          <text>Latex and raw rubber</text>
-        </ics>
-      </bibitem>
-        OUTPUT
-      end
-    end
-
-    def mock_isobib_get_iec12382
-      expect(Isobib::IsoBibliography).to receive(:get).with("ISO/IEC TR 12382", "1992", {}) do
-      IsoBibItem::XMLParser.from_xml(<<~"OUTPUT")
-      <bibitem type="international-standard" id="iso123">
-      <fetched>#{Date.today}</fetched>
-         <title format="text/plain" language="en" script="Latn">Permuted index of the vocabulary of information technology</title>
-         <title format="text/plain" language="fr" script="Latn">Index permuté du vocabulaire des technologies de l'information</title>
-         <uri type="src">https://www.iso.org/standard/21071.html</uri>
-         <uri type="obp">https://www.iso.org/obp/ui/#!iso:std:21071:en</uri>
-         <uri type="rss">https://www.iso.org/contents/data/standard/02/10/21071.detail.rss</uri>
-         <docidentifier type="ISO">ISO/IEC 12382:1992</docidentifier>
-         <date type="published">
-           <on>1992</on>
-         </date>
-         <contributor>
-           <role type="publisher"/>
-           <organization>
-             <name>International Organization for Standardization</name>
-             <abbreviation>ISO</abbreviation>
-             <uri>www.iso.org</uri>
-           </organization>
-         </contributor>
-         <contributor>
-           <role type="publisher"/>
-           <organization>
-             <name>International Electrotechnical Commission</name>
-             <abbreviation>IEC</abbreviation>
-             <uri>www.iec.ch</uri>
-           </organization>
-         </contributor>
-         <edition>2</edition>
-         <language>en</language>
-         <language>fr</language>
-         <script>Latn</script>
-         <abstract format="plain" language="en" script="Latn">Contains a permuted index of all terms included in the parts 1 - 28 of ISO 2382. If any of these parts has been revised, the present TR refers to the revision.</abstract>
-         <status>Published</status>
-         <copyright>
-           <from>1992</from>
-           <owner>
-             <organization>
-               <name>ISO/IEC</name>
-               <abbreviation/>
-             </organization>
-           </owner>
-         </copyright>
-         <relation type="updates">
-           <bibitem>
-             <formattedref>ISO/IEC TR 12382:1992</formattedref>
-           </bibitem>
-         </relation>
-        <ics>
-          <code>35.020</code>
-          <text>Information technology (IT) in general</text>
-        </ics>
-        <ics>
-          <code>01.040.35</code>
-          <text>Information technology (Vocabularies)</text>
-        </ics>
-       </bibitem>
-OUTPUT
-    end
-end
-
        def mock_rfcbib_get_rfc8341
       expect(IETFBib::RfcBibliography).to receive(:get).with("RFC 8341", nil, {}) do
       IETFBib::XMLParser.from_xml(<<~"OUTPUT")
@@ -283,4 +306,12 @@ OUTPUT
     end
 end
 
+   def mock_fdis
+     expect(RelatonIso::IsoBibliography).to receive(:get).with("ISO/FDIS 17664-1", nil, {:lang=>"en", :title=>"Title", :usrlbl=>nil}) do
+      RelatonIsoBib::XMLParser.from_xml(<<~"OUTPUT")
+     <bibitem id="x" type="standard">  <fetched>#{Date.today}</fetched>  <title type="title-intro" format="text/plain" language="fr" script="Latn">Traitement de produits de soins de santé</title>  <title type="title-main" format="text/plain" language="fr" script="Latn">Informations relatives au traitement des dispositifs médicaux à fournir par le fabricant du dispositif</title>  <title type="title-part" format="text/plain" language="fr" script="Latn">Partie 1: Titre manque</title>  <title type="main" format="text/plain" language="fr" script="Latn">Traitement de produits de soins de santé — Informations relatives au traitement des dispositifs médicaux à fournir par le fabricant du dispositif — Partie 1: Titre manque</title>  <uri type="src">https://www.iso.org/standard/81720.html</uri>  <uri type="rss">https://www.iso.org/contents/data/standard/08/17/81720.detail.rss</uri>  <docidentifier type="ISO">ISO/FDIS 17664-1</docidentifier>  <docidentifier type="URN">urn:iso:std:iso-fdis:17664:-1:stage-50.00:ed-1:fr</docidentifier>  <docnumber>17664</docnumber>  <contributor>    <role type="publisher"/>    <organization>      <name>International Organization for Standardization</name>      <abbreviation>ISO</abbreviation>      <uri>www.iso.org</uri>    </organization>  </contributor>  <edition>1</edition>  <language>en</language>  <language>fr</language>  <script>Latn</script>  <status>    <stage>50</stage>    <substage>00</substage>  </status>  <copyright>    <from>unknown</from>    <owner>      <organization>        <name>ISO/FDIS</name>      </organization>    </owner>  </copyright>  <relation type="obsoletes">    <bibitem type="standard">      <formattedref format="text/plain">ISO 17664:2017</formattedref>    </bibitem>  </relation>  <relation type="instance">    <bibitem type="standard">      <fetched>2020-11-03</fetched>      <title type="title-intro" format="text/plain" language="fr" script="Latn">Traitement de produits de soins de santé</title>      <title type="title-main" format="text/plain" language="fr" script="Latn">Informations relatives au traitement des dispositifs médicaux à fournir par le fabricant du dispositif</title>      <title type="title-part" format="text/plain" language="fr" script="Latn">Partie 1: Titre manque</title>      <title type="main" format="text/plain" language="fr" script="Latn">Traitement de produits de soins de santé — Informations relatives au traitement des dispositifs médicaux à fournir par le fabricant du dispositif — Partie 1: Titre manque</title>      <uri type="src">https://www.iso.org/standard/81720.html</uri>      <uri type="rss">https://www.iso.org/contents/data/standard/08/17/81720.detail.rss</uri>      <docidentifier type="ISO">ISO/FDIS 17664-1</docidentifier>      <docidentifier type="URN">urn:iso:std:iso-fdis:17664:-1:stage-50.00:ed-1:fr</docidentifier>      <docnumber>17664</docnumber>      <contributor>        <role type="publisher"/>        <organization>          <name>International Organization for Standardization</name>          <abbreviation>ISO</abbreviation>          <uri>www.iso.org</uri>        </organization>      </contributor>      <edition>1</edition>      <language>en</language>      <language>fr</language>      <script>Latn</script>      <status>        <stage>50</stage>        <substage>00</substage>      </status>      <copyright>        <from>unknown</from>        <owner>          <organization>            <name>ISO/FDIS</name>          </organization>        </owner>      </copyright>      <relation type="obsoletes">        <bibitem type="standard">          <formattedref format="text/plain">ISO 17664:2017</formattedref>        </bibitem>      </relation>      <place>Geneva</place>    </bibitem>  </relation>  <place>Geneva</place></bibitem>
+     OUTPUT
+   end
+   end
+
 end

data/spec/asciidoctor-iso/validate_spec.rb

@@ -202,6 +202,23 @@ it "Warns of illegal script" do
     expect(File.read("test.err")).to include "pizza is not a recognised script"
 end
 
+it "warns that technical report may contain requirement" do
+    FileUtils.rm_f "test.err"
+  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+  = Document title
+  Author
+  :docfile: test.adoc
+  :nodoc:
+  :no-isobib:
+  :doctype: technical-report
+
+  == Random clause
+
+  The widget is required not to be larger than 15 cm.
+  INPUT
+    expect(File.read("test.err")).to include "Technical Report clause may contain requirement"
+end
+
 
 it "warns that introduction may contain requirement" do
     FileUtils.rm_f "test.err"

data/spec/isodoc/blocks_spec.rb

@@ -436,6 +436,7 @@ OUTPUT
                <div id='_be9158af-7e93-4ee2-90c5-26d31c181934'><div class='formula'>
                  <p>
                    <span class='stem'>(#(r = 1 %)#)</span>
+                       <span style='mso-tab-count:1'>&#160; </span>
                  </p>
                </div>
                <p>where</p>

data/spec/isodoc/ref_spec.rb

@@ -42,7 +42,7 @@ RSpec.describe IsoDoc do
       <abbreviation>ISO</abbreviation>
     </organization>
   </contributor>
-  <note format="text/plain" reference="1" type="ISO DATE">Under preparation. (Stage at the time of publication ISO/DIS 16634)</note>
+  <note format="text/plain" reference="1" type="Unpublished-Status">Under preparation. (Stage at the time of publication ISO/DIS 16634)</note>
   <extent type="part">
   <referenceFrom>all</referenceFrom>
   </extent>
@@ -175,7 +175,7 @@ RSpec.describe IsoDoc do
                    <abbreviation>ISO</abbreviation>
                  </organization>
                </contributor>
-               <note format='text/plain' reference='1' type='ISO DATE'>Under preparation. (Stage at the time of publication ISO/DIS 16634)</note>
+               <note format='text/plain' reference='1' type='Unpublished-Status'>Under preparation. (Stage at the time of publication ISO/DIS 16634)</note>
                <extent type='part'>
                  <referenceFrom>all</referenceFrom>
                </extent>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 1.5.11
+  version: 1.5.12
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-25 00:00:00.000000000 Z
+date: 2020-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-jing
@@ -262,6 +262,7 @@ extra_rdoc_files: []
 files:
 - ".gitattributes"
 - ".github/workflows/macos.yml"
+- ".github/workflows/rake.yml"
 - ".github/workflows/ubuntu.yml"
 - ".github/workflows/windows.yml"
 - ".gitignore"