metanorma-iec 1.3.0 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 896831ab7585bc0d95fa10bcef8ba276bc624f6b5b51534e136177f43c74723c
-  data.tar.gz: 2dec389207942c399e02b6cb085541f6255715f3cbb0c6c1ee8dfe29204b618d
+  metadata.gz: 1927ece3a09c61d4d12c9f6daa48bbadf0168bee1bfcde52392123308c44edb6
+  data.tar.gz: 1c92e46aa15e727af3438267cf5f9e72d78c00a959a8bcc354f384d0cc21102b
 SHA512:
-  metadata.gz: ca103b07a7421e67ec218b8a759fc51d997eab8185a11c0bff0fefa6f1b632ea4bd614e61028b1b94e6f372f3c73c8a7ea9a772a507cdff883d0a14d502a9717
-  data.tar.gz: ffad29f88e9171b636abf4fb7d1b85fe5a6627fd71fdbadf53cb612cae032b6f1481a3bf3dc950ea3623f93bbd45a87a4c9467358022cc250daffeac25cec956
+  metadata.gz: 98fd5f51acfe167d57c8f465d69d2f8fe7c4c24fd1393ed1377b27c36735066fbe1b71aeb6970e4e16ede2ed98f7143c602a4b3a091ad19f8b799dd3618639fb
+  data.tar.gz: da6cd485af116325a064b085d0533a0f895129de6a240129b233d1b9ea278df14a8a4a3931218b3ab34c87250fbd88df2a94a2177d0925a37458c97c8c88b348

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', '2.4' ]
         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,14 +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
-Rails:
-  Enabled: true
+  TargetRubyVersion: 2.5

data/lib/asciidoctor/iec/biblio.rng

@@ -787,6 +787,7 @@
       <value>adapted</value>
       <value>vote-started</value>
       <value>vote-ended</value>
+      <value>announced</value>
     </choice>
   </define>
   <define name="bdate">

data/lib/asciidoctor/iec/front.rb

@@ -6,7 +6,7 @@ module Asciidoctor
         csv_split(publishers)&.each do |p|
           xml.contributor do |c|
             c.role **{ type: "author" }
-            c.organization { |a| organization(a, p, node, !node.attr("publisher")) }
+            c.organization { |a| organization(a, p, false, node, !node.attr("publisher")) }
           end
         end
       end
@@ -16,19 +16,21 @@ module Asciidoctor
         csv_split(publishers)&.each do |p|
           xml.contributor do |c|
             c.role **{ type: "publisher" }
-            c.organization { |a| organization(a, p, node, !node.attr("publisher")) }
+            c.organization { |a| organization(a, p, true, node, !node.attr("publisher")) }
           end
         end
       end
 
       def metadata_copyright(node, xml)
-        publishers = node.attr("copyright-holder") || node.attr("publisher") || "IEC"
+        publishers = node.attr("copyright-holder") || node.attr("publisher") ||
+          "IEC"
         csv_split(publishers)&.each do |p|
           xml.copyright do |c|
             c.from (node.attr("copyright-year") || Date.today.year)
             c.owner do |owner|
               owner.organization do |o|
-                organization(o, p, node, !node.attr("copyright-holder") || node.attr("publisher"))
+                organization(o, p, true, node, !node.attr("copyright-holder") ||
+                             node.attr("publisher"))
               end
             end
           end
@@ -37,6 +39,7 @@ module Asciidoctor
 
       def iso_id(node, xml)
         return unless node.attr("docnumber")
+
         part, subpart = node&.attr("partnumber")&.split(/-/)
         dn = add_id_parts(node.attr("docnumber"), part, subpart)
         dn = id_stage_prefix(dn, node, false)
@@ -111,6 +114,7 @@ module Asciidoctor
 
       def status_abbrev1(stage, substage, iter, doctype, draft)
         return "" unless stage
+
         abbr = STAGE_ABBRS.dig(stage, substage) || "??"
         if stage == "35" && substage == "92"
           iter = (iter.to_i + 1) % "02"
@@ -136,6 +140,7 @@ module Asciidoctor
 
       def stage_abbr(stage, substage)
         return "PPUB" if stage == "60"
+
         DOC_STAGE[stage.to_sym] || "??"
       end
 
@@ -188,7 +193,8 @@ module Asciidoctor
 
       def metadata_ext(node, xml)
         super
-        a = node.attr("accessibility-color-inside") and xml.accessibility_color_inside a
+        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

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/iec_intro_en.xml

