metanorma-itu 1.2.7 → 1.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ec6ae3e4b2d44ccd7e6ab9addb0f53c6d84aa9750ceddd4e78a17db546c1714
-  data.tar.gz: 0e3b9e4225a67f3dfdc9c774e9a1f1bc90b5348fbec12056ae15e03baec7ef8d
+  metadata.gz: b83dc88219111d0638c307ac05020a1b3234dd000050548539b55e9944ad5562
+  data.tar.gz: cf2800c450d29d9228b807ea8a52b754ad68684ce2fe573eea6d622825b44639
 SHA512:
-  metadata.gz: feb1aff54a346048fbe9fe1ae0e88c2721ce9a95488c74f663942e9db84853c94fc2181eac6c2e84c74724be68108dd567b98fd0eedecaae87a9d2a6efa43e1d
-  data.tar.gz: a1e4f89fdbae6f567e1e310e82b4b3c36a6cad23117aa9ee5e3530eefd9a22a8fb7fd3019366a9b0d3b04046eda67c5eb4e98c8f1cfc1c26e9d67e4216ac1fe8
+  metadata.gz: 873af5c00c3ed8c65aef1551ad74dca628759a4cb558c6fec136365910efdfb6582836e2a088f7364e3c72148cec7249970d673b9705f23af2362bbc9df44b46
+  data.tar.gz: 93c68a94ba74666bba34faf2cb46bc86be84fc42c6392722dc51e6224d9d0ecc86f21a953a79b826002f50db14e0485e1a228ffb1b394cde9475f5af1187ea7c

data/.github/workflows/rake.yml

@@ -36,7 +36,10 @@ jobs:
         with:
           ruby-version: ${{ matrix.ruby }}
 
-      - uses: actions/cache@v1
+      - if: matrix.os == 'macos-latest'
+        run: brew install autoconf automake libtool
+
+      - uses: actions/cache@v2
         with:
           path: vendor/bundle
           key: bundle-${{ matrix.os }}-${{ matrix.ruby }}-${{ hashFiles('**/*.gemspec') }}
@@ -48,15 +51,14 @@ jobs:
 
       - run: bundle exec rake
 
-  notify:
-    name: Trigger notify workflow
+  tests-passed:
     needs: rake
     runs-on: ubuntu-latest
     steps:
-      - name: Trigger notify workflow
+      - name: Trigger tests passed event
         uses: Sibz/github-status-action@v1
         with:
-          authToken: ${{ secrets.GITHUB_TOKEN }}
+          authToken: ${{ secrets.METANORMA_CI_PAT_TOKEN || secrets.GITHUB_TOKEN }}
           context: 'tests-passed-successfully'
           description: 'Tests passed successfully'
           state: 'success'

data/lib/asciidoctor/itu/basicdoc.rng

@@ -596,6 +596,7 @@
       <ref name="bookmark"/>
       <ref name="image"/>
       <ref name="index"/>
+      <ref name="index-xref"/>
     </choice>
   </define>
   <define name="PureTextElement">
@@ -728,13 +729,61 @@
   </define>
   <define name="index">
     <element name="index">
-      <attribute name="primary"/>
       <optional>
-        <attribute name="secondary"/>
+        <attribute name="to">
+          <data type="IDREF"/>
+        </attribute>
+      </optional>
+      <element name="primary">
+        <oneOrMore>
+          <ref name="PureTextElement"/>
+        </oneOrMore>
+      </element>
+      <optional>
+        <element name="secondary">
+          <oneOrMore>
+            <ref name="PureTextElement"/>
+          </oneOrMore>
+        </element>
+      </optional>
+      <optional>
+        <element name="tertiary">
+          <oneOrMore>
+            <ref name="PureTextElement"/>
+          </oneOrMore>
+        </element>
+      </optional>
+    </element>
+  </define>
+  <define name="index-xref">
+    <element name="index-xref">
+      <attribute name="also">
+        <data type="boolean"/>
+      </attribute>
+      <element name="primary">
+        <oneOrMore>
+          <ref name="PureTextElement"/>
+        </oneOrMore>
+      </element>
+      <optional>
+        <element name="secondary">
+          <oneOrMore>
+            <ref name="PureTextElement"/>
+          </oneOrMore>
+        </element>
       </optional>
       <optional>
-        <attribute name="tertiary"/>
+        <element name="tertiary">
+          <oneOrMore>
+            <ref name="PureTextElement"/>
+          </oneOrMore>
+        </element>
       </optional>
+      <element name="target">
+        <oneOrMore>
+          <ref name="PureTextElement"/>
+        </oneOrMore>
+      </element>
     </element>
   </define>
   <!-- bare ID element, used for referencing arbitrary spans of text -->

data/lib/asciidoctor/itu/boilerplate.xml

@@ -1,10 +1,13 @@
 <boilerplate>
+  {% if doctype == "Service Publication" %}
+  {% else %}
   <copyright-statement>
     <clause>
