metanorma-itu 2.7.1 → 2.7.3

data/lib/metanorma/itu/front_contrib.rb

@@ -0,0 +1,62 @@
+module Metanorma
+  module Itu
+    class Converter < Standoc::Converter
+      def default_publisher
+        @i18n.get["ITU"] || @i18n.international_telecommunication_union
+      end
+
+      def org_abbrev
+        if @i18n.get["ITU"]
+          { @i18n.international_telecommunication_union => @i18n.get["ITU"] }
+        else {} end
+      end
+
+      def committee_contributors(node, xml, agency, opt)
+        metadata_committee_prep(node) or return
+        super
+      end
+
+      def metadata_committee_types(_node)
+        %w(bureau sector group subgroup workgroup)
+      end
+
+      def extract_org_attrs_complex(node, opts, source, suffix)
+        super.merge(ident: node.attr("#{source}-acronym#{suffix}")).compact
+      end
+
+      def full_committee_id(contrib); end
+
+      def metadata_committee_prep(node)
+        a = node.attributes.dup
+        a.each do |k, v|
+          /group(type|acronym)/.match?(k) and
+            node.set_attr(k.sub(/group(type|acronym)/, "group-\\1"), v)
+          /group(yearstart|yearend)/.match?(k) and
+            node.set_attr(k.sub(/groupyear(start|end)/, "group-year-\\1"), v)
+        end
+      end
+
+      def org_attrs_add_committees(node, ret, opts, opts_orig)
+        opts_orig[:groups]&.each_with_index do |g, i|
+          i.zero? and next
+          contributors_committees_pad_multiples(ret.first, node, g)
+          opts = committee_contrib_org_prep(node, g, nil, opts_orig)
+          ret << org_attrs_parse_core(node, opts).map do |x|
+            x.merge(subdivtype: opts[:subdivtype])
+          end
+        end
+        contributors_committees_nest1(ret)
+      end
+
+      def metadata_ext(node, xml)
+        super
+        metadata_question(node, xml)
+        metadata_recommendationstatus(node, xml)
+        metadata_ip_notice(node, xml)
+        metadata_studyperiod(node, xml)
+        metadata_techreport(node, xml)
+        metadata_contribution(node, xml)
+      end
+    end
+  end
+end

data/lib/metanorma/itu/front_id.rb

@@ -65,8 +65,7 @@ module Metanorma
       end
 
       def recommendation_id(node, xml)
-        return unless node.attr("recommendationnumber")
-
+        node.attr("recommendationnumber") or return
         node.attr("recommendationnumber").split("/").each do |s|
           xml.docidentifier type: "ITU-Recommendation" do |i|
             i << s
@@ -75,8 +74,7 @@ module Metanorma
       end
 
       def structured_id(node, xml)
-        return unless node.attr("docnumber")
-
+        node.attr("docnumber") or return
         xml.structuredidentifier do |i|
           i.bureau node.attr("bureau") || "T"
           i.docnumber node.attr("docnumber")

data/lib/metanorma/itu/isodoc.rng

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-<!-- VERSION v2.1.0 -->
+<!-- VERSION v2.1.1 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -42,36 +42,6 @@ All IdRefType instances point not to `@id` in Semantic XML, which is the Content
 but to `@anchor`, the user-supplied cross-reference</a:documentation>
       <text/>
     </define>
-    <define name="index-primary">
-      <element name="primary">
-        <oneOrMore>
-          <choice>
-            <ref name="PureTextElement"/>
-            <ref name="stem"/>
-          </choice>
-        </oneOrMore>
-      </element>
-    </define>
-    <define name="index-secondary">
-      <element name="secondary">
-        <oneOrMore>
-          <choice>
-            <ref name="PureTextElement"/>
-            <ref name="stem"/>
-          </choice>
-        </oneOrMore>
-      </element>
-    </define>
-    <define name="index-tertiary">
-      <element name="tertiary">
-        <oneOrMore>
-          <choice>
-            <ref name="PureTextElement"/>
-            <ref name="stem"/>
-          </choice>
-        </oneOrMore>
-      </element>
-    </define>
     <define name="review">
       <a:documentation>Generalise BasicDoc element from just review comments, to general annotations;
 the type attribute defaults to `review` for reviews</a:documentation>
@@ -592,28 +562,6 @@ normative or informative references, some split references into sections organiz
         </oneOrMore>
       </element>
     </define>
