metanorma-iec 2.1.5 → 2.1.8

data/lib/metanorma/iec/biblio.rng

@@ -225,9 +225,9 @@
         <zeroOrMore>
           <ref name="forename"/>
         </zeroOrMore>
-        <zeroOrMore>
-          <ref name="initial"/>
-        </zeroOrMore>
+        <optional>
+          <ref name="formatted-initials"/>
+        </optional>
         <ref name="surname"/>
         <zeroOrMore>
           <ref name="addition"/>
@@ -247,8 +247,8 @@
       <ref name="LocalizedString"/>
     </element>
   </define>
-  <define name="initial">
-    <element name="initial">
+  <define name="formatted-initials">
+    <element name="formatted-initials">
       <ref name="LocalizedString"/>
     </element>
   </define>
@@ -264,6 +264,9 @@
   </define>
   <define name="forename">
     <element name="forename">
+      <optional>
+        <attribute name="initial"/>
+      </optional>
       <ref name="LocalizedString"/>
     </element>
   </define>

data/lib/metanorma/iec/isodoc.rng

@@ -1285,7 +1285,12 @@
   </define>
   <define name="span">
     <element name="span">
-      <attribute name="class"/>
+      <optional>
+        <attribute name="class"/>
+      </optional>
+      <optional>
+        <attribute name="style"/>
+      </optional>
       <oneOrMore>
         <ref name="TextElement"/>
       </oneOrMore>

data/lib/metanorma/iec/reqt.rng

@@ -108,7 +108,7 @@
     </element>
   </define>
   <define name="label">
-    <element name="label">
+    <element name="identifier">
       <oneOrMore>
         <ref name="TextElement"/>
       </oneOrMore>

data/lib/metanorma/iec/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Iec
-    VERSION = "2.1.5".freeze
+    VERSION = "2.1.8".freeze
   end
 end
 

data/lib/metanorma-iec.rb

@@ -7,8 +7,9 @@ require "isodoc/iec/pdf_convert"
 require "isodoc/iec/presentation_xml_convert"
 require "isodoc/iec/metadata"
 require "isodoc/iec/xref"
+require "metanorma"
 
-if defined? Metanorma
+if defined? Metanorma::Registry
   require_relative "metanorma/iec"
   Metanorma::Registry.instance.register(Metanorma::Iec::Processor)
 end

data/metanorma-iec.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
-  spec.add_dependency "metanorma-iso", "~> 2.1.1"
+  spec.add_dependency "metanorma-iso", "~> 2.1.8"
   spec.add_dependency "ruby-jing"
 
   spec.add_development_dependency "debug"

data/spec/isodoc/iev_spec.rb

@@ -203,7 +203,7 @@ RSpec.describe IsoDoc do
             <p id='_'>There are no normative references in this document.</p>
             <bibitem id='A'>
               <formattedref format='application/x-isodoc+xml'>
-                <em>TITLE</em>
+                <em>TITLE</em> [B]
               </formattedref>
               <docidentifier>B</docidentifier>
             </bibitem>
@@ -213,7 +213,7 @@ RSpec.describe IsoDoc do
             <p id='_'>There are no normative references in this document.</p>
             <bibitem id='A'>
               <formattedref format='application/x-isodoc+xml'>
-                <em>TITLE</em>
+                <em>TITLE</em> [B]
               </formattedref>
               <docidentifier type='metanorma-ordinal'>[1]</docidentifier>
               <docidentifier>B</docidentifier>

data/spec/isodoc/ref_spec.rb

@@ -113,7 +113,7 @@ RSpec.describe IsoDoc::Iec do
         <title>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</title>
         <docidentifier type="IETF">RFC 10</docidentifier>
       </bibitem>
-      <bibitem id="ref12">
+      <bibitem id="ref12" type="standard">
         <formattedref format="application/x-isodoc+xml">CitationWorks. 2019. <em>How to cite a reference</em>.</formattedref>
         <docidentifier type="metanorma">[Citn]</docidentifier>
         <docidentifier type="IETF">RFC 20</docidentifier>
