metanorma-iso 3.1.1 → 3.1.3

data/lib/isodoc/iso/metadata.rb

@@ -23,32 +23,26 @@ module IsoDoc
 
       def docstatus(isoxml, _out)
         docstatus = isoxml.at(ns("//bibdata/status/stage"))
-        set(:unpublished, false)
+        published = published_default(isoxml)
         revdate = isoxml.at(ns("//bibdata/version/revision-date"))
         set(:revdate, revdate&.text)
-        docstatus and docstatus1(isoxml, docstatus)
+        docstatus and docstatus1(isoxml, docstatus, published)
         docscheme = isoxml.at(ns("//presentation-metadata[name" \
           "[text() = 'document-scheme']]/value"))
         docscheme and set(:document_scheme, docscheme.text)
       end
 
-      def docstatus1(isoxml, docstatus)
+      def docstatus1(isoxml, docstatus, published)
         set(:stage, docstatus.text)
         set(:stage_int, docstatus.text.to_i)
         set(:substage_int, isoxml.at(ns("//bibdata/status/substage"))&.text)
-        set(:unpublished, unpublished(docstatus.text))
         set(:statusabbr,
             status_abbrev(docstatus["abbreviation"] || "??",
                           isoxml.at(ns("//bibdata/status/substage"))&.text,
                           isoxml.at(ns("//bibdata/status/iteration"))&.text,
                           isoxml.at(ns("//bibdata/version/draft"))&.text,
                           isoxml.at(ns("//bibdata/ext/doctype"))&.text))
-        unpublished(docstatus.text) and
-          set(:stageabbr, docstatus["abbreviation"])
-      end
-
-      def unpublished(status)
-        status.to_i.positive? && status.to_i < 60
+        !published and set(:stageabbr, docstatus["abbreviation"])
       end
 
       def docid(isoxml, _out)
@@ -73,7 +67,7 @@ module IsoDoc
 
       def part_title(part, titlenums, lang)
         part or return ""
-        suffix = part.children.to_xml
+        suffix = to_xml(part.children)
         p = titlenums[:part]
         titlenums[:part] && titlenums[:subpart] and
           p = "#{titlenums[:part]}&#x2013;#{titlenums[:subpart]}"
@@ -102,11 +96,11 @@ module IsoDoc
       end
 
       def compose_title(tparts, tnums, lang)
-        t = tparts[:main].nil? ? "" :  tparts[:main].children.to_xml
+        t = tparts[:main].nil? ? "" :  to_xml(tparts[:main].children)
         tparts[:intro] and
-          t = "#{tparts[:intro].children.to_xml}&#xa0;&#x2014; #{t}"
+          t = "#{to_xml(tparts[:intro].children)}&#xa0;&#x2014; #{t}"
         tparts[:complementary] and
-          t = "#{t}&#xa0;&#x2014; #{tparts[:complementary].children.to_xml}"
+          t = "#{t}&#xa0;&#x2014; #{to_xml(tparts[:complementary].children)}"
         if tparts[:part]
           suffix = part_title(tparts[:part], tnums, lang)
           t = "#{t}&#xa0;&#x2014; #{suffix}"
@@ -138,19 +132,19 @@ module IsoDoc
         # intro, main, complementary, part, amd = title_parts(isoxml, lang)
         tp = title_parts(isoxml, lang)
         tn = title_nums(isoxml)
-        set(:doctitlemain, tp[:main] ? tp[:main].children.to_xml : "")
+        set(:doctitlemain, tp[:main] ? to_xml(tp[:main].children) : "")
         main = compose_title(tp, tn, lang)
         set(:doctitle, main)
-        tp[:intro] and set(:doctitleintro, tp[:intro].children.to_xml)
+        tp[:intro] and set(:doctitleintro, to_xml(tp[:intro].children))
         tp[:complementary] and
-          set(:doctitlecomplementary, tp[:complementary].children.to_xml)
+          set(:doctitlecomplementary, to_xml(tp[:complementary].children))
         set(:doctitlepartlabel, part_prefix(tn, lang))
-        set(:doctitlepart, tp[:part].children.to_xml) if tp[:part]
+        set(:doctitlepart, to_xml(tp[:part].children)) if tp[:part]
         set(:doctitleamdlabel, amd_prefix(tn, lang)) if tn[:amd]
-        set(:doctitleamd, tp[:amd].children.to_xml) if tp[:amd]
+        set(:doctitleamd, to_xml(tp[:amd].children)) if tp[:amd]
         set(:doctitlecorrlabel, corr_prefix(tn, lang)) if tn[:corr]
         set(:doctitleaddlabel, add_prefix(tn, lang)) if tn[:add]
