metanorma-iec 1.2.10 → 1.2.15

data/lib/isodoc/iec/word_convert.rb

@@ -13,8 +13,8 @@ module IsoDoc
 
       def default_fonts(options)
         {
-          bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' : '"Arial",sans-serif'),
-          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : '"Arial",sans-serif'),
+          bodyfont: (options[:script] == "Hans" ? '"Source Han Sans",serif' : '"Arial",sans-serif'),
+          headerfont: (options[:script] == "Hans" ? '"Source Han Sans",sans-serif' : '"Arial",sans-serif'),
           monospacefont: '"Courier New",monospace',
           normalfontsize: "10.0pt",
           footnotefontsize: "8.0pt",

data/lib/metanorma/iec/processor.rb

@@ -18,6 +18,17 @@ module Metanorma
         )
       end
 
+      def fonts_manifest
+        {
+          "Arial" => nil,
+          "Times New Roman" => nil,
+          "STIX Two Math" => nil,
+          "Source Han Sans" => nil,
+          "Courier" => nil,
+          "Courier New" => nil,
+        }
+      end
+
       def version
         "Metanorma::Iec #{Metanorma::Iec::VERSION}"
       end

data/lib/metanorma/iec/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Iec
-    VERSION = "1.2.10"
+    VERSION = "1.2.15"
   end
 end
 

data/metanorma-iec.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.summary       = "metanorma-iec lets you write IEC standards "\
     "in AsciiDoc."
   spec.description   = <<~DESCRIPTION
-    metanorma-iso lets you write IEC standards in AsciiDoc syntax.
+    metanorma-iec lets you write IEC standards in AsciiDoc syntax.
 
     This gem is in active development.
   DESCRIPTION
@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
   spec.add_dependency "ruby-jing"
-  spec.add_dependency "metanorma-iso", "~> 1.5.10"
+  spec.add_dependency "metanorma-iso", "~> 1.7.0"
 
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "sassc", "2.4.0"

data/spec/asciidoctor-iec/base_spec.rb

@@ -2,6 +2,11 @@ require "spec_helper"
 require "fileutils"
 
 RSpec.describe Asciidoctor::Iec do
+before(:all) do
+  @blank_hdr = blank_hdr_gen
+end
+
+
   it "has a version number" do
     expect(Metanorma::Iec::VERSION).not_to be nil
   end
@@ -21,7 +26,7 @@ RSpec.describe Asciidoctor::Iec do
     expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iec, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     #{ASCIIDOC_BLANK_HDR}
     INPUT
-    #{BLANK_HDR}
+    #{@blank_hdr}
 <sections/>
 </iec-standard>
     OUTPUT
@@ -38,7 +43,7 @@ RSpec.describe Asciidoctor::Iec do
       :novalid:
       :no-isobib:
     INPUT
-    #{BLANK_HDR}
+    #{@blank_hdr}
 <sections/>
 </iec-standard>
     OUTPUT
@@ -93,6 +98,10 @@ RSpec.describe Asciidoctor::Iec do
       :library-ics: 1,2,3
       :accessibility-color-inside: true
       :price-code: XC
+      :cen-processing: true
+      :secretary: Fred Nerk
+      :interest-to-committees: TC 6121, SC 12
+      :obsoletes: ABC; DEF
     INPUT
            <?xml version="1.0" encoding="UTF-8"?>
        <iec-standard xmlns="https://www.metanorma.org/ns/iec" type="semantic" version="#{Metanorma::Iec::VERSION}">
@@ -142,6 +151,18 @@ RSpec.describe Asciidoctor::Iec do
              </organization>
            </owner>
          </copyright>
+         <relation type='obsoletes'>
+  <bibitem>
+    <title>--</title>
+    <docidentifier>ABC</docidentifier>
+  </bibitem>
+</relation>
+<relation type='obsoletes'>
+  <bibitem>
+    <title>--</title>
+    <docidentifier>DEF</docidentifier>
+  </bibitem>
+</relation>
          <ext>
          <doctype>article</doctype>
          <horizontal>false</horizontal>
@@ -169,9 +190,142 @@ RSpec.describe Asciidoctor::Iec do
 <stagename>New work item proposal</stagename>
 <accessibility-color-inside>true</accessibility-color-inside>
 <price-code>XC</price-code>
+<cen-processing>true</cen-processing>
+<secretary>Fred Nerk</secretary>
+<interest-to-committees>TC 6121, SC 12</interest-to-committees>
        </ext>
        </bibdata>