@@ -137,7 +137,7 @@ RSpec.describe IsoDoc::Iec do
             <eref bibitemid="ISSN">[2]</eref>
             <eref bibitemid="ISO16634">ISO 16634:--</eref>
             <eref bibitemid="ref1">ICC 167</eref>
-            <eref bibitemid="ref10">[10]</eref>
+            <eref bibitemid="ref10">[4]</eref>
             <eref bibitemid="ref12">Citn</eref>
             <eref bibitemid="zip_ffs">[5]</eref>
             </p>
@@ -159,7 +159,7 @@ RSpec.describe IsoDoc::Iec do
             <docidentifier type="ISO">ISO 20483:2013-2014</docidentifier>
           </bibitem>
           <bibitem id="ref1">
-            <formattedref format="application/x-isodoc+xml"><smallcap>Standard No I.C.C 167</smallcap>. <em>Determination of the protein content in cereal and cereal products for food and animal feeding stuffs according to the Dumas combustion method</em> (see <link target="http://www.icc.or.at"/>)</formattedref>
+            <formattedref format="application/x-isodoc+xml"><smallcap>Standard No I.C.C 167</smallcap>. <em>Determination of the protein content in cereal and cereal products for food and animal feeding stuffs according to the Dumas combustion method</em> (see <link target="http://www.icc.or.at"/>) [ICC 167]</formattedref>
             <docidentifier type="ICC">ICC 167</docidentifier>
           </bibitem>
           <note><name>NOTE</name><p>This is an annotation of ISO 20483:2013-2014</p></note>
@@ -167,14 +167,14 @@ RSpec.describe IsoDoc::Iec do
           </references><references id="_bibliography" obligation="informative" normative="false" displayorder="3">
             <title depth="1">Bibliography</title>
           <bibitem id="ISBN" type="book">
-            <formattedref><em>Chemicals for analytical laboratory use</em>. ISBN.</formattedref>
+            <formattedref><em>Chemicals for analytical laboratory use</em>. n.p.: n.d. ISBN.</formattedref>
+            <docidentifier type="metanorma-ordinal">[1]</docidentifier>
             <docidentifier type="ISBN">ISBN</docidentifier>
-            <docidentifier type="metanorma">[1]</docidentifier>
           </bibitem>
           <bibitem id="ISSN" type="journal">
-            <formattedref><em>Instruments for analytical laboratory use</em>. ISSN.</formattedref>
+            <formattedref><em>Instruments for analytical laboratory use</em>. n.d. ISSN.</formattedref>
+            <docidentifier type="metanorma-ordinal">[2]</docidentifier>
             <docidentifier type="ISSN">ISSN</docidentifier>
-            <docidentifier type="metanorma">[2]</docidentifier>
           </bibitem>
           <note><name>NOTE</name><p>This is an annotation of document ISSN.</p></note>
           <note><name>NOTE</name><p>This is another annotation of document ISSN.</p></note>
@@ -185,14 +185,14 @@ RSpec.describe IsoDoc::Iec do
           </bibitem>
           <bibitem id="ref10">
             <formattedref format="application/x-isodoc+xml"><smallcap>Standard No I.C.C 167</smallcap>. <em>Determination of the protein content in cereal and cereal products for food and animal feeding stuffs according to the Dumas combustion method</em> (see <link target="http://www.icc.or.at"/>)</formattedref>
-            <docidentifier type="metanorma">[10]</docidentifier>
+            <docidentifier type="metanorma-ordinal">[4]</docidentifier>
           </bibitem>
           <bibitem id="ref11">