-        set(:doctitleadd, tp[:add].children.to_xml) if tp[:add]
+        set(:doctitleadd, to_xml(tp[:add].children)) if tp[:add]
       end
 
       def subtitle(isoxml, _out)
@@ -158,18 +152,18 @@ module IsoDoc
         tp = title_parts(isoxml, lang)
         tn = title_nums(isoxml)
 
-        set(:docsubtitlemain, tp[:main] ? tp[:main].children.to_xml : "")
+        set(:docsubtitlemain, tp[:main] ? to_xml(tp[:main].children) : "")
         main = compose_title(tp, tn, lang)
         set(:docsubtitle, main)
-        tp[:intro] and set(:docsubtitleintro, tp[:intro].children.to_xml)
+        tp[:intro] and set(:docsubtitleintro, to_xml(tp[:intro].children))
         tp[:complementary] and
-          set(:docsubtitlecomplementary, tp[:complementary].children.to_xml)
+          set(:docsubtitlecomplementary, to_xml(tp[:complementary].children))
         set(:docsubtitlepartlabel, part_prefix(tn, lang))
-        tp[:part] and set(:docsubtitlepart, tp[:part].children.to_xml)
+        tp[:part] and set(:docsubtitlepart, to_xml(tp[:part].children))
         set(:docsubtitleamdlabel, amd_prefix(tn, lang)) if tn[:amd]
-        set(:docsubtitleamd, tp[:amd].children.to_xml) if tp[:amd]
+        set(:docsubtitleamd, to_xml(tp[:amd].children)) if tp[:amd]
         set(:docsubtitleaddlabel, add_prefix(tn, lang)) if tn[:add]
-        set(:docsubtitleadd, tp[:add].children.to_xml) if tp[:add]
+        set(:docsubtitleadd, to_xml(tp[:add].children)) if tp[:add]
         set(:docsubtitlecorrlabel, corr_prefix(tn, lang)) if tn[:corr]
       end
 
@@ -187,13 +181,13 @@ module IsoDoc
         set(:tc, tcid)
       end
 
+      COMMITTEE = "//bibdata/contributor[role/@type = 'author'] " \
+        "[role/description = 'committee']/organization".freeze
+
       def tc_base(xml, grouptype)
-        tc_num = xml.at(ns("//bibdata/ext/#{grouptype}/" \
-                           "technical-committee/@number")) or return nil
-        tc_type = xml.at(ns("//bibdata/ext/#{grouptype}/technical-committee/" \
-                            "@type"))&.text || "TC"
-        tc_type == "Other" and tc_type = ""
-        "#{tc_type} #{tc_num.text}".strip
+        s = xml.at(ns("#{COMMITTEE}/subdivision[@type = 'Technical committee']"))
+        s or return nil
+        s.at(ns("./identifier[not(@type = 'full')]"))&.text
       end
 
       def sc(xml)
@@ -202,12 +196,9 @@ module IsoDoc
       end
 
       def sc_base(xml, grouptype)
-        sc_num = xml.at(ns("//bibdata/ext/#{grouptype}/subcommittee/" \
-                           "@number")) or return nil
-        sc_type = xml.at(ns("//bibdata/ext/#{grouptype}/subcommittee/" \
-                            "@type"))&.text || "SC"
-        sc_type == "Other" and sc_type = ""
-        "#{sc_type} #{sc_num.text}"
+        s = xml.at(ns("#{COMMITTEE}/subdivision[@type = 'Subcommittee']"))
+        s or return nil
+        s.at(ns("./identifier[not(@type = 'full')]"))&.text
       end
 
       def wg(xml)
@@ -216,23 +207,27 @@ module IsoDoc
       end
 
       def wg_base(xml, grouptype)
-        wg_num = xml.at(ns("//bibdata/ext/#{grouptype}/workgroup/" \
-                           "@number")) or return
-        wg_type = xml.at(ns("//bibdata/ext/#{grouptype}/workgroup/" \
-                            "@type"))&.text || "WG"
-        wg_type == "Other" and wg_type = ""
-        "#{wg_type} #{wg_num.text}"
+        s = xml.at(ns("#{COMMITTEE}/subdivision[@type = 'Workgroup']"))
+        s or return nil
+        s.at(ns("./identifier[not(@type = 'full')]"))&.text
       end
 
       def editorialgroup(xml)
