metanorma-iec 1.3.3 → 1.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a24900a199a0791b4bb2358674e8b34b109c9d8953b656f0d6662c9f8fd0466
-  data.tar.gz: b5db833a6cc328ff262ae38411438ca4549d36dacd74bb7ec14695183b41afec
+  metadata.gz: a5b9cbe5c402a7dbd3a2b074aefdc52fa620a62c515d8a8d32a904c2198d4c5e
+  data.tar.gz: 43958dfa8f657c760a67c35d10403123fde662527f0c94402a7f32ab2e582ad2
 SHA512:
-  metadata.gz: 7c7741d485f92f29adc57dfac10b8d842db1fab885f5f220fdcd216644ee78831ea9feee2fa3d028f612e78e44c1bccf074aaeed96fcf237462e4ef0c7621364
-  data.tar.gz: 94b6790578314e2bf8fc68c77241a14b4ac68f8bbffa69706593f6345b82ccc9766ac6b80f7931c97c7ed3c5003bd309644863706eef6308ac8cdfe08b8e8852
+  metadata.gz: 5fa2ca8ae28b7ae9d060a1900f72a362f2d3f64b7cfb36a3b7e537270720be9c01b7eb5df31ca86ce263cc59b3dc08556d517c8c7aab4f9d4170846261b0a197
+  data.tar.gz: dd32106b4774c119cdd10ce89944f116d146906f70e0ecb29e8094fe45340319c35e1dcc308ebf1f0c95699b6a398b4f970b5878e7730eee27e169d4360841ee

data/.github/workflows/rake.yml

@@ -16,19 +16,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '2.7', '2.6', '2.5', '2.4' ]
+        ruby: [ '3.0', '2.7', '2.6', '2.5' ]
         os: [ ubuntu-latest, windows-latest, macos-latest ]
         experimental: [ false ]
-        include:
-          - ruby: '3.0'
-            os: 'ubuntu-latest'
-            experimental: true
-          - ruby: '3.0'
-            os: 'windows-latest'
-            experimental: true
-          - ruby: '3.0'
-            os: 'macos-latest'
-            experimental: true
     steps:
       - uses: actions/checkout@v2
         with:
@@ -40,3 +30,14 @@ jobs:
           bundler-cache: true
 
       - run: bundle exec rake
+
+  tests-passed:
+    needs: rake
+    runs-on: ubuntu-latest
+    steps:
+      - uses: peter-evans/repository-dispatch@v1
+        with:
+          token: ${{ secrets.METANORMA_CI_PAT_TOKEN || secrets.GITHUB_TOKEN }}
+          repository: ${{ github.repository }}
+          event-type: tests-passed
+          client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'

data/.hound.yml

@@ -1,3 +1,5 @@
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
 ruby:
-  Enabled: true
+  enabled: true
   config_file: .rubocop.yml

data/.rubocop.yml

@@ -1,12 +1,10 @@
-# This project follows the Ribose OSS style guide.
-# https://github.com/riboseinc/oss-guides
-# All project-specific additions and overrides should be specified in this file.
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
 inherit_from:
   - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
 
 # local repo-specific modifications
+# ...
 
 AllCops:
-  DisplayCopNames: false
-  StyleGuideCopsOnly: false
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.5

data/lib/asciidoctor/iec/front.rb

@@ -6,7 +6,9 @@ module Asciidoctor
         csv_split(publishers)&.each do |p|
           xml.contributor do |c|
             c.role **{ type: "author" }
-            c.organization { |a| organization(a, p, false, node, !node.attr("publisher")) }
+            c.organization do |a|
+              organization(a, p, false, node, !node.attr("publisher"))
+            end
           end
         end
       end
@@ -16,7 +18,9 @@ module Asciidoctor
         csv_split(publishers)&.each do |p|
           xml.contributor do |c|
             c.role **{ type: "publisher" }
-            c.organization { |a| organization(a, p, true, node, !node.attr("publisher")) }
+            c.organization do |a|
+              organization(a, p, true, node, !node.attr("publisher"))
+            end
           end
         end
       end
@@ -47,24 +51,29 @@ module Asciidoctor
         xml.docidentifier dn, **attr_code(type: "ISO")
       end
 
-      def id_edition_suffix(dn, node)
+      def id_edition_suffix(docnum, node)
         ed = node.attr("edition") || 1
-        dn += " ED #{ed}"
-        dn
+        docnum += " ED #{ed}"
+        docnum
       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",