-            <formattedref><em>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</em>.</formattedref>
-            <docidentifier type='metanorma-ordinal'>[4]</docidentifier>
+            <formattedref><em><span class='stddocTitle'>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</span></em></formattedref>
+            <docidentifier type='metanorma-ordinal'>[5]</docidentifier>
             <docidentifier type="IETF">IETF RFC 10</docidentifier>
           </bibitem>
-          <bibitem id="ref12">
+          <bibitem id="ref12" type="standard">
             <formattedref format="application/x-isodoc+xml">CitationWorks. 2019. <em>How to cite a reference</em>.</formattedref>
             <docidentifier type="metanorma">[Citn]</docidentifier>
             <docidentifier type="IETF">IETF RFC 20</docidentifier>
@@ -203,7 +203,7 @@ RSpec.describe IsoDoc::Iec do
     OUTPUT
 
     html = <<~OUTPUT
-          #{HTML_HDR}
+      #{HTML_HDR}
             <div>
               <h1 class='ForewordTitle'>FOREWORD</h1>
               <div class='boilerplate_legal'/>
@@ -213,115 +213,116 @@ RSpec.describe IsoDoc::Iec do
                 <a href='#ISSN'>[2]</a>
                 <a href='#ISO16634'>ISO 16634:--</a>
                 <a href='#ref1'>ICC 167</a>
-                <a href='#ref10'>[10]</a>
+                <a href='#ref10'>[4]</a>
                 <a href='#ref12'>Citn</a>
                 <a href='#zip_ffs'>[5]</a>
               </p>
             </div>
             #{IEC_TITLE1}