-        a = xml.at(ns("//bibdata/ext/editorialgroup/@identifier")) and
-          set(:editorialgroup, a.text)
-        a = xml.at(ns("//bibdata/ext/approvalgroup/@identifier")) and
-          set(:approvalgroup, a.text)
+        xpath = "#{COMMITTEE}/subdivision/identifier[@type = 'full']"
+        a = xml.xpath(ns(xpath))
+        a.empty? or set(:editorialgroup,
+                        connectives_strip(@i18n.boolean_conj(a.map(&:text),
+                                                             "and")))
+        a = xml.xpath(ns(xpath.sub("author", "authorizer")))
+        a.empty? or set(:approvalgroup,
+                        connectives_strip(@i18n.boolean_conj(a.map(&:text),
+                                                             "and")))
       end
 
       def secretariat(xml)
-        sec = xml.at(ns("//bibdata/ext/editorialgroup/secretariat"))
+        sec = xml.at(ns("//bibdata/contributor[role/@type = 'author']" \
+          "[role/description = 'secretariat']/organization/subdivision" \
+          "[@type = 'Secretariat']/name"))
         set(:secretariat, sec.text) if sec
       end
 

data/lib/isodoc/iso/presentation_bibdata.rb

@@ -1,35 +1,6 @@
 module IsoDoc
   module Iso
     class PresentationXMLConvert < IsoDoc::PresentationXMLConvert
-      def bibdata(docxml)
-        super
-        editorialgroup_identifier(docxml)
-      end
-
-      def editorialgroup_identifier(docxml)
-        %w(editorialgroup approvalgroup).each do |v|
-          docxml.xpath(ns("//bibdata/ext/#{v}")).each do |a|
-            editorialgroup_identifier1(a)
-          end
-        end
-      end
-
-      def editorialgroup_identifier1(group)
-        agency = group.xpath(ns("./agency"))&.map(&:text)
-        ret = %w(technical-committee subcommittee workgroup)
-          .each_with_object([]) do |v, m|
-          m << editorialgroup_identifier2(group, v)
-        end
-        group["identifier"] = (agency + ret.compact).join("/")
-      end
-
-      def editorialgroup_identifier2(group, level)
-        a = group.at(ns("./#{level}")) or return nil
-        type = a["type"]
-        type&.casecmp("other")&.zero? and type = ""
-        "#{type} #{a['number']}".strip
-      end
-
       def bibdata_i18n(bib)
         hash_translate(bib, @i18n.get["doctype_dict"], "./ext/doctype",
                        "//presentation-metadata/doctype-alias", @lang)
@@ -37,6 +8,8 @@ module IsoDoc
                            bib.at(ns("./ext/doctype")))
         hash_translate(bib, @i18n.get["substage_dict"],
                        "./status/substage", nil, @lang)
+        hash_translate(bib, @i18n.get["contributor_role_desc_dict"],
+                       "./contributor/role/description", nil, @lang)
         edition_translate(bib)
       end
 

data/lib/isodoc/iso/presentation_section.rb

@@ -15,9 +15,9 @@ module IsoDoc
 
       def warning_for_missing_metadata_create(docxml)
         ret = ""
-        docxml.at(ns("//bibdata/ext//secretariat")) or
+        docxml.at(ns("//bibdata//contributor/role[description = 'secretariat']")) or
           ret += "<p>Secretariat is missing.</p>"
-        docxml.at(ns("//bibdata/ext//editorialgroup")) or
+        docxml.at(ns("//bibdata//contributor/role[description = 'committee']")) or
           ret += "<p>Editorial groups are missing.</p>"
         docxml.at(ns("//bibdata/date[@type = 'published' or @type = 'issued' " \
                      "or @type = 'created']")) ||

data/lib/metanorma/iso/basicdoc.rng

@@ -1291,13 +1291,13 @@ Restricted recursively to contain only other such inline elements with no identi
       <ref name="pure_strike"/>
       <ref name="pure_smallcap"/>
       <ref name="br"/>
+      <ref name="stem"/>
     </choice>
   </define>
   <define name="NestedTextElement">
     <a:documentation>Contents of TextElement tags: leaves out tags that should occur only at top level of block: bookmark image hr pagebreak</a:documentation>
     <choice>
       <ref name="PureTextElement"/>
-      <ref name="stem"/>
       <ref name="eref"/>
       <ref name="xref"/>
       <ref name="hyperlink"/>

data/lib/metanorma/iso/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/iso/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/iso/cleanup.rb

@@ -100,30 +100,6 @@ module Metanorma
         super
       end
 
