metanorma-iec 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af53938e7079717d8149023ce306df0cd80dc70a48d7babd881ae161f16d00eb
-  data.tar.gz: 71d8c4d6d55c3454019ba0921b68ab016719aa62107ffa5e933bd91e3bb86f1b
+  metadata.gz: aeea3a9fe1769d11cf8dd35270a1a45cad54ad976c94bf8ab871bbbef3509e09
+  data.tar.gz: 36628127433147b77fcf6537c22f3c07667367a5a4b83529e5b6f446180a5b4a
 SHA512:
-  metadata.gz: bc0592c3aac3ad73c9680cbf83ac6c1755de964d2e9c56fee6289dec1b26576f6a2b392411ab9cf465cd9aab7e4296a625cfdfeca84563ad0b112c03161f0af4
-  data.tar.gz: dadbab4be0ca22ce1df81abb3b9832f19e4a3629a4800a39d19bf7e96d23c5f0089cf3855af1ce38fa9224c8731b75a425db92005071fa0aa9bf8a542494c9b8
+  metadata.gz: 58fee559bbde5f882118b6eda4032f4d0134e3413dcf1b8eff29fc190674133816ebcd2f3dc48173ceb9c4f7b7a19afb96c97096cc5d09e44457e4877b5dc933
+  data.tar.gz: 10375e49683e94979c6c0b70c2840ea5cab8d1ffeaf1cf53d7815286f6d01dc5ee00f3b84cce2402f37294c238cb1e7f1dea3ae0e8380809f256868de1e1a182

data/lib/asciidoctor/iec/reqt.rng

@@ -87,7 +87,7 @@
     </element>
   </define>
   <define name="reqinherit">
-    <element name="subject">
+    <element name="inherit">
       <text/>
     </element>
   </define>

data/lib/isodoc/iec/html/html_iec_titlepage.html

@@ -55,8 +55,8 @@ an International Standard.</p>
 of this draft are invited to submit, with their comments, notification of any
 relevant patent rights of which they are aware and to provide supporting
 documentation.</p>
-{% endif %}
 
 </div>
+{% endif %}
 
 

data/lib/isodoc/iec/html/wordstyle.scss

@@ -1657,7 +1657,7 @@ div.colophon
 	mso-list-style-id:901253906;}
 @list l26:level1
 	{mso-level-style-link:"Heading 1";
-	mso-level-text:%1;
+	mso-level-text:"%1";
 	mso-level-tab-stop:19.85pt;
 	mso-level-number-position:left;
 	margin-left:19.85pt;

data/lib/metanorma/iec/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Iec
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end
 

data/metanorma-iec.gemspec

@@ -29,8 +29,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "asciidoctor", "~> 1.5.7"
   spec.add_dependency "ruby-jing"
-  spec.add_dependency "isodoc", "~> 0.10.0"
-  spec.add_dependency "metanorma-iso", "~> 1.2.0"
+  spec.add_dependency "isodoc", "~> 1.0.0"
+  spec.add_dependency "metanorma-iso", "~> 1.3.0"
 
   spec.add_development_dependency "bundler", "~> 2.0.1"
   spec.add_development_dependency "byebug"

data/spec/asciidoctor-iec/cleanup_spec.rb

@@ -649,7 +649,7 @@ r = 1 %</stem>
 
       <clause id="_" inline-header="false" obligation="normative">
         <title>Clause</title>
-        <p id="_"><fn reference="3">
+        <p id="_"><fn reference="2">
         <p id="_">Footnote2</p>
       </fn>
       </p>

data/spec/isodoc/i18n_spec.rb

@@ -229,7 +229,7 @@ RSpec.describe IsoDoc do
        </bibliography>
        </iso-standard>
         INPUT
-        #{HTML_HDR}
+    #{HTML_HDR.sub(/"en"/, '"tlh"')}
              <div>
                <h1 class="ForewordTitle">FOREWORD</h1>
                <div class="boilerplate_legal"/>
@@ -386,7 +386,8 @@ RSpec.describe IsoDoc do
        </bibliography>
        </iso-standard>
         INPUT
-    #{HTML_HDR.sub(/INTERNATIONAL ELECTROTECHNICAL COMMISSION/, "COMMISSION ELECTROTECHNIQUE INTERNATIONALE")}
+    #{HTML_HDR.sub(/INTERNATIONAL ELECTROTECHNICAL COMMISSION/, "COMMISSION ELECTROTECHNIQUE INTERNATIONALE").
+    sub(/"en"/, '"fr"')}
              <div>
                <h1 class="ForewordTitle">AVANT-PROPOS</h1>
                <div class="boilerplate_legal"/>
@@ -553,7 +554,7 @@ RSpec.describe IsoDoc do
        </bibliography>
        </iso-standard>
         INPUT
-    #{HTML_HDR.sub(/INTERNATIONAL ELECTROTECHNICAL COMMISSION/, "国际电工委员会")}
+    #{HTML_HDR.sub(/"en"/, '"zh"').sub(/INTERNATIONAL ELECTROTECHNICAL COMMISSION/, "国际电工委员会")}
              <div>
                <h1 class="ForewordTitle">&#21069;&#35328;</h1>
                <div class="boilerplate_legal"/>

