metanorma-itu 2.7.2 → 2.7.4

data/lib/isodoc/itu/metadata.rb

@@ -61,25 +61,26 @@ module IsoDoc
         nil
       end
 
+      COMMITTEE_XPATH = "//bibdata/contributor[role/description = 'committee']/" \
+        "organization/subdivision".freeze
+
       def author(xml, _out)
-        sector = xml.at(ns("//bibdata/ext/editorialgroup/sector"))
+        sector = xml.at(ns("#{COMMITTEE_XPATH}[@type='Sector']/name"))
         set(:sector, sector.text) if sector
         bureau(xml)
-        tc = xml.at(ns("//bibdata/ext/editorialgroup/committee"))
-        set(:tc, tc.text) if tc
-        tc = xml.at(ns("//bibdata/ext/editorialgroup/group/name"))
+        tc = xml.at(ns("#{COMMITTEE_XPATH}[@type='Group']/name"))
         set(:group, tc.text) if tc
-        tc = xml.at(ns("//bibdata/ext/editorialgroup/group/acronym"))
+        tc = xml.at(ns("#{COMMITTEE_XPATH}[@type='Group']/identifier"))
         set(:group_acronym, tc.text) if tc
-        start1 = xml.at(ns("//bibdata/ext/editorialgroup/group/period/start"))
-        end1 = xml.at(ns("//bibdata/ext/editorialgroup/group/period/end"))
+        start1 = xml.at(ns("//bibdata/ext/studyperiod/start"))
+        end1 = xml.at(ns("//bibdata/ext/studyperiod/end"))
         if start1
           set(:study_group_period,
               @i18n.l10n("#{start1.text}–#{end1.text}"))
         end
-        tc = xml.at(ns("//bibdata/ext/editorialgroup/subgroup/name"))
+        tc = xml.at(ns("#{COMMITTEE_XPATH}[@type='Subgroup']/name"))
         set(:subgroup, tc.text) if tc