-       #{UNPUBLISHED_BOILERPLATE}
+<boilerplate>
+           <copyright-statement>
+             <clause>
+               <p id='_'>
+                 <strong>Copyright © #{Time.now.year} International Electrotechnical Commission, IEC.</strong>
+                  All rights reserved. It is permitted to download this electronic
+                 file, to make a copy and to print out the content for the sole purpose
+                 of preparing National Committee positions. You may not copy or
+                 “mirror” the file or printed version of the document, or any part of
+                 it, for any other purpose without permission in writing from IEC. 
+               </p>
+             </clause>
+           </copyright-statement>
+           <legal-statement>
+             <clause>
+               <ol id='_'>
+                 <li>
+                   <p id='_'>
+                     The International Electrotechnical Commission (IEC) is a worldwide
+                     organization for standardization comprising all national
+                     electrotechnical committees (IEC National Committees). The object
+                     of IEC is to promote international co-operation on all questions
+                     concerning standardization in the electrical and electronic
+                     fields. To this end and in addition to other activities, IEC
+                     publishes International Standards, Technical Specifications,
+                     Technical Reports, Publicly Available Specifications (PAS) and
+                     Guides (hereafter referred to as “IEC Publication(s)”). Their
+                     preparation is entrusted to technical committees; any IEC National
+                     Committee interested in the subject dealt with may participate in
+                     this preparatory work. International, governmental and
+                     non-governmental organizations liaising with the IEC also
+                     participate in this preparation. IEC collaborates closely with the
+                     International Organization for Standardization (ISO) in accordance
+                     with conditions determined by agreement between the two
+                     organizations.
+                   </p>
+                 </li>
+                 <li>
+                   <p id='_'>
+                     The formal decisions or agreements of IEC on technical matters
+                     express, as nearly as possible, an international consensus of
+                     opinion on the relevant subjects since each technical committee
+                     has representation from all interested IEC National Committees.
+                   </p>
+                 </li>
+                 <li>
+                   <p id='_'>
+                     IEC Publications have the form of recommendations for
+                     international use and are accepted by IEC National Committees in
+                     that sense. While all reasonable efforts are made to ensure that
+                     the technical content of IEC Publications is accurate, IEC cannot
+                     be held responsible for the way in which they are used or for any
+                     misinterpretation by any end user.
+                   </p>
+                 </li>
+                 <li>
+                   <p id='_'>
+                     In order to promote international uniformity, IEC National
+                     Committees undertake to apply IEC Publications transparently to
+                     the maximum extent possible in their national and regional
+                     publications. Any divergence between any IEC Publication and the
+                     corresponding national or regional publication shall be clearly
+                     indicated in the latter.
+                   </p>
+                 </li>
+                 <li>
+                   <p id='_'>
+                     IEC itself does not provide any attestation of conformity.
+                     Independent certification bodies provide conformity assessment
+                     services and, in some areas, access to IEC marks of conformity.
+                     IEC is not responsible for any services carried out by independent
+                     certification bodies.
+                   </p>
+                 </li>
+                 <li>
+                   <p id='_'>All users should ensure that they have the latest edition of this publication.</p>
+                 </li>
+                 <li>
+                   <p id='_'>
+                     No liability shall attach to IEC or its directors, employees,
+                     servants or agents including individual experts and members of its
+                     technical committees and IEC National Committees for any personal
+                     injury, property damage or other damage of any nature whatsoever,
+                     whether direct or indirect, or for costs (including legal fees)
+                     and expenses arising out of the publication, use of, or reliance
+                     upon, this IEC Publication or any other IEC Publications.
+                   </p>
+                 </li>
+                 <li>
+                   <p id='_'>
+                     Attention is drawn to the Normative references cited in this
+                     publication. Use of the referenced publications is indispensable
+                     for the correct application of this publication.
+                   </p>
+                 </li>
+                 <li>
+                   <p id='_'>
+                     Attention is drawn to the possibility that some of the elements of
+                     this IEC Publication may be the subject of patent rights. IEC
+                     shall not be held responsible for identifying any or all such
+                     patent rights.
+                   </p>
+                 </li>
+               </ol>
+             </clause>
+           </legal-statement>
+           <license-statement>
+             <clause>
+               <p id='_'>
+                 This document is still under study and subject to change. It should
+                 not be used for reference purposes.
+               </p>
+                until published as such. 
+               <p id='_'>
+                 Recipients of this document are invited to submit, with their
+                 comments, notification of any relevant patent rights of which they are
+                 aware and to provide supporting documentation.
+               </p>
+             </clause>
+           </license-statement>
+           <feedback-statement>
+             <clause id='boilerplate-cenelec-attention'>
+               <title>Attention IEC-CENELEC parallel voting</title>
+               <p id='_'>
+                 The attention of IEC National Committees, members of CENELEC, is drawn
+                 to the fact that this (NWIP) is submitted for parallel voting.
+               </p>
+               <p id='_'>The CENELEC members are invited to vote through the CENELEC voting system.</p>
+             </clause>
+           </feedback-statement>
+         </boilerplate>
        <sections/>
        </iec-standard>
     OUTPUT
