metanorma-itu 1.3.0 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ed5bdd15fc291b42dd7b7760aea1a16d11e20cbd098baed7d9670cf4377bef6
-  data.tar.gz: dd1cae93081ac5da55e4b1efee4fd908bf9fde4e01e244ae59ea061cb2d0262e
+  metadata.gz: 6c0181164c1a02d09ba04043e4b8e0ffe8fc2c3d217d5c141118e8fdb283e438
+  data.tar.gz: d9b9f89b8e7156114e69a5b489ec916ae94cfe848961e7f3703b070f59f17f8f
 SHA512:
-  metadata.gz: 42380cb1f49fed3fc99f51e3455049cdf907b158dad19da9ae2a244a761802924ff1727af053f604bfbfab933dab73bd3b225c03af9318fd15362aebf7d89d7c
-  data.tar.gz: 1b4ced1d5237dd83b90254a77a47ed71f3ee97e4b9dc468e09789f8a4d9dd5efda9fd418b42a2e618ee6e66c0404ec43bbd9b0bc1d5e57bf0b8457d0ee5507d3
+  metadata.gz: b95365c930cccd659f770fa364f79208f6720b21af9ef60437f34a974f5555ec6f8d31ebb36fe209601f07da8d4e63bbc2ff43c552cdf872d037ee83a9fc2937
+  data.tar.gz: e947079f69907e22483af10044997e7adbd4fe65294f975362cf119d0419728ca7c0965e6f7215dd9523320de04142013a6380ae96c436ff18b39e6d77c5e748

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/itu/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/itu/converter.rb

@@ -48,14 +48,14 @@ module Asciidoctor
       end
 
       def outputs(node, ret)