data/spec/isodoc/postproc_spec.rb

@@ -373,7 +373,7 @@ RSpec.describe IsoDoc do
                <img src="test_htmlimages/_.png" height="776" width="922" />
 <img src="test_htmlimages/_.png" height="800" width="53" />
 <img src="test_htmlimages/_.png" height="83" width="99" />
-       <p class="FigureTitle" align="center">Figure 1&#xA0;&#x2014; Split-it-right sample divider</p></div>
+       <p class="FigureTitle" style="text-align:center;">Figure 1&#xA0;&#x2014; Split-it-right sample divider</p></div>
              </div>
              #{IEC_TITLE}
            </main>
@@ -465,10 +465,10 @@ RSpec.describe IsoDoc do
              </p>
              <div class="Section3"><a name="P" id="P"></a>
                <div class="example"><a name="_63112cbc-cde0-435f-9553-e0b8c4f5851c" id="_63112cbc-cde0-435f-9553-e0b8c4f5851c"></a>
-                 <p class="MsoNormal"><span class="example_label">EXAMPLE  1</span><span style="mso-tab-count:1">&#xA0; </span>'1M', '01M', and '0001M' all describe the calendar month January.</p>
+                 <p class="example"><span class="example_label">EXAMPLE  1</span><span style="mso-tab-count:1">&#xA0; </span>'1M', '01M', and '0001M' all describe the calendar month January.</p>
                </div>
                <div class="example"><a name="_63112cbc-cde0-435f-9553-e0b8c4f5851d" id="_63112cbc-cde0-435f-9553-e0b8c4f5851d"></a>
-                 <p class="MsoNormal"><span class="example_label">EXAMPLE  2</span><span style="mso-tab-count:1">&#xA0; </span>'2M', '02M', and '0002M' all describe the calendar month February.</p>
+                 <p class="example"><span class="example_label">EXAMPLE  2</span><span style="mso-tab-count:1">&#xA0; </span>'2M', '02M', and '0002M' all describe the calendar month February.</p>
                </div>
              </div>
            </div>
@@ -508,7 +508,7 @@ RSpec.describe IsoDoc do
          <p class="MsoNormal">Hello</p>
          <p class="MsoNormal">Key</p>
          <p class="MsoNormal"><b>Key</b></p><div class="figdl"><table class="figdl"><tr><td valign="top" align="left"><p align="left" style="margin-left:0pt;text-align:left;" class="MsoNormal"><p class="MsoNormal">A</p></p></td><td valign="top"><p class="MsoNormal">B</p></td></tr></table></div>
-         <p class="FigureTitle" align="center">Figure A.1</p></div>
+         <p class="FigureTitle" style="text-align:center;">Figure A.1</p></div>
              </div>
            </div>
            <br clear="all" style="page-break-before:left;mso-break-type:section-break"/>
@@ -544,9 +544,9 @@ RSpec.describe IsoDoc do
              </p>
              <div class="Section3"><a name="P" id="P"></a>
                <p class="Sourcecode"><a name="A" id="A"></a>puts "Hello, world."</p>
-               <p class="TableTitle" align="center">Table A.1</p>
+               <p class="TableTitle" style="text-align:center;">Table A.1</p>
                <div align="center">
-                 <table style="mso-table-lspace:15.0cm;margin-left:423.0pt;mso-table-rspace:15.0cm;margin-right:423.0pt;mso-table-bspace:14.2pt;mso-table-anchor-vertical:paragraph;mso-table-anchor-horizontal:column;mso-table-overlap:never;" class="MsoISOTable" border="1" cellspacing="0" cellpadding="0"><a name="samplecode" id="samplecode"></a>
+                 <table style="mso-table-lspace:15.0cm;margin-left:423.0pt;mso-table-rspace:15.0cm;margin-right:423.0pt;mso-table-bspace:14.2pt;mso-table-anchor-vertical:paragraph;mso-table-anchor-horizontal:column;mso-table-overlap:never;border-spacing:0;border-width:1px;" class="MsoISOTable"><a name="samplecode" id="samplecode"></a>
                    <tbody>
                      <tr>
                        <td style="border-top:solid windowtext 1.5pt;mso-border-top-alt:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;" class="TABLE-cell">

data/spec/isodoc/section_spec.rb

@@ -71,7 +71,7 @@ RSpec.describe IsoDoc do
     INPUT
     <html xmlns:epub="http://www.idpf.org/2007/ops">
          <head/>
-         <body lang="EN-US" link="blue" vlink="#954F72">
+         <body lang="en">
            <div class="title-section">
              <p>&#160;</p>
            </div>

data/spec/spec_helper.rb

@@ -162,7 +162,7 @@ END
 HTML_HDR = <<~END
         <html xmlns:epub="http://www.idpf.org/2007/ops">
           <head/>