@@ -191,7 +345,7 @@ RSpec.describe Asciidoctor::Iec do
       :tc-docnumber: 2000
       :language: el
       :script: Grek
-      :publisher: IEC,IETF,ISO
+      :publisher: IEC;IETF;ISO
       :copyright-year: 2001
       :docstage: A2CD
       :doctype: technical-specification
@@ -292,7 +446,138 @@ RSpec.describe Asciidoctor::Iec do
          <stagename>Committee draft</stagename>
          </ext>
        </bibdata>
-    #{UNPUBLISHED_BOILERPLATE.sub(/IEC #{Date.today.year}/, "ISO/IEC/IETF 2001")}
+<boilerplate>
+           <copyright-statement>
+             <clause>
+               <p id='_'>
+                 <strong>Copyright © 2001 International Electrotechnical Commission, IEC.</strong>
+                  All rights reserved. It is permitted to download this electronic
+                 file, to make a copy and to print out the content for the sole purpose
+                 of preparing National Committee positions. You may not copy or
+                 “mirror” the file or printed version of the document, or any part of
+                 it, for any other purpose without permission in writing from IEC. 
+               </p>
+             </clause>
+           </copyright-statement>
+           <legal-statement>
+             <clause>
+               <ol id='_'>
+                 <li>
+                   <p id='_'>
+                     The International Electrotechnical Commission (IEC) is a worldwide
+                     organization for standardization comprising all national
+                     electrotechnical committees (IEC National Committees). The object
+                     of IEC is to promote international co-operation on all questions
+                     concerning standardization in the electrical and electronic
+                     fields. To this end and in addition to other activities, IEC
+                     publishes International Standards, Technical Specifications,
+                     Technical Reports, Publicly Available Specifications (PAS) and
+                     Guides (hereafter referred to as “IEC Publication(s)”). Their
+                     preparation is entrusted to technical committees; any IEC National
+                     Committee interested in the subject dealt with may participate in
+                     this preparatory work. International, governmental and
+                     non-governmental organizations liaising with the IEC also
+                     participate in this preparation. IEC collaborates closely with the
+                     International Organization for Standardization (ISO) in accordance
+                     with conditions determined by agreement between the two
+                     organizations.
+                   </p>
+                 </li>
+                 <li>
+                   <p id='_'>
+                     The formal decisions or agreements of IEC on technical matters
+                     express, as nearly as possible, an international consensus of
+                     opinion on the relevant subjects since each technical committee
+                     has representation from all interested IEC National Committees.
+                   </p>
+                 </li>
+                 <li>
+                   <p id='_'>
+                     IEC Publications have the form of recommendations for
+                     international use and are accepted by IEC National Committees in
+                     that sense. While all reasonable efforts are made to ensure that
+                     the technical content of IEC Publications is accurate, IEC cannot
+                     be held responsible for the way in which they are used or for any
+                     misinterpretation by any end user.
+                   </p>
+                 </li>
+                 <li>
+                   <p id='_'>
+                     In order to promote international uniformity, IEC National
+                     Committees undertake to apply IEC Publications transparently to
+                     the maximum extent possible in their national and regional
+                     publications. Any divergence between any IEC Publication and the
+                     corresponding national or regional publication shall be clearly
+                     indicated in the latter.
+                   </p>
+                 </li>
+                 <li>
+                   <p id='_'>
+                     IEC itself does not provide any attestation of conformity.
+                     Independent certification bodies provide conformity assessment
+                     services and, in some areas, access to IEC marks of conformity.
+                     IEC is not responsible for any services carried out by independent
+                     certification bodies.
+                   </p>
+                 </li>
+                 <li>
+                   <p id='_'>All users should ensure that they have the latest edition of this publication.</p>
+                 </li>
+                 <li>
+                   <p id='_'>
+                     No liability shall attach to IEC or its directors, employees,
+                     servants or agents including individual experts and members of its
+                     technical committees and IEC National Committees for any personal
+                     injury, property damage or other damage of any nature whatsoever,
+                     whether direct or indirect, or for costs (including legal fees)
+                     and expenses arising out of the publication, use of, or reliance
+                     upon, this IEC Publication or any other IEC Publications.
+                   </p>
+                 </li>
+                 <li>
+                   <p id='_'>
+                     Attention is drawn to the Normative references cited in this
+                     publication. Use of the referenced publications is indispensable
+                     for the correct application of this publication.
+                   </p>
+                 </li>
+                 <li>
+                   <p id='_'>
+                     Attention is drawn to the possibility that some of the elements of
+                     this IEC Publication may be the subject of patent rights. IEC
+                     shall not be held responsible for identifying any or all such
+                     patent rights.
+                   </p>
+                 </li>
+               </ol>
+             </clause>
+           </legal-statement>
+           <license-statement>
+             <clause>
+               <p id='_'>
+                 This document is still under study and subject to change. It should
+                 not be used for reference purposes.
+               </p>
+                until published as such. 
+               <p id='_'>
+                 Recipients of this document are invited to submit, with their
+                 comments, notification of any relevant patent rights of which they are
+                 aware and to provide supporting documentation.
+               </p>
+             </clause>
+           </license-statement>
+           <feedback-statement>
+             <clause id='boilerplate-cenelec-attention'>
+               <title>Attention IEC-CENELEC parallel voting</title>
+               <p id='_'>
+                 The attention of IEC National Committees, members of CENELEC, is drawn
+                 to the fact that this Committee Draft (CD) is submitted for parallel
+                 voting.
+               </p>
+               <p id='_'>The CENELEC members are invited to vote through the CENELEC voting system.</p>
+             </clause>
+           </feedback-statement>
+         </boilerplate>
        <sections/>
        </iec-standard>
     OUTPUT
