metanorma-iec 1.3.4 → 1.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6f864a1028a766280c059aa02ec5e56a78806b0e2f2c4ae61efce3f0d254053
-  data.tar.gz: 6e7c6439b85da10d02dc1b9aaf518338e1dfe4cbb3e5b754a4d4c4ccfb3e222a
+  metadata.gz: a58308f35d7e4b796b1366d05f48f1d3227e343f52f08a9a756da7567259cb7f
+  data.tar.gz: 4e5c5fb98a4178e2d03f6ea74e2b14c5cfd93bf8648496f8c6ad559d6d4b2bfc
 SHA512:
-  metadata.gz: 98311ebb5879d224265d355f83ea6f0d64044b3de4d185c6eda67a85705a40a1646e1ec0c6493f7dbf27269768dd6402e21da60639cb7bf880e1902bc463cca3
-  data.tar.gz: 3dcb74e07eaf077c4a6cacec0e60133ab8f53d8d2a4baa8f97d6becd0e20392b8b72ca20a3f73cb7262ded33e3a15d2388657aca308ce03917b80aa715382d4a
+  metadata.gz: d7798dd9aa810e75f931a7bbf408a216107a461d00709c6072b159479a5b7f82eab70bd06d6502e773c1ceb5887f845b29fd70e484c75375ff2526603c1917c0
+  data.tar.gz: fb83d221f49cb8ac9b20832dd1bdffa4f7e6d0cd00affde41b18fc99f247e5db46ff0ee3adc8ec3c0d3164060165d916c09afd77fd28802e212385c4f20c270c

data/.github/workflows/rake.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '3.0', '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 ]
     steps:

data/.rubocop.yml

@@ -7,4 +7,4 @@ inherit_from:
 # ...
 
 AllCops:
-  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/isodoc.rng

@@ -204,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">
@@ -899,7 +911,7 @@
   </include>
   <!-- end overrides -->
   <define name="docsubtype">
-    <element name="docsubtype">
+    <element name="subdoctype">
       <ref name="DocumentSubtype"/>
     </element>
   </define>
@@ -955,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"/>
@@ -972,8 +1011,14 @@
       <ref name="imagemap"/>
       <ref name="svgmap"/>
       <ref name="inputform"/>
+      <ref name="toc"/>
     </choice>
   </define>
+  <define name="toc">
+    <element name="toc">
+      <ref name="ul"/>
+    </element>
+  </define>
   <define name="inputform">
     <element name="form">
       <attribute name="id">
@@ -981,6 +1026,9 @@
       </attribute>
       <attribute name="name"/>
       <attribute name="action"/>
+      <optional>
+        <attribute name="class"/>
+      </optional>
       <zeroOrMore>
         <choice>
           <ref name="TextElement"/>
@@ -1212,6 +1260,12 @@
     <optional>
       <attribute name="type"/>
     </optional>
+    <optional>
+      <attribute name="identifier"/>
+    </optional>
+    <optional>
+      <attribute name="prefix"/>
+    </optional>
     <text/>
   </define>
   <define name="ics">
@@ -1473,26 +1527,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

@@ -101,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>
@@ -136,7 +140,7 @@
       <optional>
         <ref name="section-title"/>
       </optional>
-      <group>
+      <choice>
         <choice>
           <group>
             <oneOrMore>
@@ -151,7 +155,7 @@
         <oneOrMore>
           <ref name="clause-subsection"/>
         </oneOrMore>
-      </group>
+      </choice>
     </define>
     <define name="term">
       <element name="term">

data/lib/isodoc/iec/base_convert.rb

@@ -18,8 +18,8 @@ module IsoDoc
           s.h1(**{ class: "ForewordTitle" }) { |h1| h1 << @i18n.foreword }
           @meta.get[:doctype] == "Amendment" or
             s.div **attr_code(class: "boilerplate_legal") do |s1|
-            b&.elements&.each { |e| parse(e, s1) }
-          end
+              b&.elements&.each { |e| parse(e, s1) }
+            end
           f&.elements&.each { |e| parse(e, s) unless e.name == "title" }
         end
       end