-          <body lang="EN-US" link="blue" vlink="#954F72">
+          <body lang="en">
             <div class="title-section">
               <p>&#160;</p>
             </div>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iec
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-04 00:00:00.000000000 Z
+date: 2019-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: metanorma-iso
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -281,7 +281,6 @@ files:
 - spec/asciidoctor-iec/inline_spec.rb
 - spec/asciidoctor-iec/lists_spec.rb
 - spec/asciidoctor-iec/macros_spec.rb
-- spec/asciidoctor-iec/refs_spec.rb
 - spec/asciidoctor-iec/section_spec.rb
 - spec/asciidoctor-iec/table_spec.rb
 - spec/asciidoctor-iec/validate_spec.rb
@@ -296,7 +295,6 @@ files:
 - spec/isodoc/postproc_spec.rb
 - spec/isodoc/section_spec.rb
 - spec/isodoc/terms_spec.rb
-- spec/isodoc/xref_spec.rb
 - spec/metanorma/processor_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/metanorma/metanorma-iec

data/spec/asciidoctor-iec/refs_spec.rb

@@ -1,268 +0,0 @@
-require "spec_helper"
-require "relaton_iso"
-require "relaton_ietf"
-
-RSpec.describe Asciidoctor::Iec do
-  it "processes draft ISO reference" do
-    #stub_fetch_ref no_year: true, note: "The standard is in press"
-
-    expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
-      #{ASCIIDOC_BLANK_HDR}
-      [bibliography]
-      == Normative References
-
-      * [[[iso123,ISO 123:--]]] footnote:[The standard is in press] _Standard_
-    INPUT
-       #{BLANK_HDR}
-       <sections>
-              </sections><bibliography><references id="_" obligation="informative">
-         <title>Normative References</title>
-         <bibitem id="iso123" type="standard">
-         <title format="text/plain">Standard</title>
-         <docidentifier>ISO 123:—</docidentifier>
-         <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">ISO DATE: The standard is in press</note>
-       </bibitem>
-       </references>
-       </bibliography>
-       </iso-standard>
-    OUTPUT
-  end
-
-  it "processes all-parts ISO reference" do
-    #stub_fetch_ref(all_parts: true)
-
-    expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
-      #{ASCIIDOC_BLANK_HDR}
-      [bibliography]
-      == Normative References
-
-      * [[[iso123,ISO 123:1066 (all parts)]]] _Standard_
-    INPUT
-      #{BLANK_HDR}
-      <sections>
-      </sections><bibliography><references id="_" obligation="informative">
-        <title>Normative References</title>
-        <bibitem id="iso123" type="standard">
-         <title format="text/plain">Standard</title>
-         <docidentifier>ISO 123:1066 (all parts)</docidentifier>
-         <date type="published">
-           <on>1066</on>
-         </date>
-         <contributor>
-           <role type="publisher"/>
-           <organization>
-             <name>International Organization for Standardization</name>
-             <abbreviation>ISO</abbreviation>
-           </organization>
-         </contributor>
-         <extent type="part"><referenceFrom>all</referenceFrom></extent>
-       </bibitem>
-      </references>
-      </bibliography>
-      </iso-standard>
-    OUTPUT
-  end
-
-  it "processes non-ISO reference in Normative References" do
-    expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
-      #{ASCIIDOC_BLANK_HDR}
-      [bibliography]
-      == Normative References
-
-      * [[[iso123,XYZ 123:1066 (all parts)]]] _Standard_
-    INPUT
-       #{BLANK_HDR}
-              <sections>
-
-       </sections><bibliography><references id="_" obligation="informative">
-         <title>Normative References</title>
-         <bibitem id="iso123">
-         <formattedref format="application/x-isodoc+xml">
-           <em>Standard</em>
-         </formattedref>
-         <docidentifier>XYZ 123:1066 (all parts)</docidentifier>
-       </bibitem>
-       </references>
-       </bibliography>
-       </iso-standard>
-    OUTPUT
-  end
-
-  it "processes non-ISO reference in Bibliography" do
-    expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
-      #{ASCIIDOC_BLANK_HDR}
-      [bibliography]
-      == Bibliography
-
-      * [[[iso123,1]]] _Standard_
-    INPUT
-       #{BLANK_HDR}
-              <sections>
-
-       </sections><bibliography><references id="_" obligation="informative">
-         <title>Bibliography</title>
-         <bibitem id="iso123">
-         <formattedref format="application/x-isodoc+xml">
-           <em>Standard</em>
-         </formattedref>
-         <docidentifier>[1]</docidentifier>
-       </bibitem>
-       </references>
-       </bibliography>
-       </iso-standard>
-    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")
-        <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")
-      <bibitem id="RFC8341">
-      <fetched>#{Date.today}</fetched>
-  <title format="text/plain" language="en" script="Latn">Network Configuration Access Control Model</title>
-  <docidentifier type="IETF">RFC 8341</docidentifier>
-  <date type="published">
-    <on>2018</on>
-  </date>
-  <status>published</status>
-</bibitem>
-OUTPUT
-    end
-end
-
-end