@@ -397,7 +682,144 @@ RSpec.describe Asciidoctor::Iec do
     <stagename>Final draft international standard</stagename>
   </ext>
 </bibdata>
-#{UNPUBLISHED_BOILERPLATE}
+   <boilerplate>
+           <copyright-statement>
+             <clause>
+               <p id='_'>
+                 <strong>Copyright © #{Time.now.year} International Electrotechnical Commission, IEC.</strong>
+                  All rights reserved. It is permitted to download this electronic
+                 file, to make a copy and to print out the content for the sole purpose
+                 of preparing National Committee positions. You may not copy or
+                 “mirror” the file or printed version of the document, or any part of
+                 it, for any other purpose without permission in writing from IEC. 
+               </p>
+             </clause>
+           </copyright-statement>
+           <legal-statement>
+             <clause>
+               <ol id='_'>
+                 <li>
+                   <p id='_'>
+                     The International Electrotechnical Commission (IEC) is a worldwide
+                     organization for standardization comprising all national
+                     electrotechnical committees (IEC National Committees). The object
+                     of IEC is to promote international co-operation on all questions
+                     concerning standardization in the electrical and electronic
+                     fields. To this end and in addition to other activities, IEC
+                     publishes International Standards, Technical Specifications,
+                     Technical Reports, Publicly Available Specifications (PAS) and
+                     Guides (hereafter referred to as “IEC Publication(s)”). Their
+                     preparation is entrusted to technical committees; any IEC National
+                     Committee interested in the subject dealt with may participate in
+                     this preparatory work. International, governmental and
+                     non-governmental organizations liaising with the IEC also
+                     participate in this preparation. IEC collaborates closely with the
+                     International Organization for Standardization (ISO) in accordance
+                     with conditions determined by agreement between the two
+                     organizations.
+                   </p>
+                 </li>
+                 <li>
+                   <p id='_'>
+                     The formal decisions or agreements of IEC on technical matters
+                     express, as nearly as possible, an international consensus of
+                     opinion on the relevant subjects since each technical committee
+                     has representation from all interested IEC National Committees.
+                   </p>
+                 </li>
+                 <li>
+                   <p id='_'>
+                     IEC Publications have the form of recommendations for
+                     international use and are accepted by IEC National Committees in
+                     that sense. While all reasonable efforts are made to ensure that
+                     the technical content of IEC Publications is accurate, IEC cannot
+                     be held responsible for the way in which they are used or for any
+                     misinterpretation by any end user.
+                   </p>
+                 </li>
+                 <li>
+                   <p id='_'>
+                     In order to promote international uniformity, IEC National
+                     Committees undertake to apply IEC Publications transparently to
+                     the maximum extent possible in their national and regional
+                     publications. Any divergence between any IEC Publication and the
+                     corresponding national or regional publication shall be clearly
+                     indicated in the latter.
+                   </p>
+                 </li>
+                 <li>
+                   <p id='_'>
+                     IEC itself does not provide any attestation of conformity.
+                     Independent certification bodies provide conformity assessment
+                     services and, in some areas, access to IEC marks of conformity.
+                     IEC is not responsible for any services carried out by independent
+                     certification bodies.
+                   </p>
+                 </li>
+                 <li>
+                   <p id='_'>All users should ensure that they have the latest edition of this publication.</p>
+                 </li>
+                 <li>
+                   <p id='_'>
+                     No liability shall attach to IEC or its directors, employees,
+                     servants or agents including individual experts and members of its
+                     technical committees and IEC National Committees for any personal
+                     injury, property damage or other damage of any nature whatsoever,
+                     whether direct or indirect, or for costs (including legal fees)
+                     and expenses arising out of the publication, use of, or reliance
+                     upon, this IEC Publication or any other IEC Publications.
+                   </p>
+                 </li>
+                 <li>
+                   <p id='_'>
+                     Attention is drawn to the Normative references cited in this
+                     publication. Use of the referenced publications is indispensable
+                     for the correct application of this publication.
+                   </p>
+                 </li>
+                 <li>
+                   <p id='_'>
+                     Attention is drawn to the possibility that some of the elements of
+                     this IEC Publication may be the subject of patent rights. IEC
+                     shall not be held responsible for identifying any or all such
+                     patent rights.
+                   </p>
+                 </li>
+               </ol>
+             </clause>
+           </legal-statement>
+           <license-statement>
+             <clause>
+               <p id='_'>
+                 This document is a draft distributed for approval. It may not be
+                 referred to as an International Standard until published as such.
+               </p>
+               <p id='_'>
+                 In addition to their evaluation as being acceptable for industrial,
+                 technological, commercial and user purposes, Final Draft International
+                 Standards may on occasion have to be considered in the light of their
+                 potential to become standards to which reference may be made in
+                 national regulations.
+               </p>
+               <p id='_'>
+                 Recipients of this document are invited to submit, with their
+                 comments, notification of any relevant patent rights of which they are
+                 aware and to provide supporting documentation.
+               </p>
+             </clause>
+           </license-statement>
+           <feedback-statement>
+             <clause id='boilerplate-cenelec-attention'>
+               <title>Attention IEC-CENELEC parallel voting</title>
+               <p id='_'>
+                 The attention of IEC National Committees, members of CENELEC, is drawn
+                 to the fact that this Final Draft International Standard (FDIS) is
+                 submitted for parallel voting.
+               </p>
+               <p id='_'>The CENELEC members are invited to vote through the CENELEC voting system.</p>
+             </clause>
+           </feedback-statement>
+         </boilerplate>     
 <sections/>
 </iec-standard>
 OUTPUT