-            <div>
-              <h1>1&#160; Normative References</h1>
-              <p>
-                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>
-              <p id='ISO712' class='NormRef'>
-                [110], ISO 712,
-                <i>Cereals and cereal products</i>
-              </p>
-              <p id='ISO16634' class='NormRef'>
-                ISO 16634:-- (all parts)
-                <a class='FootnoteRef' href='#fn:1'>
-                  <sup>1</sup>
-                </a>
-                ,
-                <i>Cereals, pulses, milled cereal products, oilseeds and animal feeding stuffs</i>
-              </p>
-              <p id='ISO20483' class='NormRef'>
-                ISO 20483:2013-2014,
-                <i>Cereals and pulses</i>
-              </p>
-              <p id='ref1' class='NormRef'>
-                ICC 167,
-                <span style='font-variant:small-caps;'>Standard No I.C.C 167</span>
-                .
-                <i>
-                  Determination of the protein content in cereal and cereal products
-                  for food and animal feeding stuffs according to the Dumas combustion
-                  method
-                </i>
-                 (see
-                <a href='http://www.icc.or.at'>http://www.icc.or.at</a>
-                )
-              </p>
-              <div class='Note'>
-                <p>
-                  <span class='note_label'>NOTE</span>
-                  &#160; This is an annotation of ISO 20483:2013-2014
-                </p>
-              </div>
-              <p id='zip_ffs' class='NormRef'>[5] Title 5</p>
-            </div>
-            <br/>
-            <div>
-              <h1 class='Section3'>Bibliography</h1>
-              <p id='ISBN' class='Biblio'>
-                [1]&#160;
-                <i>Chemicals for analytical laboratory use</i>. ISBN.
-              </p>
-              <p id='ISSN' class='Biblio'>
-                [2]&#160;
-                <i>Instruments for analytical laboratory use</i>. ISSN.
-              </p>
-              <div class='Note'>
-                <p>
-                  <span class='note_label'>NOTE</span>
-                  &#160; This is an annotation of document ISSN.
-                </p>
-              </div>
-              <div class='Note'>
-                <p>
-                  <span class='note_label'>NOTE</span>
-                  &#160; This is another annotation of document ISSN.
-                </p>
-              </div>
-              <p id='ISO3696' class='Biblio'>
-                [3]&#160; ISO 3696,
-                <i>Water for analytical laboratory use</i>
-              </p>
-              <p id='ref10' class='Biblio'>
-                [10]&#160;
-                <span style='font-variant:small-caps;'>Standard No I.C.C 167</span>
-                .
-                <i>
-                  Determination of the protein content in cereal and cereal products
-                  for food and animal feeding stuffs according to the Dumas combustion
-                  method
-                </i>
-                 (see
-                <a href='http://www.icc.or.at'>http://www.icc.or.at</a>
-                )
-              </p>
-              <p id='ref11' class='Biblio'>
-                [4]&#160; IETF RFC 10,
-                <i>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</i>.
-              </p>
-              <p id='ref12' class='Biblio'>
-                Citn&#160; IETF RFC 20, CitationWorks. 2019.
-                <i>How to cite a reference</i>
-                .
-              </p>
-            </div>
-            <aside id='fn:1' class='footnote'>
-              <p>Under preparation. (Stage at the time of publication ISO/DIS 16634)</p>
-            </aside>
-          </div>
-        </body>
-      </html>
-
+             <div>
+               <h1>1&#xa0; Normative References</h1>
+               <p>
+                 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>
+               <p id='ISO712' class='NormRef'>
+                 [110], ISO 712, 
+                 <i>Cereals and cereal products</i>
+               </p>
+               <p id='ISO16634' class='NormRef'>
+                 ISO 16634:-- (all parts)
+                 <a class='FootnoteRef' href='#fn:1'>
+                   <sup>1</sup>
+                 </a>
+                 , 
+                 <i>Cereals, pulses, milled cereal products, oilseeds and animal feeding stuffs</i>
+               </p>
+               <p id='ISO20483' class='NormRef'>
+                 ISO 20483:2013-2014, 
+                 <i>Cereals and pulses</i>
+               </p>
+               <p id='ref1' class='NormRef'>
+                 ICC 167, 
+                 <span style='font-variant:small-caps;'>Standard No I.C.C 167</span>
+                 . 
+                 <i>
+                   Determination of the protein content in cereal and cereal products
+                   for food and animal feeding stuffs according to the Dumas combustion
+                   method
+                 </i>
+                  (see 
+                 <a href='http://www.icc.or.at'>http://www.icc.or.at</a>
+                 ) [ICC 167]
+               </p>
+               <div class='Note'>
+                 <p>
+                   <span class='note_label'>NOTE</span>
+                   &#xa0; This is an annotation of ISO 20483:2013-2014
+                 </p>
+               </div>
+               <p id='zip_ffs' class='NormRef'>[5] Title 5</p>
+             </div>
+             <br/>
+             <div>
+               <h1 class='Section3'>Bibliography</h1>
+               <p id='ISBN' class='Biblio'>
+                 [1]&#xa0; 
+                 <i>Chemicals for analytical laboratory use</i>
+                 . n.p.: n.d. ISBN.
+               </p>
+               <p id='ISSN' class='Biblio'>
+                 [2]&#xa0; 
+                 <i>Instruments for analytical laboratory use</i>
+                 . n.d. ISSN.
+               </p>
+               <div class='Note'>
+                 <p>
+                   <span class='note_label'>NOTE</span>
+                   &#xa0; This is an annotation of document ISSN.
+                 </p>
+               </div>
+               <div class='Note'>
+                 <p>
+                   <span class='note_label'>NOTE</span>
+                   &#xa0; This is another annotation of document ISSN.
+                 </p>
+               </div>
+               <p id='ISO3696' class='Biblio'>
+                 [3]&#xa0; ISO 3696, 
+                 <i>Water for analytical laboratory use</i>
+               </p>
+               <p id='ref10' class='Biblio'>
+                 [4]&#xa0; 
+                 <span style='font-variant:small-caps;'>Standard No I.C.C 167</span>
+                 . 
+                 <i>
+                   Determination of the protein content in cereal and cereal products
+                   for food and animal feeding stuffs according to the Dumas combustion
+                   method
+                 </i>
+                  (see 
+                 <a href='http://www.icc.or.at'>http://www.icc.or.at</a>
+                 )
+               </p>
+               <p id='ref11' class='Biblio'>
+                 [5]&#xa0; IETF RFC 10, 
+                 <i>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</i>
+               </p>
+               <p id='ref12' class='Biblio'>
+                 Citn&#xa0; IETF RFC 20, CitationWorks. 2019. 
+                 <i>How to cite a reference</i>
+                 .
+               </p>
+             </div>
+             <aside id='fn:1' class='footnote'>
+               <p>Under preparation. (Stage at the time of publication ISO/DIS 16634)</p>
+             </aside>
+           </div>
+         </body>
+       </html>
     OUTPUT
     expect(xmlpp(IsoDoc::Iec::PresentationXMLConvert.new({})
       .convert("test", input, true).sub(

data/spec/metanorma/base_spec.rb

@@ -89,7 +89,6 @@ RSpec.describe Metanorma::Iec do
       :title-intro-fr: Introduction Française
       :title-main-fr: Titre Principal
       :title-part-fr: Part du Titre
-      :library-ics: 1,2,3
       :accessibility-color-inside: true
       :price-code: XC
       :cen-processing: true
@@ -176,15 +175,6 @@ RSpec.describe Metanorma::Iec do
               <workgroup number='31' type='C1'>WG1</workgroup>
               <secretariat>SECRETARIAT</secretariat>
             </editorialgroup>
-            <ics>
-              <code>1</code>
-            </ics>
-            <ics>
-              <code>2</code>
-            </ics>
-            <ics>
-              <code>3</code>
-            </ics>
             <structuredidentifier>
               <project-number part='1'>IEC 1000</project-number>
             </structuredidentifier>

data/spec/metanorma/iev_spec.rb

@@ -156,15 +156,19 @@ RSpec.describe Metanorma::Iec do
         </bibdata>
                  #{@boilerplate}
         <sections>
-          <clause id='_' obligation='normative'>
+          <terms id='_' obligation='normative'>
             <title>Terms and definitions</title>
-            <terms id='_' obligation='normative'>
-              <title>General</title>
+            <term id='term-General'>
+             <preferred>
+         <expression>
+           <name>General</name>
+         </expression>
+       </preferred>
               <term id='term-Term-1'>
                 <preferred><expression><name>Term 1</name></expression></preferred>
               </term>
-            </terms>
-          </clause>
+            </term>
+          </terms>
         </sections>
       </iec-standard>
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iec
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.1.8
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-18 00:00:00.000000000 Z
+date: 2022-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-iso
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.1.8
 - !ruby/object:Gem::Dependency
   name: ruby-jing
   requirement: !ruby/object:Gem::Requirement
@@ -203,6 +203,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/rake.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".rubocop.yml"
@@ -216,14 +217,11 @@ files:
 - lib/isodoc/iec/html/header.html
 - lib/isodoc/iec/html/html_iec_intro.html
 - lib/isodoc/iec/html/html_iec_titlepage.html
-- lib/isodoc/iec/html/htmlstyle.css
 - lib/isodoc/iec/html/htmlstyle.scss
-- lib/isodoc/iec/html/isodoc.css
 - lib/isodoc/iec/html/isodoc.scss
 - lib/isodoc/iec/html/scripts.html
 - lib/isodoc/iec/html/word_iec_intro.html
 - lib/isodoc/iec/html/word_iec_titlepage.html
-- lib/isodoc/iec/html/wordstyle.css
 - lib/isodoc/iec/html/wordstyle.scss
 - lib/isodoc/iec/html_convert.rb
 - lib/isodoc/iec/i18n-en.yaml
@@ -283,7 +281,7 @@ homepage: https://github.com/metanorma/metanorma-iec
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -298,8 +296,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.16
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: metanorma-iec lets you write IEC standards in AsciiDoc.
 test_files: []