-        File.open(@filename + ".xml", "w:UTF-8") { |f| f.write(ret) }
-        presentation_xml_converter(node).convert(@filename + ".xml")
-        html_converter(node).convert(@filename + ".presentation.xml", 
+        File.open("#{@filename}.xml", "w:UTF-8") { |f| f.write(ret) }
+        presentation_xml_converter(node).convert("#{@filename}.xml")
+        html_converter(node).convert("#{@filename}.presentation.xml",
                                      nil, false, "#{@filename}.html")
-        doc_converter(node).convert(@filename + ".presentation.xml", 
+        doc_converter(node).convert("#{@filename}.presentation.xml",
                                     nil, false, "#{@filename}.doc")
         node.attr("no-pdf") or
-          pdf_converter(node)&.convert(@filename + ".presentation.xml", 
+          pdf_converter(node)&.convert("#{@filename}.presentation.xml",
                                        nil, false, "#{@filename}.pdf")
       end
 
@@ -65,8 +65,8 @@ module Asciidoctor
                         File.join(File.dirname(__FILE__), "itu.rng"))
       end
 
-      def style(n, t)
-        return
+      def style(_node, _text)
+        nil
       end
 
       def sectiontype_streamline(ret)
@@ -84,16 +84,16 @@ module Asciidoctor
       def sectiontype(node, level = true)
         ret = super
         hdr = sectiontype_streamline(node&.attr("heading")&.downcase)
-        return nil if ret == "terms and definitions" && 
+        return nil if ret == "terms and definitions" &&
           hdr != "terms and definitions" && node.level > 1
-        return nil if ret == "symbols and abbreviated terms" && 
+        return nil if ret == "symbols and abbreviated terms" &&
           hdr != "symbols and abbreviated terms" && node.level > 1
 
         ret
       end
 
       def term_def_subclause_parse(attrs, xml, node)
-        case clausetype = sectiontype1(node)
+        case sectiontype1(node)
         when "terms defined in this recommendation"
           term_def_parse(attrs.merge(type: "internal"), xml, node, false)
         when "terms defined elsewhere"
@@ -106,11 +106,17 @@ module Asciidoctor
       def metadata_keywords(node, xml)
         return unless node.attr("keywords")
 
-        node.attr("keywords").split(/,[ ]*/).sort.each_with_index do |kw, i|
-          xml.keyword (i == 0 ? kw.capitalize : kw)
+        node.attr("keywords").split(/, */).sort.each_with_index do |kw, i|
+          xml.keyword (i.zero? ? strict_capitalize(kw) : kw)
         end
       end
 
+      def strict_capitalize(str)
+        letters = str.split("")
+        letters.first.upcase!
+        letters.join
+      end
+
       def clause_parse(attrs, xml, node)
         node.option?("unnumbered") and attrs[:unnumbered] = true
         case sectiontype1(node)

data/lib/asciidoctor/itu/front.rb

@@ -6,21 +6,24 @@ module Asciidoctor
   module ITU
     class Converter < Standoc::Converter
       def metadata_status(node, xml)
+        stage = (node.attr("status") || node.attr("docstage") || "published")
+        stage = "draft" if node.attributes.has_key?("draft")
         xml.status do |s|
-          s.stage (node.attributes.has_key?("draft") ? "draft" :
-                   (node.attr("status") || node.attr("docstage") || "published" ))
+          s.stage stage
         end
       end
 
+      def title_attr(type, lang = "en")
+        { language: lang, format: "text/plain", type: type }
+      end
+
       def title_english(node, xml)
-        at = { language: "en", format: "text/plain", type: "main" }
         a = node.attr("title") || node.attr("title-en")
-        xml.title **attr_code(at) do |t|
+        xml.title **attr_code(title_attr("main")) do |t|
           t << (Metanorma::Utils::asciidoc_sub(a) || node.title)
         end
         if a = node.attr("annextitle") || node.attr("annextitle-en")
-          at[:type] = "annex"
-          xml.title **attr_code(at) do |t|
+          xml.title **attr_code(title_attr("annex")) do |t|
             t << Metanorma::Utils::asciidoc_sub(a)
           end
         end
@@ -30,8 +33,9 @@ module Asciidoctor
         node.attributes.each do |k, v|
           next unless /^(annex)?title-(?<lang>.+)$/ =~ k
           next if lang == "en"
-          type = /^annex/.match(k) ? "annex" : "main"
-          xml.title **attr_code(language: lang, format: "text/plain", type: type) do |t|
+
+          type = /^annex/.match?(k) ? "annex" : "main"
+          xml.title **attr_code(title_attr(type, lang)) do |t|
             t << Metanorma::Utils::asciidoc_sub(v)
           end
         end
@@ -40,15 +44,14 @@ module Asciidoctor
       def title(node, xml)
         super
         %w(subtitle amendment-title corrigendum-title).each do |t|
-        other_title_english(node, xml, t)
-        other_title_otherlangs(node, xml, t)
+          other_title_english(node, xml, t)
+          other_title_otherlangs(node, xml, t)
         end
       end
 
       def other_title_english(node, xml, type)
-        at = { language: "en", format: "text/plain", type: type.sub(/-title/, "") }
         a = node.attr(type) || node.attr("#{type}-en")
-        xml.title **attr_code(at) do |t|
+        xml.title **attr_code(title_attr(type.sub(/-title/, ""))) do |t|
           t << Metanorma::Utils::asciidoc_sub(a)
         end
       end
@@ -57,8 +60,9 @@ module Asciidoctor
         node.attributes.each do |k, v|
           next unless m = /^#{type}-(?<lang>.+)$/.match(k)
           next if m[:lang] == "en"
-          xml.title **attr_code(language: m[:lang], format: "text/plain",
-                                type: type.sub(/-title/, "")) do |t|
+
+          xml.title **attr_code(title_attr(type.sub(/-title/, ""),
+                                           m[:lang])) do |t|
             t << Metanorma::Utils::asciidoc_sub(v)
           end
         end
@@ -79,7 +83,7 @@ module Asciidoctor
 
       def metadata_committee1(node, xml, suffix)
         xml.editorialgroup do |a|
-          a.bureau ( node.attr("bureau#{suffix}") || "T" )
+          a.bureau ( node.attr("bureau#{suffix}") || "T")
           if node.attr("group#{suffix}")
             a.group **attr_code(type: node.attr("grouptype#{suffix}")) do |g|
               metadata_committee2(node, g, suffix, "")
@@ -119,27 +123,30 @@ module Asciidoctor
 
       def provisional_id(node, xml)
         return unless node.attr("provisional-name")
-        xml.docidentifier **{type: "ITU-provisional"} do |i|
+
+        xml.docidentifier **{ type: "ITU-provisional" } do |i|
           i << node.attr("provisional-name")
         end
       end
 
-      ITULANG = { "en" => "E", "fr" => "F", "ar" => "A", "es" => "S", "zh" => "C", "ru" => "R" }.freeze
+      ITULANG = { "en" => "E", "fr" => "F", "ar" => "A", "es" => "S",
+                  "zh" => "C", "ru" => "R" }.freeze
 
       def itu_id1(node, lang)
         bureau = node.attr("bureau") || "T"
         id = doctype(node) == "service-publication" ?
           @i18n.annex_to_itu_ob_abbrev.sub(/%/, node.attr("docnumber")) :
-          "ITU-#{bureau} #{node.attr("docnumber")}"
+          "ITU-#{bureau} #{node.attr('docnumber')}"
         id + (lang ? "-#{ITULANG[@lang]}" : "")
       end
 
       def itu_id(node, xml)
         return unless node.attr("docnumber")
-        xml.docidentifier **{type: "ITU"} do |i|
+
+        xml.docidentifier **{ type: "ITU" } do |i|
           i << itu_id1(node, false)
         end
-        xml.docidentifier **{type: "ITU-lang"} do |i|
+        xml.docidentifier **{ type: "ITU-lang" } do |i|
           i << itu_id1(node, true)
         end
         xml.docnumber { |i| i << node.attr("docnumber") }
@@ -147,8 +154,9 @@ module Asciidoctor
 
       def recommendation_id(node, xml)
         return unless node.attr("recommendationnumber")
+
         node.attr("recommendationnumber").split("/").each do |s|
-          xml.docidentifier **{type: "ITU-Recommendation"} do |i|
+          xml.docidentifier **{ type: "ITU-Recommendation" } do |i|
             i << s
           end
         end
@@ -171,11 +179,12 @@ module Asciidoctor
 
       def metadata_recommendationstatus(node, xml)
         return unless node.attr("recommendation-from")
+
         xml.recommendationstatus do |s|
           s.from node.attr("recommendation-from")
           s.to node.attr("recommendation-to") if node.attr("recommendation-to")
           if node.attr("approval-process")
-            s.approvalstage **{process: node.attr("approval-process")} do |a|
+            s.approvalstage **{ process: node.attr("approval-process") } do |a|
               a << node.attr("approval-status")
             end
           end
@@ -188,6 +197,7 @@ module Asciidoctor
 
       def structured_id(node, xml)
         return unless node.attr("docnumber")
+
         xml.structuredidentifier do |i|
           i.bureau node.attr("bureau") || "T"
           i.docnumber node.attr("docnumber")
@@ -198,7 +208,8 @@ module Asciidoctor
       end
 
       def metadata_techreport(node, xml)
-        a = node.attr("meeting") and metadata_meeting(a, node.attr("meeting-acronym"), xml)
+        a = node.attr("meeting") and
+          metadata_meeting(a, node.attr("meeting-acronym"), xml)
         a = node.attr("meeting-place") and xml.meeting_place a
         a = node.attr("meeting-date") and metadata_meeting_date(a, xml)
         a = node.attr("intended-type") and xml.intended_type a
@@ -233,6 +244,7 @@ module Asciidoctor
 
       def metadata_ext(node, xml)
         metadata_doctype(node, xml)
+        metadata_subdoctype(node, xml)
         metadata_committee(node, xml)
         metadata_ics(node, xml)
         metadata_recommendationstatus(node, xml)

data/lib/asciidoctor/itu/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"/>