@@ -40,12 +40,12 @@ module IsoDoc
           @meta.get[:doctitlepartlabel] and
             title2 = "#{@meta.get[:doctitlepartlabel]}: #{title2}"
         end
-        out.p(**{ class: "zzSTDTitle1" }) do |p| 
+        out.p(**{ class: "zzSTDTitle1" }) do |p|
           p.b { |b| b << title1 }
         end
         if @meta.get[:doctitlepart]
           out.p(**{ class: "zzSTDTitle1" }) { |p| p << "&nbsp;" }
-          out.p(**{ class: "zzSTDTitle2" }) do |p| 
+          out.p(**{ class: "zzSTDTitle2" }) do |p|
             p.b { |b| b << title2 }
           end
         end
@@ -58,7 +58,7 @@ module IsoDoc
 
       def biblio_list(f, div, biblio)
         return super unless @is_iev
-        i = 0
+
         f.children.each do |b|
           parse(b, div) unless %w(title bibitem).include? b.name
         end
@@ -66,6 +66,7 @@ module IsoDoc
 
       def terms_parse(node, out)
         return super unless @is_iev
+
         page_break(out)
         out.div **attr_code(id: node["id"]) do |div|
           out.p(**{ class: "zzSTDTitle2" }) do |p|
@@ -81,12 +82,14 @@ module IsoDoc
 
       def termref_cleanup(docxml)
         return super unless @is_iev
-        docxml.
-          gsub(%r{\s*\[/TERMREF\]\s*</p>\s*<p>\s*\[TERMREF\]}, "; ").
-          gsub(/\[TERMREF\]\s*/, l10n("#{@i18n.source}: ")).
-          gsub(/\s*\[MODIFICATION\]\s*\[\/TERMREF\]/, l10n(", #{@i18n.modified} [/TERMREF]")).
-          gsub(/\s*\[\/TERMREF\]\s*/, l10n("")).
-          gsub(/\s*\[MODIFICATION\]/, l10n(", #{@i18n.modified} &mdash; "))
+
+        docxml
+          .gsub(%r{\s*\[/TERMREF\]\s*</p>\s*<p>\s*\[TERMREF\]}, "; ")
+          .gsub(/\[TERMREF\]\s*/, l10n("#{@i18n.source}: "))
+          .gsub(/\s*\[MODIFICATION\]\s*\[\/TERMREF\]/,
+                l10n(", #{@i18n.modified} [/TERMREF]"))
+          .gsub(/\s*\[\/TERMREF\]\s*/, l10n(""))
+          .gsub(/\s*\[MODIFICATION\]/, l10n(", #{@i18n.modified} &mdash; "))
       end
 
       def set_termdomain(termdomain)
@@ -95,13 +98,15 @@ module IsoDoc
 
       def term_suffix(node, out)
         return unless @is_iev
+
         domain = node&.at(ns("../domain"))&.text
         return unless domain
+
         out << ", &lt;#{domain}&gt;"
       end
 
       def deprecated_term_parse(node, out)
-        out.p **{ class: "DeprecatedTerms", style:"text-align:left;" } do |p|
+        out.p **{ class: "DeprecatedTerms", style: "text-align:left;" } do |p|
           p << l10n("#{@i18n.deprecated}: ")
           node.children.each { |c| parse(c, p) }
           term_suffix(node, p)
@@ -109,7 +114,7 @@ module IsoDoc
       end
 
       def admitted_term_parse(node, out)
-        out.p **{ class: "AltTerms", style:"text-align:left;" } do |p|
+        out.p **{ class: "AltTerms", style: "text-align:left;" } do |p|
           node.children.each { |c| parse(c, p) }
           term_suffix(node, p)
         end
@@ -117,7 +122,8 @@ module IsoDoc
 
       def term_parse(node, out)
         return super unless @is_iev
-        out.p **{ class: "Terms", style:"text-align:left;" } do |p|
+
+        out.p **{ class: "Terms", style: "text-align:left;" } do |p|
           node.children.each { |c| parse(c, p) }
           term_suffix(node, p)
         end