-        "PWI" => "0000", "NWIP" => "1000", "WD" => "2000", "CDV" => "4000", "FDIS" => "5000",
+        "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 = {
@@ -82,19 +91,23 @@ module Asciidoctor
       }.freeze
 
       STAGE_ABBRS = {
-        "00" => {"00" => "PWI"},
-        "10" => {"00" => "PNW"},
-        "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"},
-        "50" => {"00" => "RFDIS", "20" => "CFDIS", "92" => "NFDIS", "95" => "APUBSB", "99" => "APUB"},
-        "60" => {"00" => "BPUB", "60" => "PPUB"},
-        "90" => {"00" => "RR", "92" => "RR"},
-        "92" => {"00" => "AMW", "20" => "AMW"},
-        "95" => {"00" => "WPUB", "99" => "WPUB"},
-        "99" => {"00" => "DELPUB", "60" => "DELPUB"},
+        "00" => { "00" => "PWI" },
+        "10" => { "00" => "PNW" },
+        "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" },
+        "50" => { "00" => "RFDIS", "20" => "CFDIS", "92" => "NFDIS",
+                  "95" => "APUBSB", "99" => "APUB" },
+        "60" => { "00" => "BPUB", "60" => "PPUB" },
+        "90" => { "00" => "RR", "92" => "RR" },
+        "92" => { "00" => "AMW", "20" => "AMW" },
+        "95" => { "00" => "WPUB", "99" => "WPUB" },
+        "99" => { "00" => "DELPUB", "60" => "DELPUB" },
       }.freeze
 
       STAGE_NAMES = {
@@ -112,7 +125,7 @@ module Asciidoctor
         "99": "Deleted",
       }.freeze
 
-      def status_abbrev1(stage, substage, iter, doctype, draft)
+      def status_abbrev1(stage, substage, iter, doctype, _draft)
         return "" unless stage
 
         abbr = STAGE_ABBRS.dig(stage, substage) || "??"
@@ -121,30 +134,30 @@ module Asciidoctor
         end
         case doctype
         when "technical-report"
-          stage = "ADTR" if stage == "40" && substage == "99"
-          stage = "CDTR" if stage == "50" && substage == "20"
-          stage = "DTRM" if stage == "50" && substage == "92"
+          abbr = "ADTR" if stage == "40" && substage == "99"
+          abbr = "CDTR" if stage == "50" && substage == "20"
+          abbr = "DTRM" if stage == "50" && substage == "92"
         when "technical-specification"
-          stage = "ADTS" if stage == "40" && substage == "99"
-          stage = "CDTS" if stage == "50" && substage == "20"
-          stage = "DTSM" if stage == "50" && substage == "92"
+          abbr = "ADTS" if stage == "40" && substage == "99"
+          abbr = "CDTS" if stage == "50" && substage == "20"
+          abbr = "DTSM" if stage == "50" && substage == "92"
         when "interpretation-sheet"
-          stage = "RDISH" if stage == "50" && substage == "00"
-          stage = "CDISH" if stage == "50" && substage == "20"
+          abbr = "RDISH" if stage == "50" && substage == "00"
+          abbr = "CDISH" if stage == "50" && substage == "20"
         when "publicly-available-specification"
-          stage = "CDPAS" if stage == "50" && substage == "20"
+          abbr = "CDPAS" if stage == "50" && substage == "20"
         end
         abbr = abbr.sub(/CD$/, "#{iter}CD") if iter
         abbr
       end
 
-      def stage_abbr(stage, substage)
+      def stage_abbr(stage, _substage)
         return "PPUB" if stage == "60"
 
         DOC_STAGE[stage.to_sym] || "??"
       end
 
-      def stage_name(stage, substage, _doctype, _iteration)
+      def stage_name(stage, _substage, _doctype, _iteration)
         STAGE_NAMES[stage.to_sym]
       end
 
@@ -159,11 +172,16 @@ 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" )
+          (if stage == "60"
+             "60"
+           else
+             STAGE_CODES[st] ? STAGE_CODES[st][2..3] : "00"
+           end)
       end
 
-      def id_stage_abbr(stage, substage, node)
+      def id_stage_abbr(stage, _substage, node)
         return "" if stage == "60"
+
         abbr = DOC_STAGE[stage.to_sym] || ""
         abbr = node.attr("iteration") + abbr if node.attr("iteration")
         abbr
@@ -174,9 +192,9 @@ module Asciidoctor
         substage = get_substage(node)
         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"), 
-                                                     doctype(node),node.attr("draft")))
+          subst = status_abbrev1(stage, substage, node.attr("iteration"),
+                                 doctype(node), node.attr("draft"))
+          s.substage substage, **attr_code(abbreviation: subst)
           node.attr("iteration") && (s.iteration node.attr("iteration"))
         end
       end

data/lib/asciidoctor/iec/iec.rng

@@ -13,10 +13,14 @@
         <value>publicly-available-specification</value>
         <value>international-workshop-agreement</value>
         <value>guide</value>
+        <value>industry-technical-agreement</value>
       </choice>
     </define>
     <define name="BibDataExtensionType">
       <ref name="doctype"/>