@@ -50,7 +50,7 @@
   <license-statement>
     <clause>
       {% if stage_int < 50 %}
-      <p>This document is still under study and subject to change. It should not be used for reference purposes.</p>
+      <p>This document is still under study and subject to change. It should not be used for reference purposes.
       until published as such.</p>
     {% endif %}
       {% if stage_int >= 50 %}

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>
@@ -543,6 +548,9 @@
     </define>
     <define name="BibDataExtensionType">
       <ref name="doctype"/>
+      <optional>
+        <ref name="docsubtype"/>
+      </optional>
       <optional>
         <ref name="editorialgroup"/>
       </optional>
@@ -876,8 +884,28 @@
         </zeroOrMore>
       </element>
     </define>
+    <define name="pagebreak">
+      <element name="pagebreak">
+        <optional>
+          <attribute name="orientation">
+            <choice>
+              <value>landscape</value>
+              <value>portrait</value>
+            </choice>
+          </attribute>
+        </optional>
+      </element>
+    </define>
   </include>
   <!-- end overrides -->
+  <define name="docsubtype">
+    <element name="docsubtype">
+      <ref name="DocumentSubtype"/>
+    </element>
+  </define>
+  <define name="DocumentSubtype">
+    <text/>
+  </define>
   <define name="colgroup">
     <element name="colgroup">
       <oneOrMore>
@@ -943,8 +971,170 @@
       <ref name="permission"/>
       <ref name="imagemap"/>
       <ref name="svgmap"/>
+      <ref name="inputform"/>
+    </choice>
+  </define>
+  <define name="inputform">
+    <element name="form">
+      <attribute name="id">
+        <data type="ID"/>
+      </attribute>
+      <attribute name="name"/>
+      <attribute name="action"/>
+      <zeroOrMore>
+        <choice>
+          <ref name="TextElement"/>
+          <ref name="FormInput"/>
+        </choice>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="FormInput">
+    <choice>
+      <ref name="input"/>
+      <ref name="formlabel"/>
+      <ref name="select"/>
+      <ref name="textarea"/>
+    </choice>
+  </define>
+  <define name="InputType">
+    <choice>
+      <value>button</value>
+      <value>checkbox</value>
+      <value>date</value>
+      <value>file</value>
+      <value>password</value>
+      <value>radio</value>
+      <value>submit</value>
+      <value>text</value>
     </choice>
   </define>
+  <define name="input">
+    <element name="input">
+      <attribute name="type">
+        <ref name="InputType"/>
+      </attribute>
+      <optional>
+        <attribute name="checked">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="disabled">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="readonly">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="maxlength">
+          <data type="int"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="minlength">
+          <data type="int"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="name"/>
+      </optional>
+      <optional>
+        <attribute name="value"/>
+      </optional>
+      <optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+      </optional>
+    </element>
+  </define>
+  <define name="formlabel">
+    <element name="label">
+      <attribute name="for">
+        <data type="IDREF"/>
+      </attribute>
+      <zeroOrMore>
+        <ref name="PureTextElement"/>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="select">
+    <element name="select">
+      <optional>
+        <attribute name="name"/>
+      </optional>
+      <optional>
+        <attribute name="value"/>
+      </optional>
+      <optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="disabled">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="multiple">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="size">
+          <data type="int"/>
+        </attribute>
+      </optional>
+      <oneOrMore>
+        <ref name="option"/>
+      </oneOrMore>
+    </element>
+  </define>
+  <define name="option">
+    <element name="option">
+      <optional>
+        <attribute name="disabled">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="value"/>
+      </optional>
+      <zeroOrMore>
+        <ref name="PureTextElement"/>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="textarea">
+    <element name="textarea">
+      <optional>
+        <attribute name="name"/>
+      </optional>
+      <optional>
+        <attribute name="value"/>
+      </optional>
+      <optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="rows">
+          <data type="int"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="cols">
+          <data type="int"/>
+        </attribute>
+      </optional>
+    </element>
+  </define>
   <define name="bibliography">
     <element name="bibliography">
       <oneOrMore>
@@ -1017,9 +1207,7 @@
   </define>
   <define name="IsoWorkgroup">
     <optional>
-      <attribute name="number">
-        <data type="int"/>
-      </attribute>
+      <attribute name="number"/>
     </optional>
     <optional>
       <attribute name="type"/>

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>
@@ -256,6 +259,15 @@
         <value>guide</value>
         <value>amendment</value>
         <value>technical-corrigendum</value>
+        <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">

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