-      def bibdata_cleanup(xmldoc)
-        super
-        approval_groups_rename(xmldoc)
-        editorial_groups_agency(xmldoc)
-        editorial_group_types(xmldoc)
-      end
-
-      def approval_groups_rename(xmldoc)
-        %w(technical-committee subcommittee workgroup).each do |v|
-          xmldoc.xpath("//bibdata//approval-#{v}").each { |a| a.name = v }
-        end
-      end
-
-      def editorial_groups_agency(xmldoc)
-        pubs = extract_publishers(xmldoc)
-        xmldoc.xpath("//bibdata/ext/editorialgroup").each do |e|
-          pubs.reverse_each do |p|
-            if e.children.empty? then e << "<agency>#{p}</agency>"
-            else e.children.first.previous = "<agency>#{p}</agency>"
-            end
-          end
-        end
-      end
-
       def extract_publishers(xmldoc)
         xmldoc.xpath("//bibdata/contributor[role/@type = 'publisher']/" \
                      "organization").each_with_object([]) do |p, m|
@@ -132,25 +108,34 @@ module Metanorma
         end
       end
 
+      def termdef_boilerplate_insert_locationx(xmldoc)
+        f = xmldoc.at(self.class::TERM_CLAUSE)
+        root = xmldoc.at("//sections/terms | //sections/clause[.//terms]")
+        !f || !root and return f || root
+        f.at("./preceding-sibling::clause") and return root
+        f
+      end
+
+      def published?(status, _xmldoc)
+        status.to_i.positive? && status.to_i >= 60
+      end
+
+      def bibdata_cleanup(xmldoc)
+        super
+        editorial_group_types(xmldoc)
+      end
+
       DEFAULT_EDGROUP_TYPE = { "technical-committee": "TC",
                                subcommittee: "SC", workgroup: "WG" }.freeze
 
       def editorial_group_types(xmldoc)
         %w(technical-committee subcommittee workgroup).each do |v|
-          xmldoc.xpath("//bibdata//#{v} | //bibdata//approval-#{v}").each do |g|
-            g["type"] and next
-            g["type"] = DEFAULT_EDGROUP_TYPE[v.to_sym]
+          v1 = v.sub("-", " ").capitalize
+          xmldoc.xpath("//bibdata//subdivision[@type = '#{v1}']").each do |g|
+            g["subtype"] ||= DEFAULT_EDGROUP_TYPE[v.to_sym]
           end
         end
       end
-
-      def termdef_boilerplate_insert_locationx(xmldoc)
-        f = xmldoc.at(self.class::TERM_CLAUSE)
-        root = xmldoc.at("//sections/terms | //sections/clause[.//terms]")
-        !f || !root and return f || root
-        f.at("./preceding-sibling::clause") and return root
-        f
-      end
     end
   end
 end

data/lib/metanorma/iso/front_contributor.rb

@@ -1,42 +1,72 @@
 module Metanorma
   module Iso
     class Converter < Standoc::Converter
-      # def home_agency
-      # "ISO"
-      # end
-
       def default_publisher
         "ISO"
       end
 
       def org_abbrev
         { "International Organization for Standardization" => "ISO",
-          "International Electrotechnical Commission" => "IEC" }
+          "International Electrotechnical Commission" => "IEC",
+          "International Organization for Standardization, International Electrotechnical Commission" => "ISO/IEC" }
       end
 
       def metadata_author(node, xml)
         org_contributor(node, xml,
                         { source: ["publisher", "pub"], role: "author",
                           default: default_publisher })
-        committee_contributors(node, xml, false, default_publisher)
+        committee_contributors(node, xml, default_publisher,
+                               { approval: false })
+        secretariat_contributor(node, xml, default_publisher)
       end
 
       def org_organization(node, xml, org)
-        org[:committee] and
-          contrib_committee_build(xml, org[:agency], org) or
-          super
+        if org[:committee]
+          contrib_committee_build(xml, org[:agency], org)
+        else super
+        end
+      end
+
+      def secretariat_contributor(node, xml, agency)
+        node.attr("secretariat") or return
+        o = committee_contrib_org_prep(node, "secretariat", agency, {})
+        o[:desc] = "secretariat"
+        org_contributor(node, xml, o)
       end
 
-      def committee_contributors(node, xml, approval, agency)
-        metadata_approval_committee_types(approval ? node : nil).each do |v|
-          node.attr("#{v}-number") or next
+      def committee_contributors(node, xml, agency, opt)
+        t = metadata_approval_committee_types(opt[:approval] ? node : nil)
+        v = t.first
+        if committee_number_or_name?(node, v, "")
           node.attr(v) or node.set_attr(v, "")
-          o = { source: [v], role: approval ? "authorizer" : "author",
-                default_org: false, committee: true, agency:,
-                desc: v.sub(/^approval-/, "").tr("-", " ").capitalize }
+          o = committee_contrib_org_prep(node, v, agency, opt)
+          o[:groups] = t
+          o[:approval] = opt[:approval]
           org_contributor(node, xml, o)
         end