@@ -462,7 +884,7 @@ OUTPUT
     <stagename>International standard</stagename>
   </ext>
 </bibdata>
-#{BOILERPLATE}
+#{boilerplate(Nokogiri::XML(BLANK_HDR + "</iec-standard>"))}
 <sections/>
 </iec-standard>
 OUTPUT
@@ -528,7 +950,7 @@ OUTPUT
     <stagename>International standard</stagename>
   </ext>
 </bibdata>
-#{BOILERPLATE}
+#{boilerplate(Nokogiri::XML(BLANK_HDR + "</iec-standard>"))}
 <sections/>
 </iec-standard>
 OUTPUT
@@ -578,8 +1000,8 @@ OUTPUT
     INPUT
     html = File.read("test.html", encoding: "utf-8")
     expect(html).to match(%r[\bpre[^{]+\{[^{]+font-family: "Courier New", monospace;]m)
-    expect(html).to match(%r[blockquote[^{]+\{[^{]+font-family: "SimSun", serif;]m)
-    expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "SimHei", sans-serif;]m)
+    expect(html).to match(%r[blockquote[^{]+\{[^{]+font-family: "Source Han Sans", serif;]m)
+    expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "Source Han Sans", sans-serif;]m)
   end
 
   it "uses specified fonts" do