metanorma-iec 1.2.11 → 1.2.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 757f304ffb697a9e1ac4cbea8cb23bd97d1c84919c79330c850c185147e87dea
-  data.tar.gz: c9abb1c90c14b852382dc58cceb438292a06221a027d00f50f7b10b234193db9
+  metadata.gz: f08c3f37c821f3bd1cb589899e6fc5a240cedea8314df63683c0983476c7d675
+  data.tar.gz: 481dd653b8771e900a9c073612920e61e62b9f7b2f985c1bdfd8a71cdd99100a
 SHA512:
-  metadata.gz: '09f9d546277d03635c47c8ec61c2a19c3170605e0edd6e1632f62258d2d1d1f6e458bdf781bf95b3e9b0c8995072cb003f8c60ecf885b7d9f9b0fb1168c8210c'
-  data.tar.gz: e327cf4c18dc4e20fe836829ac9428492edb163e46e4f864e67c42a1affb33d72e366a10c59cc750e1274eff26fde85ae9193a84b0941c94e9e6e054c08d253b
+  metadata.gz: 0c31775a8855a6841150ede2338969ac8d95aa99c930aebc00bc78c0ddf421082b0231a2cf17b53783099033c0f4d0aee510efeeda3da0057dc731927d90c3ef
+  data.tar.gz: e627ac800e2b2471f559d9f43354524293983477276ddb34e22b37e99a58bfbc8d7bc84b27d58b372a7009d277ad6bce4442b94faaa2d93c4021eb52d9661154

data/.github/workflows/rake.yml

@@ -4,7 +4,7 @@ name: rake
 
 on:
   push:
-    branches: [ master, main  ]
+    branches: [ master, main ]
     tags: [ v* ]
   pull_request:
 
@@ -16,47 +16,27 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '2.6', '2.5', '2.4' ]
+        ruby: [ '2.7', '2.6', '2.5', '2.4' ]
         os: [ ubuntu-latest, windows-latest, macos-latest ]
         experimental: [ false ]
         include:
-          - ruby: '2.7'
+          - ruby: '3.0'
             os: 'ubuntu-latest'
             experimental: true
-          - ruby: '2.7'
+          - ruby: '3.0'
             os: 'windows-latest'
             experimental: true
-          - ruby: '2.7'
+          - ruby: '3.0'
             os: 'macos-latest'
             experimental: true
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@v2
+        with:
+          submodules: true
 
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-
-      - uses: actions/cache@v2
-        with:
-          path: vendor/bundle
-          key: bundle-${{ matrix.os }}-${{ matrix.ruby }}-${{ hashFiles('**/*.gemspec') }}
-          restore-keys: bundle-${{ matrix.os }}-${{ matrix.ruby }}
-
-      - run: bundle config set path 'vendor/bundle'
-
-      - run: bundle install --jobs 4 --retry 3
+          bundler-cache: true
 
       - run: bundle exec rake
-
-  tests-passed:
-    needs: rake
-    runs-on: ubuntu-latest
-    steps:
-      - name: Trigger tests passed event
-        uses: Sibz/github-status-action@v1
-        with:
-          authToken: ${{ secrets.METANORMA_CI_PAT_TOKEN || secrets.GITHUB_TOKEN }}
-          context: 'tests-passed-successfully'
-          description: 'Tests passed successfully'
-          state: 'success'
-          sha: ${{ github.event.pull_request.head.sha || github.sha }}

data/.rubocop.yml

@@ -4,7 +4,3 @@
 
 inherit_from:
   - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
-AllCops:
-  TargetRubyVersion: 2.3
-Rails:
-  Enabled: true

data/lib/asciidoctor/iec/basicdoc.rng

@@ -729,9 +729,11 @@
   </define>
   <define name="index">
     <element name="index">