-        tc = xml.at(ns("//bibdata/ext/editorialgroup/workgroup/name"))
+        tc = xml.at(ns("#{COMMITTEE_XPATH}[@type='Workgroup']/name"))
         set(:workgroup, tc.text) if tc
         super
         authors = xml.xpath(ns("//bibdata/contributor[role/@type = 'author' " \
@@ -88,7 +89,7 @@ module IsoDoc
       end
 
       def bureau(xml)
-        if bureau = xml.at(ns("//bibdata/ext/editorialgroup/bureau"))
+        if bureau = xml.at(ns("#{COMMITTEE_XPATH}[@type='Bureau']/name"))
           set(:bureau, bureau.text)
           case bureau.text
           when "T" then set(:bureau_full, @i18n.tsb_full)
@@ -136,10 +137,6 @@ module IsoDoc
               @i18n.l10n("#{@labels['corrigendum']} #{dn.text}"))
       end
 
-      def unpublished(status)
-        %w(in-force-prepublished draft).include? status.downcase
-      end
-
       def bibdate(xml, _out)
         d = xml.at(ns("//bibdata/date[not(@format)][@type = 'published']"))
         d and set(:pubdate_monthyear, monthyr(d.text))

data/lib/metanorma/itu/biblio-standoc.rng

@@ -76,12 +76,6 @@ from other documents in the same doctype</a:documentation>
     <ref name="flavor">
       <a:documentation>Flavour of Metanorma used to process this document</a:documentation>
     </ref>
-    <optional>
-      <ref name="editorialgroup">
-        <a:documentation>Groups associated with the production of the standards document, typically within
-a standards definition organization</a:documentation>
-      </ref>
-    </optional>
     <zeroOrMore>
       <ref name="ics">
         <a:documentation>Classification of the document contents taken from the International Classification of Standards</a:documentation>
@@ -130,49 +124,6 @@ a standards definition organization</a:documentation>
 However we prefer not to hardcode it, given ongoing extension.</a:documentation>
     <text/>
   </define>
-  <define name="editorialgroup">
-    <a:documentation>A group associated with the production of the standards document, typically within
-a standards definition organization</a:documentation>
-    <element name="editorialgroup">
-      <oneOrMore>
-        <ref name="technical-committee">
-          <a:documentation>A technical committee associated with the production of the standards document</a:documentation>
-        </ref>
-      </oneOrMore>
-    </element>
-  </define>
-  <define name="technical-committee">
-    <a:documentation>Technical committee associated with the production of a standards document</a:documentation>
-    <element name="technical-committee">
-      <ref name="IsoWorkgroup"/>
-    </element>
-  </define>
-  <define name="IsoWorkgroup">
-    <optional>
-      <attribute name="number">
-        <a:documentation>Numeric identifier of the technical committee</a:documentation>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="type">
-        <a:documentation>Type of the technical committee, used in identifying the technical committee</a:documentation>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="identifier">
-        <a:documentation>Non-numeric, complete identifier of the technical committee</a:documentation>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="prefix">
-        <a:documentation>Disambiguating prefix added to number to form the identifier of the technical committee,
-typically indicating its type</a:documentation>
-      </attribute>
-    </optional>
-    <text>
-      <a:documentation>Name of the technical committee</a:documentation>
-    </text>
-  </define>
   <define name="ics">
     <a:documentation>Classification taken from the International Classification of Standards. 
 ICS is defined by ISO here -- https://www.iso.org/publication/PUB100033.html</a:documentation>

data/lib/metanorma/itu/biblio.rng

@@ -242,6 +242,8 @@ Detailed in https://www.relaton.org/model/creator/</a:documentation>
     </choice>
   </define>
   <define name="roledescription">
+    <a:documentation>A more detailed description of the role of the contributor
+Some descriptions are reserved words; in particular, the editorial committee of a standard has the role description "committee"</a:documentation>
     <element name="description">
       <ref name="LocalizedMarkedUpString"/>
     </element>
@@ -443,7 +445,10 @@ real names (if the person is named with a pseudonym or user name); previous lega
     </oneOrMore>
     <zeroOrMore>
       <ref name="subdivision">
-        <a:documentation>The subdivision of the organization directly involved with the production of the bibliographic item</a:documentation>
+        <a:documentation>The subdivision of the organization directly involved with the production of the bibliographic item.
+Multiple subdivisions can be specified for an organization, with no implication of hierarchical
+relation between them
+Editorial and advisory groups are represented as consecutive subdivisions of the SDO</a:documentation>
       </ref>
     </zeroOrMore>
     <optional>
@@ -485,6 +490,11 @@ real names (if the person is named with a pseudonym or user name); previous lega
           <a:documentation>The type of subdivision</a:documentation>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="subtype">
+          <a:documentation>The subtype of subdivision; e.g. different types of technical committee</a:documentation>
+        </attribute>
+      </optional>
       <ref name="OrganizationType">
         <a:documentation>The subdivision, modelled recursively as an organization</a:documentation>
       </ref>

data/lib/metanorma/itu/cleanup.rb

@@ -82,6 +82,10 @@ module Metanorma
           biblio_reorder1(r)
         end
       end
+
+      def published?(status, _xmldoc)
+        !%w(in-force-prepublished draft).include?(status.downcase)
+      end
     end
   end
 end

data/lib/metanorma/itu/front.rb

@@ -1,5 +1,6 @@
 require "fileutils"
 require_relative "./front_id"
+require_relative "./front_contrib"
 
 module Metanorma
   module Itu
@@ -64,44 +65,6 @@ module Metanorma
         end
       end
 
-      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 metadata_committee(node, xml)
-        hyphenate_node_attributes(node)
-        metadata_sector(node, xml)
-        metadata_committee1(node, xml, "")
-        suffix = 2
-        while node.attr("bureau_#{suffix}")
-          metadata_committee1(node, xml, "_#{suffix}")
-          suffix += 1
-        end
-      end
-
-      def hyphenate_node_attributes(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 metadata_sector(node, xml)
-        s = node.attr("sector") or return
-        xml.editorialgroup do |a|
-          a.sector { |x| x << s }
-        end
-      end
-
       def metadata_question(node, xml)
         vals = csv_split(node.attr("question"), ",").map do |s1|
           t, v = s1.split(":", 2).map(&:strip)
@@ -115,29 +78,6 @@ module Metanorma
         end
       end
 
-      def metadata_committee1(node, xml, suffix)
-        xml.editorialgroup do |a|
-          a.bureau ( node.attr("bureau#{suffix}") || "T")
-          ["", "sub", "work"].each do |p|
-            node.attr("#{p}group#{suffix}") or next
-            type = node.attr("#{p}group-type#{suffix}")
-            a.send "#{p}group", **attr_code(type: type) do |g|
-              metadata_committee2(node, g, suffix, p)
-            end
-          end
-        end
-      end
-
-      def metadata_committee2(node, group, suffix, prefix)
-        group.name node.attr("#{prefix}group#{suffix}")
-        a = node.attr("#{prefix}group-acronym#{suffix}") and group.acronym a
-        s, e = group_period(node, prefix, suffix)
-        group.period do |p|
-          p.start s
-          p.end e
-        end
-      end
-
       def group_period(node, prefix, suffix)
         s = node.attr("#{prefix}group-year-start#{suffix}") ||
           Date.today.year - (Date.today.year % 2)
@@ -213,11 +153,20 @@ module Metanorma
         end
       end
 
+      def metadata_studyperiod(node, xml)
+        s, e = group_period(node, "", "")
+        xml.studyperiod do |p|
+          p.start s
+          p.end e
+        end
+      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

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.2 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -123,6 +123,10 @@ the type attribute defaults to `review` for reviews</a:documentation>
           <a:documentation>Notes whose scope is the current block</a:documentation>
         </ref>
       </zeroOrMore>
+      <ref name="BlockSource">
+        <a:documentation>Bibliographic source for the information in the list.
+Sources are currently only rendered in metanorma-plateau</a:documentation>
+      </ref>
     </define>
     <define name="OlBody">
       <optional>
@@ -140,6 +144,10 @@ the type attribute defaults to `review` for reviews</a:documentation>
           <a:documentation>Notes whose scope is the current block</a:documentation>
         </ref>
       </zeroOrMore>
+      <ref name="BlockSource">
+        <a:documentation>Bibliographic source for the information in the list.
+Sources are currently only rendered in metanorma-plateau</a:documentation>
+      </ref>
     </define>
     <define name="OlAttributes">
       <a:documentation>NOTE: `start` attribute is not included by default, because of problems it raises with DOC output</a:documentation>
@@ -188,6 +196,10 @@ the type attribute defaults to `review` for reviews</a:documentation>
           <a:documentation>Notes whose scope is the current block</a:documentation>
         </ref>
       </zeroOrMore>
+      <ref name="BlockSource">
+        <a:documentation>Bibliographic source for the information in the list.
+Sources are currently only rendered in metanorma-plateau</a:documentation>
+      </ref>
     </define>
     <define name="dt">
       <element name="dt">
@@ -871,6 +883,12 @@ titlecase, or lowercase</a:documentation>
       </oneOrMore>
     </element>
   </define>
+  <define name="ParagraphFnBody" combine="interleave">
+    <ref name="BlockSource">
+      <a:documentation>Bibliographic source for the information in the paragraph
+parargaph sources are currently only rendered in metanorma-plateau</a:documentation>
+    </ref>
+  </define>
   <define name="BasicBlock" combine="choice">
     <ref name="columnbreak"/>
   </define>
@@ -2233,6 +2251,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.2".freeze
+    VERSION = "2.7.4".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-itu
 version: !ruby/object:Gem::Version
-  version: 2.7.2
+  version: 2.7.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-08-04 00:00:00.000000000 Z
+date: 2025-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -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