+      <optional>
+        <ref name="docsubtype"/>
+      </optional>
       <optional>
         <ref name="horizontal"/>
       </optional>

data/lib/asciidoctor/iec/isodoc.rng

@@ -45,6 +45,11 @@
         <optional>
           <attribute name="alt"/>
         </optional>
+        <optional>
+          <attribute name="updatetype">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <text/>
       </element>
     </define>
@@ -199,6 +204,18 @@
         </zeroOrMore>
       </element>
     </define>
+    <define name="dt">
+      <element name="dt">
+        <optional>
+          <attribute name="id">
+            <data type="ID"/>
+          </attribute>
+        </optional>
+        <zeroOrMore>
+          <ref name="TextElement"/>
+        </zeroOrMore>
+      </element>
+    </define>
     <define name="example">
       <element name="example">
         <attribute name="id">
@@ -543,6 +560,9 @@
     </define>
     <define name="BibDataExtensionType">
       <ref name="doctype"/>
+      <optional>
+        <ref name="docsubtype"/>
+      </optional>
       <optional>
         <ref name="editorialgroup"/>
       </optional>
@@ -890,6 +910,14 @@
     </define>
   </include>
   <!-- end overrides -->
+  <define name="docsubtype">
+    <element name="subdoctype">
+      <ref name="DocumentSubtype"/>
+    </element>
+  </define>
+  <define name="DocumentSubtype">
+    <text/>
+  </define>
   <define name="colgroup">
     <element name="colgroup">
       <oneOrMore>
@@ -939,7 +967,34 @@
   <define name="concept">
     <element name="concept">
       <optional>
-        <attribute name="term"/>
+        <attribute name="ital">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="ref">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <element name="refterm">
+          <zeroOrMore>
+            <choice>
+              <ref name="PureTextElement"/>
+              <ref name="stem"/>
+            </choice>
+          </zeroOrMore>
+        </element>
+      </optional>
+      <optional>
+        <element name="renderterm">
+          <zeroOrMore>
+            <choice>
+              <ref name="PureTextElement"/>
+              <ref name="stem"/>
+            </choice>
+          </zeroOrMore>
+        </element>
       </optional>
       <choice>
         <ref name="eref"/>
@@ -965,6 +1020,9 @@
       </attribute>
       <attribute name="name"/>
       <attribute name="action"/>
+      <optional>
+        <attribute name="class"/>
+      </optional>
       <zeroOrMore>
         <choice>
           <ref name="TextElement"/>
@@ -1457,26 +1515,26 @@
     <optional>
       <ref name="section-title"/>
     </optional>
-    <group>
+    <choice>
       <choice>
         <group>
-          <zeroOrMore>
+          <oneOrMore>
             <ref name="BasicBlock"/>
-          </zeroOrMore>
+          </oneOrMore>
           <zeroOrMore>
             <ref name="note"/>
           </zeroOrMore>
         </group>
         <ref name="amend"/>
       </choice>
-      <zeroOrMore>
+      <oneOrMore>
         <choice>
           <ref name="clause-subsection"/>
           <ref name="terms"/>
           <ref name="definitions"/>
         </choice>
-      </zeroOrMore>
-    </group>
+      </oneOrMore>
+    </choice>
   </define>
   <define name="Annex-Section">
     <optional>

data/lib/asciidoctor/iec/isostandard.rng

@@ -38,6 +38,9 @@
     </define>
     <define name="BibDataExtensionType">
       <ref name="doctype"/>
+      <optional>
+        <ref name="docsubtype"/>
+      </optional>
       <optional>
         <ref name="horizontal"/>
       </optional>
@@ -98,7 +101,11 @@
           <ref name="definitions"/>
         </optional>
         <oneOrMore>
-          <ref name="clause"/>
+          <choice>
+            <ref name="clause"/>
+            <ref name="term-clause"/>
+            <ref name="terms"/>
+          </choice>
         </oneOrMore>
       </element>
     </define>
@@ -133,7 +140,7 @@
       <optional>
         <ref name="section-title"/>
       </optional>
-      <group>
+      <choice>
         <choice>
           <group>
             <oneOrMore>
@@ -148,7 +155,7 @@
         <oneOrMore>
           <ref name="clause-subsection"/>
         </oneOrMore>
-      </group>
+      </choice>
     </define>
     <define name="term">
       <element name="term">
@@ -259,6 +266,14 @@
         <value>directive</value>
       </choice>
     </define>
+    <define name="DocumentSubtype">
+      <choice>
+        <value>specification</value>
+        <value>method-of-test</value>
+        <value>vocabulary</value>
+        <value>code-of-practice</value>
+      </choice>
+    </define>
     <define name="structuredidentifier">
       <element name="structuredidentifier">
         <optional>