-      <p>&copy; ITU {{ docyear }}</p>
+      <p>&#xa9; ITU {{ docyear }}</p>
 <p>All rights reserved. No part of this publication may be reproduced, by any means whatsoever, without the prior written permission of ITU.</p>
     </clause>
   </copyright-statement>
+  {% if doctype == "Recommendation" %}
   <license-statement>
     <clause>
       <title>INTELLECTUAL PROPERTY RIGHTS</title>
@@ -13,6 +16,7 @@
 </p>
 </clause>
 </license-statement>
+{% endif %}
   <legal-statement>
     <clause>
       <title>FOREWORD</title>
@@ -21,12 +25,13 @@
 <p>The approval of ITU-T Recommendations is covered by the procedure laid down in WTSA Resolution 1 .</p>
 <p>In some areas of information technology which fall within ITU-T's purview, the necessary standards are prepared on a collaborative basis with ISO and IEC.</p>
 
-
+{% if doctype == "Recommendation" %}
 <clause>
 <title>NOTE</title>
 <p>In this Recommendation, the expression "Administration" is used for conciseness to indicate both a telecommunication administration and a recognized operating agency .</p>
 <p>Compliance with this Recommendation is voluntary. However, the Recommendation may contain certain mandatory provisions (to ensure, e.g., interoperability or applicability) and compliance with the Recommendation is achieved when all of these mandatory provisions are met. The words "shall" or some other obligatory language such as "must" and the negative equivalents are used to express requirements. The use of such words does not suggest that compliance with the Recommendation is required of any party .</p>
 </clause>
+{% endif %}
     </clause>
 
     {% if unpublished %}
@@ -40,6 +45,7 @@
     </clause>
     {% endif %}
   </legal-statement>
+  {% endif %}
 </boilerplate>
 
 

data/lib/asciidoctor/itu/cleanup.rb

@@ -5,6 +5,15 @@ module Asciidoctor
         super
         insert_missing_sections(x) unless @no_insert_missing_sections
         insert_empty_clauses(x)
+        resolution_inline_header(x)
+      end
+
+      def resolution_inline_header(x)
+        return unless x&.at("//bibdata/ext/doctype")&.text == "resolution"
+        x.xpath("//clause//clause").each do |c|
+          next if title = c.at("./title") and !title&.text&.empty?
+          c["inline-header"] = true
+        end
       end
 
       def table_cleanup(xmldoc)

data/lib/asciidoctor/itu/converter.rb

@@ -45,7 +45,7 @@ module Asciidoctor
       end
 
       def olist(node)
-        id = Asciidoctor::Standoc::Utils::anchor_or_uuid(node)
+        id = Metanorma::Utils::anchor_or_uuid(node)
         noko do |xml|
           xml.ol **attr_code(id: id, class: node.attr("class")) do |xml_ol|
             node.items.each { |item| li(xml_ol, item) }
@@ -116,6 +116,7 @@ module Asciidoctor
       end
 
       def clause_parse(attrs, xml, node)
+        node.option?("unnumbered") and attrs[:unnumbered] = true
         case clausetype = sectiontype1(node)
         when "conventions" then attrs = attrs.merge(type: "conventions")
         when "history" 

data/lib/asciidoctor/itu/front.rb

@@ -8,8 +8,7 @@ module Asciidoctor
       def metadata_status(node, xml)
         xml.status do |s|
           s.stage (node.attributes.has_key?("draft") ? "draft" :
-                   (node.attr("status") || node.attr("docstage") ||
-                    "published" ))
+                   (node.attr("status") || node.attr("docstage") || "published" ))
         end
       end
 
@@ -17,12 +16,12 @@ module Asciidoctor
         at = { language: "en", format: "text/plain", type: "main" }
         a = node.attr("title") || node.attr("title-en")
         xml.title **attr_code(at) do |t|
-          t << (Asciidoctor::Standoc::Utils::asciidoc_sub(a) || node.title)
+          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|
-            t << Asciidoctor::Standoc::Utils::asciidoc_sub(a)
+            t << Metanorma::Utils::asciidoc_sub(a)
           end
         end
       end
@@ -32,9 +31,8 @@ module Asciidoctor
           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|
-            t << Asciidoctor::Standoc::Utils::asciidoc_sub(v)
+          xml.title **attr_code(language: lang, format: "text/plain", type: type) do |t|
+            t << Metanorma::Utils::asciidoc_sub(v)
           end
         end
       end
@@ -51,7 +49,7 @@ module Asciidoctor
         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|
-          t << Asciidoctor::Standoc::Utils::asciidoc_sub(a)
+          t << Metanorma::Utils::asciidoc_sub(a)
         end
       end
 
@@ -61,7 +59,7 @@ module Asciidoctor
           next if m[:lang] == "en"
           xml.title **attr_code(language: m[:lang], format: "text/plain",
                                 type: type.sub(/-title/, "")) do |t|
-            t << Asciidoctor::Standoc::Utils::asciidoc_sub(v)
+            t << Metanorma::Utils::asciidoc_sub(v)
           end
         end
       end