-        approval or committee_contributors_approval(node, xml, agency)
+        opt[:approval] or committee_contributors_approval(node, xml, agency)
+      end
+
+      def committee_contrib_org_prep(node, type, agency, opt)
+        agency_arr, agency_abbrev =
+          committee_org_prep_agency(node, type, agency, [], [])
+        { source: [type], role: opt[:approval] ? "authorizer" : "author",
+          default_org: false, committee: true, agency: agency_arr,
+          agency_abbrev:, desc: "committee",
+          subdivtype: type.sub(/^approval-/, "").tr("-", " ").capitalize }
+          .compact
+      end
+
+      def committee_org_prep_agency(node, type, agency, agency_arr, agency_abbr)
+        i = 1
+        suffix = ""
+        while committee_number_or_name?(node, type, suffix)
+          agency_arr << (node.attr("#{type}-agency#{suffix}") || agency)
+          agency_abbr << node.attr("#{type}-agency-abbr#{suffix}")
+          i += 1
+          suffix = "_#{i}"
+        end
+        [agency_arr, agency_abbr]
       end
 
       def committee_contributors_approval(node, xml, agency)
@@ -45,69 +75,31 @@ module Metanorma
         org_contributor(node, xml, o)
       end
 
-      def extract_org_attrs_complex(node, opts, source, suffix)
-        n = node.attr("#{source}-number#{suffix}")
-        t = committee_abbrev(node.attr("#{source}-type#{suffix}"), n, source)
-        super.merge(ident: t).compact
-      end
-
-      def contrib_committee_build(xml, agency, committee)
-        name = org_abbrev.invert[agency] and agency = name
-        xml.name agency
-        xml.subdivision do |o|
-            o.name committee[:name]
-            committee[:abbr] and o.abbreviation committee[:abbr]
-            committee[:ident] and o.identifier committee[:ident]
-        end
-      end
-
-      COMMITTEE_ABBREVS =
+      def committee_abbrevs
         { "technical-committee" => "TC", "subcommittee" => "SC",
-          "workgroup" => "WG" }.freeze
+          "workgroup" => "WG" }
+      end
 
-      def committee_abbrev(type, number, level)
-        type ||= COMMITTEE_ABBREVS[level.sub(/^approval-/, "")]
+      def committee_ident(type, number, level)
+        number.nil? || number.empty? and return
+        type ||= committee_abbrevs[level.sub(/^approval-/, "")]
         type == "Other" and type = ""
         "#{type} #{number}".strip
       end
 
-      def org_attrs_parse(node, opts)
-        super&.map do |x|
-          x.merge(agency: opts[:agency], abbr: opts[:abbr],
-                  committee: opts[:committee], default_org: opts[:default_org])
-        end
+      def contributors_committees_filter_empty?(committee)
+        committee[:name].empty? &&
+          (committee[:ident].nil? || %w(WG TC
+                                        SC).include?(committee[:ident]))
       end
 
       def metadata_publisher(node, xml)
         super
         # approvals
-        committee_contributors(node, xml, true,
-                               node.attr("approval-agency") || default_publisher)
-      end
-
-      def metadata_committee(node, xml)
-        metadata_editorial_committee(node, xml)
-        metadata_approval_committee(node, xml)
-      end
-
-      def metadata_editorial_committee(node, xml)
-        xml.editorialgroup do |a|
-          %w(technical-committee subcommittee workgroup).each do |v|
-            node.attr("#{v}-number") and committee_component(v, node, a)
-          end
-          node.attr("secretariat") and a.secretariat(node.attr("secretariat"))
-        end
-      end
-
-      def metadata_approval_committee(node, xml)
-        types = metadata_approval_committee_types(node)
-        xml.approvalgroup do |a|
-          metadata_approval_agency(a, node.attr("approval-agency")
-            &.split(%r{[/,;]}))
-          types.each do |v|
-            node.attr("#{v}-number") and committee_component(v, node, a)
-          end
-        end
+        committee_contributors(
+          node, xml,
+          node.attr("approval-agency") || default_publisher, { approval: true }
+        )
       end
 
       def metadata_approval_committee_types(node)
@@ -117,13 +109,6 @@ module Metanorma
                      approval-workgroup)
         types
       end
-
-      def metadata_approval_agency(xml, list)
-        list = [default_publisher] if list.nil? || list.empty?
-        list.each do |v|
-          xml.agency v
-        end
-      end
     end
   end
 end