-    <define name="sub">
-      <a:documentation>Subscript text. Corresponds to HTML `sub</a:documentation>
-      <element name="sub">
-        <zeroOrMore>
-          <choice>
-            <ref name="PureTextElement"/>
-            <ref name="stem"/>
-          </choice>
-        </zeroOrMore>
-      </element>
-    </define>
-    <define name="sup">
-      <a:documentation>Superscript text. Corresponds to HTML `sup`</a:documentation>
-      <element name="sup">
-        <zeroOrMore>
-          <choice>
-            <ref name="PureTextElement"/>
-            <ref name="stem"/>
-          </choice>
-        </zeroOrMore>
-      </element>
-    </define>
     <define name="pagebreak">
       <a:documentation>Page break. Only applicable in paged layouts (e.g. PDF, Word), and not flow layouts (e.g. HTML)</a:documentation>
       <element name="pagebreak">
@@ -1094,7 +1042,6 @@ That concept may be defined as a term within the current document, or it may be
           <zeroOrMore>
             <choice>
               <ref name="PureTextElement"/>
-              <ref name="stem"/>
               <ref name="index"/>
               <ref name="index-xref"/>
             </choice>
@@ -1107,7 +1054,6 @@ That concept may be defined as a term within the current document, or it may be
           <zeroOrMore>
             <choice>
               <ref name="PureTextElement"/>
-              <ref name="stem"/>
               <ref name="index"/>
               <ref name="index-xref"/>
             </choice>
@@ -2025,10 +1971,7 @@ used in document amendments</a:documentation>
       <element name="name">
         <a:documentation>The symbolic form of the designation</a:documentation>
         <oneOrMore>
-          <choice>
-            <ref name="PureTextElement"/>
-            <ref name="stem"/>
-          </choice>
+          <ref name="PureTextElement"/>
         </oneOrMore>
       </element>
     </element>
@@ -2081,7 +2024,6 @@ used in document amendments</a:documentation>
         <zeroOrMore>
           <choice>
             <ref name="PureTextElement"/>
-            <ref name="stem"/>
             <ref name="index"/>
             <ref name="index-xref"/>
           </choice>
@@ -2291,6 +2233,11 @@ used in document amendments</a:documentation>
       <ref name="RequiredId"/>
       <ref name="NumberingAttributes"/>
       <ref name="BlockAttributes"/>
+      <optional>
+        <attribute name="type">
+          <a:documentation>Semantic classification of note</a:documentation>
+        </attribute>
+      </optional>
       <oneOrMore>
         <choice>
           <a:documentation>Content of the term note</a:documentation>

data/lib/metanorma/itu/relaton-itu.rng

@@ -21,23 +21,6 @@
         <value>contribution</value>
       </choice>
     </define>
-    <define name="editorialgroup">
-      <element name="editorialgroup">
-        <choice>
-          <ref name="bureau"/>
-          <ref name="sector"/>
-        </choice>
-        <optional>
-          <ref name="group"/>
-        </optional>
-        <optional>
-          <ref name="subgroup"/>
-        </optional>
-        <optional>
-          <ref name="workgroup"/>
-        </optional>
-      </element>
-    </define>
     <define name="structuredidentifier">
       <element name="structuredidentifier">
         <ref name="bureau"/>
@@ -78,6 +61,11 @@
         <a:documentation>ITU has received a notice of intellectual property, protected by patents, which may be required to implement this Recommendation</a:documentation>
       </ref>
     </optional>
+    <optional>
+      <ref name="studyperiod">
+        <a:documentation>Study period that the editorial groups working on this document fall under</a:documentation>
+      </ref>
+    </optional>
     <optional>
       <ref name="meeting">
         <a:documentation>Name of meeting that generated this document (for resolutions, technical reports, technical papers, implementers guides) </a:documentation>
@@ -203,35 +191,6 @@
       </choice>
     </element>
   </define>
-  <define name="sector">
-    <element name="sector">
-      <text/>
-    </element>
-  </define>
-  <define name="group">
-    <element name="group">
-      <ref name="ItuGroup"/>
-    </element>
-  </define>
-  <define name="subgroup">
-    <element name="subgroup">
-      <ref name="ItuGroup"/>
-    </element>
-  </define>
-  <define name="ItuGroup">
-    <optional>
-      <attribute name="type">
-        <ref name="ItuGroupType"/>
-      </attribute>
-    </optional>
-    <ref name="tname"/>
-    <optional>
-      <ref name="groupacronym"/>
-    </optional>
-    <optional>
-      <ref name="groupperiod"/>
-    </optional>
-  </define>
   <define name="ItuGroupType">
     <choice>
       <value>tsag</value>
@@ -247,13 +206,8 @@
       <value>regional-group</value>
     </choice>
   </define>
-  <define name="groupacronym">
-    <element name="acronym">
-      <text/>
-    </element>
-  </define>
-  <define name="groupperiod">
-    <element name="period">
+  <define name="studyperiod">
+    <element name="studyperiod">
       <ref name="groupperiodstart"/>
       <optional>
         <ref name="groupperiodend"/>
@@ -270,11 +224,6 @@
       <data type="gYear"/>
     </element>
   </define>
-  <define name="workgroup">
-    <element name="workgroup">
-      <ref name="ItuGroup"/>
-    </element>
-  </define>
   <define name="question">
     <element name="question">
       <element name="identifier">

data/lib/metanorma/itu/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Itu
-    VERSION = "2.7.1".freeze
+    VERSION = "2.7.3".freeze
   end
 end

data/metanorma-itu.gemspec

@@ -42,5 +42,5 @@ spec.add_development_dependency "rubocop-performance"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
   spec.add_development_dependency "webmock"
-  spec.add_development_dependency "xml-c14n"
+  spec.add_development_dependency "canon"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-itu
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.7.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-07-21 00:00:00.000000000 Z
+date: 2025-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -235,7 +235,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: xml-c14n
+  name: canon
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -332,6 +332,7 @@ files:
 - lib/metanorma/itu/cleanup_section.rb
 - lib/metanorma/itu/converter.rb
 - lib/metanorma/itu/front.rb
+- lib/metanorma/itu/front_contrib.rb
 - lib/metanorma/itu/front_id.rb
 - lib/metanorma/itu/isodoc.rng
 - lib/metanorma/itu/itu.rng