-      <attribute name="to">
-        <data type="IDREF"/>
-      </attribute>
+      <optional>
+        <attribute name="to">
+          <data type="IDREF"/>
+        </attribute>
+      </optional>
       <element name="primary">
         <oneOrMore>
           <ref name="PureTextElement"/>

data/lib/asciidoctor/iec/converter.rb

@@ -80,6 +80,26 @@ module Asciidoctor
         super
         @is_iev and replace_title(x, "//introduction", @i18n&.introduction_iev)
       end
+
+      def note(n)
+        if n.title == "Note from TC/SC Officers"
+          noko do |xml|
+            xml.tc_sc_officers_note do |c|
+              wrap_in_para(n, c)
+            end
+          end.join("\n")
+        else
+          super
+        end
+      end
+
+      def note_cleanup(xmldoc)
+        super
+        n = xmldoc.at("//tc-sc-officers-note") and xmldoc.at("//bibdata/ext").add_child(n.remove)
+      end
+
+      def image_name_validate(xmldoc)
+      end
     end
   end
 end

data/lib/asciidoctor/iec/front.rb

@@ -51,56 +51,17 @@ module Asciidoctor
       end
 
       STAGE_CODES = {
-        "PNW" => "1000",
-        "ANW" => "2000",
-        "CAN" => "2098",
-        "ACD" => "2099",
-        "CD" => "3020",
-        "BWG" => "3092",
-        "A2CD" => "3099",
-        "2CD" => "3520",
-        "3CD" => "3520",
-        "4CD" => "3520",
-        "5CD" => "3520",
-        "6CD" => "3520",
-        "7CD" => "3520",
-        "8CD" => "3520",
-        "9CD" => "3520",
-        "CDM" => "3591",
-        "A3CD" => "3592",
-        "A4CD" => "3592",
-        "A5CD" => "3592",
-        "A6CD" => "3592",
-        "A7CD" => "3592",
-        "A8CD" => "3592",
-        "A9CD" => "3592",
-        "ACDV" => "3599",
-        "CCDV" => "4020",
-        "CDVM" => "4091",
-        "NCDV" => "4092",
-        "NADIS" => "4093",
-        "ADIS" => "4099",
-        "ADTR" => "4099",
-        "ADTS" => "4099",
-        "RDISH" => "5000",
-        "RFDIS" => "5000",
-        "CDISH" => "5020",
-        "CDPAS" => "5020",
-        "CDTR" => "5020",
-        "CDTS" => "5020",
-        "CFDIS" => "5020",
-        "DTRM" => "5092",
-        "DTSM" => "5092",
-        "NDTR" => "5092",
-        "NDTS" => "5092",
-        "NFDIS" => "5092",
-        "APUB" => "5099",
-        "BPUB" => "6000",
-        "PPUB" => "6060",
-        "RR" => "9092",
-        "AMW" => "9220",
-        "WPUB" => "9599",
-        "DELPUB" => "9960",
+        "PNW" => "1000", "ANW" => "2000", "CAN" => "2098", "ACD" => "2099", "CD" => "3020",
+        "BWG" => "3092", "A2CD" => "3099", "2CD" => "3520", "3CD" => "3520", "4CD" => "3520",
+        "5CD" => "3520", "6CD" => "3520", "7CD" => "3520", "8CD" => "3520", "9CD" => "3520",
+        "CDM" => "3591", "A3CD" => "3592", "A4CD" => "3592", "A5CD" => "3592", "A6CD" => "3592",
+        "A7CD" => "3592", "A8CD" => "3592", "A9CD" => "3592", "ACDV" => "3599", "CCDV" => "4020",
+        "CDVM" => "4091", "NCDV" => "4092", "NADIS" => "4093", "ADIS" => "4099", "ADTR" => "4099",
+        "ADTS" => "4099", "RDISH" => "5000", "RFDIS" => "5000", "CDISH" => "5020", "CDPAS" => "5020",
+        "CDTR" => "5020", "CDTS" => "5020", "CFDIS" => "5020", "DTRM" => "5092", "DTSM" => "5092",
+        "NDTR" => "5092", "NDTS" => "5092", "NFDIS" => "5092", "APUB" => "5099", "BPUB" => "6000",
+        "PPUB" => "6060", "RR" => "9092", "AMW" => "9220", "WPUB" => "9599", "DELPUB" => "9960",
+        "PWI" => "0000", "NWIP" => "1000", "WD" => "2000", "CDV" => "4000", "FDIS" => "5000",
       }.freeze
 
       DOC_STAGE = {
@@ -123,7 +84,8 @@ module Asciidoctor
         "20" => {"00" => "ANW", "98" => "CAN", "99" => "ACD"},
         "30" => {"00" => "CD", "20" => "CD", "92" => "BWG", "97" => "MERGED", "98" => "DREJ", "99" => "A2CD"},
         "35" => {"00" => "CD", "20" => "CD", "91" => "CDM", "92" => "ACD", "99" => "ACDV"},
-        "40" => {"00" => "CCDV", "20" => "CCDV", "91" => "CDVM", "92" => "NCDV", "93" => "NADIS", "95" => "ADISSB", "99" => "ADIS"},
+        "40" => {"00" => "CCDV", "20" => "CCDV", "91" => "CDVM", "92" => "NCDV", "93" => "NADIS", 
+                 "95" => "ADISSB", "99" => "ADIS"},
         "50" => {"00" => "RFDIS", "20" => "CFDIS", "92" => "NFDIS", "95" => "APUBSB", "99" => "APUB"},
         "60" => {"00" => "BPUB", "60" => "PPUB"},
         "90" => {"00" => "RR", "92" => "RR"},
@@ -183,8 +145,7 @@ module Asciidoctor
 
       def get_stage(node)
         stage = node.attr("status") || node.attr("docstage") || "60"
-        m = /([0-9])CD$/.match(stage) and
-          node.set_attr("iteration", m[1])
+        m = /([0-9])CD$/.match(stage) and node.set_attr("iteration", m[1])
         STAGE_CODES[stage] and stage = STAGE_CODES[stage][0..1]
         stage
       end
@@ -193,9 +154,7 @@ module Asciidoctor
         st = node.attr("status") || node.attr("docstage")
         stage = get_stage(node)
         node.attr("docsubstage") ||
-          ( stage == "60" ? "60" :
-           STAGE_CODES[st] ? STAGE_CODES[st][2..3] :
-           "00" )
+          ( stage == "60" ? "60" : STAGE_CODES[st] ? STAGE_CODES[st][2..3] : "00" )
       end
 
       def id_stage_abbr(stage, substage, node)
@@ -211,8 +170,7 @@ module Asciidoctor
         xml.status do |s|
           s.stage stage, **attr_code(abbreviation: stage_abbr(stage, substage))
           s.substage substage,
-            **attr_code(abbreviation: status_abbrev1(stage, substage,
-                                                     node.attr("iteration"), 
+            **attr_code(abbreviation: status_abbrev1(stage, substage, node.attr("iteration"), 
                                                      doctype(node),node.attr("draft")))
           node.attr("iteration") && (s.iteration node.attr("iteration"))
         end
@@ -224,11 +182,17 @@ module Asciidoctor
         a = node.attr("function") and xml.function a
       end
 
+      def relaton_relations
+        super + %w(obsoletes)
+      end
+
       def metadata_ext(node, xml)
         super
         a = node.attr("accessibility-color-inside") and xml.accessibility_color_inside a
         a = node.attr("price-code") and xml.price_code a
         a = node.attr("cen-processing") and xml.cen_processing a
+        a = node.attr("secretary") and xml.secretary a
+        a = node.attr("interest-to-committees") and xml.interest_to_committees a
       end
     end
   end

data/lib/asciidoctor/iec/iec.rng

@@ -43,6 +43,15 @@
       <optional>
         <ref name="cen-processing"/>
       </optional>
+      <optional>
+        <ref name="secretary"/>
+      </optional>
+      <optional>
+        <ref name="interest-to-committees"/>
+      </optional>
+      <optional>
+        <ref name="tc-sc-officers-note"/>
+      </optional>
     </define>
   </include>
   <!-- end overrides -->
@@ -71,6 +80,23 @@
       <data type="boolean"/>
     </element>
   </define>
+  <define name="secretary">
+    <element name="secretary">
+      <text/>
+    </element>
+  </define>
+  <define name="interest-to-committees">
+    <element name="interest-to-committees">
+      <text/>
+    </element>
+  </define>
+  <define name="tc-sc-officers-note">
+    <element name="tc-sc-officers-note">
+      <zeroOrMore>
+        <ref name="BasicBlock"/>
+      </zeroOrMore>
+    </element>
+  </define>
   <!--
     We display the Normative References between scope and terms; but to keep the
     grammar simple, we keep the references together
@@ -88,6 +114,9 @@
       <zeroOrMore>
         <ref name="termdocsource"/>
       </zeroOrMore>
+      <optional>
+        <ref name="misccontainer"/>
+      </optional>
       <optional>
         <ref name="boilerplate"/>
       </optional>
@@ -99,6 +128,14 @@
         <ref name="annex"/>
       </zeroOrMore>
       <ref name="bibliography"/>
+      <zeroOrMore>
+        <ref name="indexsect"/>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="updates_document_type">
+    <element name="updates-document-type">
+      <ref name="DocumentType"/>
     </element>
   </define>
 </grammar>

data/lib/asciidoctor/iec/iec_intro_en.xml

@@ -1,6 +1,13 @@
 <boilerplate>
   <copyright-statement>
-    <clause>
+    <clause>  
+      {% if unpublished %}
+      <p><strong>Copyright © {{ docyear }} 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.
+      {% else %}
       <p id="boilerplate-year">
         © {{ agency }} {{ docyear }}, Published in Switzerland
       </p>
@@ -20,6 +27,7 @@
         Fax&#xa0;&#xa0;+ 41 22 919 03 00<br/>
         info@iec.ch<br/>
         www.iec.ch
+      {% endif %}
       </p>
     </clause>
   </copyright-statement>
@@ -41,21 +49,37 @@
   {% if unpublished %}
   <license-statement>
     <clause>
-      <title>Warning for CDs, CDVs and FDISs</title>
-
-      <p>This
-        document is not an IEC International Standard. It is distributed for review and
-        comment. It is subject to change without notice and may not be referred to as
-        an International Standard.</p>
-
-      <p>Recipients
-        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>
+      {% if stage_int < 50 %}
+      <p>This document is still under study and subject to change. It should not be used for reference purposes.</p>
+      until published as such.</p>
+    {% endif %}
+      {% if stage_int >= 50 %}
+      <p>This document is a draft distributed for approval. It may not be referred to as an International Standard
+        until published as such.</p>
+      {% endif %}
+      {% if stage_int >= 50 %}
+      <p>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>
+      {% endif %}
+      <p>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>
   {% endif %}
   <feedback-statement>
+    {% if unpublished %}
+    <clause id="boilerplate-cenelec-attention">
+      <title>Attention IEC-CENELEC parallel voting</title>
+      <p>The attention of IEC National Committees, members of CENELEC, is drawn to the fact that this
+        {% if stage_int >= 30 and stage_int < 40 %}Committee Draft{% endif %}
+        {% if stage_int >= 40 and stage_int < 50 %}Committee Draft For Vote{% endif %}
+        {% if stage_int >= 50 and stage_int < 60 %}Final Draft International Standard{% endif %}
+        ({{ stageabbr }})
+        is submitted for parallel voting.</p>
+      <p>The CENELEC members are invited to vote through the CENELEC voting system.</p>
+    </clause>
+    {% else %}
     <clause>
       <title>About the IEC</title>
       <p>The International Electrotechnical Commission (IEC) is the leading global organization that prepares and publishes International Standards for all electrical, electronic and related technologies.</p>
@@ -85,6 +109,7 @@
         <p>If you wish to give us your feedback on this publication or need further assistance, please contact the Customer Service Centre: <link target="mailto://csc@iec.ch">csc@iec.ch</link>.</p>
       </clause>
     </clause>
+    {% endif %}
   </feedback-statement>
 </boilerplate>
 

data/lib/asciidoctor/iec/iec_intro_fr.xml

@@ -1,6 +1,13 @@
 <boilerplate>
   <copyright-statement>
     <clause>
+      {% if unpublished %}
+      <p><strong>Copyright © {{ docyear }} 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.
+      {% else %}
       <p id="boilerplate-year">
     © {{ agency }} {{ docyear }}, Publié en Suisse
   </p>
@@ -23,6 +30,7 @@ l’adresse ci-après ou au comité membre de l’IEC dans le pays du demandeur.
     info@iec.ch<br/>
     www.iec.ch
   </p>
+  {% endif %}
 </clause>
 </copyright-statement>
 <legal-statement>
@@ -42,15 +50,38 @@ l’adresse ci-après ou au comité membre de l’IEC dans le pays du demandeur.
 </legal-statement>
  {% if unpublished %}
 <license-statement>
-  <clause>
-  <title>Avertissement</title>
-
-<p>Ce document n'est pas une Norme internationale de l'ISO. Il est distribué pour examen et observations. Il est susceptible de modification sans préavis et ne peut être cité comme Norme internationale.</p>
-<p>Les destinataires du présent projet sont invités à présenter, avec leurs observations, notification des droits de propriété dont ils auraient éventuellement connaissance et à fournir une documentation explicative.</p>
-</clause>
+    <clause>
+      {% if stage_int < 40 %}
+      <p>This document is still under study and subject to change. It should not be used for reference purposes.</p>
+      until published as such.</p>
+    {% endif %}
+      {% if stage_int >= 40 %}
+      <p>This document is a draft distributed for approval. It may not be referred to as an International Standard
+        until published as such.</p>
+      {% endif %}
+      {% if stage_int >= 50 %}
+      <p>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>
+      {% endif %}
+      <p>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>
 {% endif %}
 <feedback-statement>
+  {% if unpublished %}
+    <clause id="boilerplate-cenelec-attention">
+      <title>Attention IEC-CENELEC parallel voting</title>
+      <p>The attention of IEC National Committees, members of CENELEC, is drawn to the fact that this
+        {% if stage_int >= 30 and stage_int < 40 %}Committee Draft{% endif %}
+        {% if stage_int >= 40 and stage_int < 50 %}Committee Draft For Vote{% endif %}
+        {% if stage_int >= 50 and stage_int < 60 %}Final Draft International Standard{% endif %}
+        ({{ stageabbr }})
+        is submitted for parallel voting.</p>
+      <p>The CENELEC members are invited to vote through the CENELEC voting system.</p>
+    </clause>
+    {% else %}
 <clause>
   <title>A propos de l'IEC</title>
   <p>La Commission Electrotechnique Internationale (IEC) est la première organisation mondiale qui élabore et publie des Normes internationales pour tout ce qui a trait à l'électricité, à l'électronique et aux technologies apparentées.</p>
@@ -80,6 +111,7 @@ l’adresse ci-après ou au comité membre de l’IEC dans le pays du demandeur.
     <p>Si vous désirez nous donner des commentaires sur cette publication ou si vous avez des questions contactez-nous: <link target="mailto://csc@iec.ch">csc@iec.ch</link>.</p>
   </clause>
 </clause>
+{% endif %}
 </feedback-statement>
 </boilerplate>