@@ -116,6 +114,7 @@ module Asciidoctor
       def metadata_id(node, xml)
         provisional_id(node, xml)
         itu_id(node, xml)
+        recommendation_id(node, xml)
       end
 
       def provisional_id(node, xml)
@@ -125,16 +124,36 @@ module Asciidoctor
         end
       end
 
-      def itu_id(node, xml)
+      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")}"
+        id + (lang ? "-#{ITULANG[@lang]}" : "")
+      end
+
+      def itu_id(node, xml)
         return unless node.attr("docnumber")
         xml.docidentifier **{type: "ITU"} do |i|
-          i << "ITU-#{bureau} "\
-            "#{node.attr("docnumber")}"
+          i << itu_id1(node, false)
+        end
+        xml.docidentifier **{type: "ITU-lang"} do |i|
+          i << itu_id1(node, true)
         end
         xml.docnumber { |i| i << node.attr("docnumber") }
       end
 
+      def recommendation_id(node, xml)
+        return unless node.attr("recommendationnumber")
+        node.attr("recommendationnumber").split("/").each do |s|
+          xml.docidentifier **{type: "ITU-Recommendation"} do |i|
+            i << s
+          end
+        end
+      end
+
       def metadata_series(node, xml)
         node.attr("series") and
           xml.series **{ type: "main" } do |s|
@@ -179,12 +198,19 @@ module Asciidoctor
       end
 
       def metadata_techreport(node, xml)
-        a = node.attr("meeting") and xml.meeting a
+        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
         a = node.attr("source") and xml.source a
       end
 
+      def metadata_meeting(mtg, acronym, xml)
+        xml.meeting **attr_code(acronym: acronym) do |m|
+          m << mtg
+        end
+      end
+
       def metadata_meeting_date(a, xml)
         xml.meeting_date do |m|
           d = a.split("/")
@@ -197,6 +223,14 @@ module Asciidoctor
         end
       end
 
+      def personal_role(node, c, suffix)
+        if node.attr("role#{suffix}")&.downcase == "rapporteur"
+          c.role "raporteur", **{ type: "editor" }
+        else
+          super
+        end
+      end
+
       def metadata_ext(node, xml)
         metadata_doctype(node, xml)
         metadata_committee(node, xml)

data/lib/asciidoctor/itu/isodoc.rng

@@ -55,6 +55,13 @@
             <param name="pattern">\i\c*|\c+#\c+</param>
           </data>
         </attribute>
+        <optional>
+          <attribute name="to">
+            <data type="string">
+              <param name="pattern">\i\c*|\c+#\c+</param>
+            </data>
+          </attribute>
+        </optional>
         <optional>
           <attribute name="type">
             <ref name="ReferenceFormat"/>
@@ -246,6 +253,12 @@
             <data type="boolean"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="width"/>
+        </optional>
+        <optional>
+          <ref name="colgroup"/>
+        </optional>
         <optional>
           <ref name="tname"/>
         </optional>
@@ -764,6 +777,21 @@
     </define>
   </include>
   <!-- end overrides -->
+  <define name="colgroup">
+    <element name="colgroup">
+      <oneOrMore>
+        <ref name="col"/>
+      </oneOrMore>
+    </element>
+  </define>
+  <define name="col">
+    <element name="col">
+      <attribute name="width"/>
+    </element>
+  </define>
+  <define name="BibItemType" combine="choice">
+    <value>internal</value>
+  </define>
   <define name="TextElement" combine="choice">
     <ref name="concept"/>
   </define>
@@ -814,6 +842,9 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="number"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>
@@ -869,9 +900,11 @@
       <element name="code">
         <text/>
       </element>
-      <element name="text">
-        <text/>
-      </element>
+      <optional>
+        <element name="text">
+          <text/>
+        </element>
+      </optional>
     </element>
   </define>
   <define name="standard-document">
@@ -1041,6 +1074,9 @@
         </choice>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="number"/>
+    </optional>
     <optional>
       <attribute name="type"/>
     </optional>
@@ -1094,6 +1130,9 @@
     <optional>
       <attribute name="type"/>
     </optional>
+    <optional>
+      <attribute name="number"/>
+    </optional>
     <optional>
       <ref name="section-title"/>
     </optional>
@@ -1196,6 +1235,9 @@
       <optional>
         <attribute name="type"/>
       </optional>
+      <optional>
+        <attribute name="number"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>
@@ -1524,6 +1566,7 @@
           <value>add</value>
           <value>modify</value>
           <value>delete</value>
+          <value>replace</value>
         </choice>
       </attribute>
       <optional>
@@ -1554,6 +1597,11 @@
       </optional>
       <optional>
         <element name="newcontent">
+          <optional>
+            <attribute name="id">
+              <data type="ID"/>
+            </attribute>
+          </optional>
           <zeroOrMore>
             <ref name="BasicBlock"/>
           </zeroOrMore>