metanorma-standoc 3.1.3 → 3.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b781bd30313479321cf23297d77787c8500bda06c74a76028853f9b28d30510
-  data.tar.gz: bbdf82ad80d7a6b9f1f21582d7ab6eeb58b365d4aea706a49046d74b4e6309ad
+  metadata.gz: 101539eb3a9ab93dced9b971970f3ff3901d7d85de59be1cac19e92495b0e9d3
+  data.tar.gz: f628e233575e4b13e92aeb6980fd42c9b97e05256f8e859f892fbb71643247f1
 SHA512:
-  metadata.gz: 398ae3eaa49e8d22a4612adecf703cc4d3d7ae1b4a056f29289e5e9517be690253a1fadabf67ef1d030763992c5d97b405cc8296275df5a98eb5fc40386b93da
-  data.tar.gz: 994a1d4820b1a68e2768ca5c189788f89a7487c1e9dd63f09178aed9c1dfd558f416a1c8521834c5e8d39b294f9a488a61778f3490e5e3aad04b10d7b5bcc386
+  metadata.gz: '0943020cfe1c2a7a7947f470c0443ff200cbb5ca894b8268dda16e66e8e310f810cb0c0dc64d495b544c987d14995bd5e57d69ac25e61432a3b563bf1b8f2036'
+  data.tar.gz: 1d68cd3ebd13e2681442a65975201ce39bdcf84eaa6f7b299345716e0b091129babaea12eb6faf5af207415af45a5d4a39cf59c362659156fcdf635f8f9b86f4

data/lib/metanorma/standoc/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/standoc/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/standoc/blocks_notes.rb

@@ -6,6 +6,7 @@ module Metanorma
           .merge(
             "keep-separate": node.attr("keep-separate"),
             keepasterm: node.option?("termnote") ? "true" : nil,
+            type: node.attr("type")
           )))
       end
 

data/lib/metanorma/standoc/cleanup.rb

@@ -33,7 +33,8 @@ module Metanorma
         passthrough_cleanup(xmldoc) # feeds: smartquotes_cleanup
         unnumbered_blocks_cleanup(xmldoc)
         termdocsource_cleanup(xmldoc) # feeds: metadata_cleanup
-        metadata_cleanup(xmldoc) # feeds: boilerplate_cleanup
+        metadata_cleanup(xmldoc) # feeds: boilerplate_cleanup, bibdata_cleanup,
+        # docidentifier_cleanup (in generic: template)
         misccontainer_cleanup(xmldoc)
         sections_cleanup(xmldoc) # feeds: obligations_cleanup, toc_cleanup,
         # floatingtitle_cleanup
@@ -202,6 +203,8 @@ module Metanorma
       end
 
       def metadata_cleanup(xmldoc)
+        bibdata_published(xmldoc) # feeds: bibdata_cleanup,
+        # docidentifier_cleanup (in generic: template)
         (@metadata_attrs.nil? || @metadata_attrs.empty?) and return
         ins = add_misc_container(xmldoc)
         ins << @metadata_attrs

data/lib/metanorma/standoc/cleanup_bibdata.rb

@@ -59,7 +59,7 @@ module Metanorma
         end
       end
 
-      def indirect_eref_to_xref(eref, ident, id_map=nil)
+      def indirect_eref_to_xref(eref, ident, id_map = nil)
         loc = eref.at("./localityStack[locality[@type = 'anchor']]") ||
           eref.at("./locality[@type = 'anchor']")
         loc = loc&.remove&.text || ident
@@ -72,6 +72,7 @@ module Metanorma
         else
           eref.document.at("//*[@anchor = '#{loc}']") and return
         end
+
         eref.children = %(** Missing target #{loc})
         eref["target"] = ident
       end
@@ -181,6 +182,20 @@ module Metanorma
           ins.next = c
         end
       end
+
+      def bibdata_published(xmldoc)
+        ins = add_misc_container(xmldoc)
+        ins ||= add_misc_container(xmldoc)
+        ins.at("./semantic-metadata/stage-published") and return
+        p = published?(xmldoc.at("bibdata/status/stage")&.text, xmldoc)
+        ins << <<~XML
+          <semantic-metadata><stage-published>#{p}</stage-published></semantic-metadata>
+        XML
+      end
+
+      def published?(stage, _xmldoc)
+        stage.casecmp("published").zero?
+      end
     end
   end
 end

data/lib/metanorma/standoc/cleanup_boilerplate.rb

@@ -162,25 +162,64 @@ module Metanorma
         end
       end
 
-      # Asciidoc macro, e.g. span:publisher[...]
-      # May contain one or more {{ }} in target, with spaces in them
-      # Does not end in \]
-      ADOC_MACRO_START =
-        '\S+:(?:[^\[\] ]+|\{\{[^{}]+\}\})*\[.*?(?<!\\\\)\]'.freeze
-
-      # Replace {{ ... }} with {{ pass:[...]}} to preserve any XML markup
-      # use pass:[...\] if {{}} is already inside an Asciidoc macro
-      # Do not use pass: if this is a macro target: mailto:{{x}}[]
-      # or body: mailto:[{{x}}]
+      # The boilerplate file is in Liquid AsciiDoc format
+      # (technically, `boilerplate.adoc.liquid`).
+      #
+      # This file is processed separately from the main Metanorma document and
+      # therefore is oblivious of the `{{ concept-mention }}` syntax.
+      #
+      # Due to historic reasons, the Liquid objects being evaluated in the
+      # boilerplate document are XML strings. Notably these are the document
+      # metadata, that are extracted from the already generated Metanorma XML.
+      #
+      # These XML strings are then passed into the AsciiDoc macros such as
+      # `span:publisher[...]`.
+      #
+      # Here, we need to interpolate the XML strings into the AsciiDoc macros
+      # without breaking the AsciiDoc syntax.
+      #
+      # EXAMPLE 1: `mailto:{{ pub_email }}[]`, we need to
+      # convert it to:
+      # `mailto:{{ pass-format:metanorma[++pub_email_xml++] }}[]`
+      #
+      # EXAMPLE 2: `link:{{ pub_uri}}[{{ pub_address }}, {{ pub_uri }}]`
+      # We need to convert it to:
+      # `link:{{ pass-format:metanorma[++pub_uri_xml++] }}[{{
+      # pass-format:metanorma[++pub_address_xml++] }}, {{
+      # pass-format:metanorma[++pub_uri_xml++] }}]`
+      #
+      # NOTE: The boilerplate may use macros that contain one or more
+      # `{{ ... }}` in the target, and can contain spaces in them.
+      #
+      # NOTE: The routine needs to handle cases where the content
+      # contains an escaped closing bracket `\]`.
+
+      ADOC_MACRO_PATTERN = /\S+:[^\[\n]*\[[^\]\\]*(?:\\.[^\]\\]*)*\]/
+
+      # Replace {{ ... }} with {{ pass-format:metanorma:[...] }} to preserve any
+      # XML markup provided by Metanorma XML Metadata content, through the
+      # `pass-format:metanorma` command.
+      #
+      # * If `{{ ... }}` is inside an Asciidoc macro, we have to wrap with
+      #   pass-format:metanorma:[...\].
+      # * If this is a macro target (e.g. `mailto:{{x}}[]`, body: mailto:[{{x}}])
+      #   then do not use pass-format:metanorma.
+
       def boilerplate_read(file)
         ret = File.read(file, encoding: "UTF-8")
-        /\.adoc$/.match?(file) or return ret
-        ret.split(/(#{ADOC_MACRO_START}|\])/o).map do |r|
-          if /^#{ADOC_MACRO_START}$/o.match?(r)
-            r
+        /\.adoc(\.liquid)?$/.match?(file) or return ret
+
+        # Split content into macro and non-macro parts
+        parts = ret.split(/(#{ADOC_MACRO_PATTERN})/)
+
+        parts.map.with_index do |part, index|
+          if index.odd? && is_valid_macro?(part)
+            # This is a macro - leave unchanged
+            part
           else
-            r.gsub(/(?<!\{)(\{\{[^{}]+\}\})(?!\})/,
-                   "pass-format:metanorma[++\\1++]")
+            # Not a macro - wrap {{ }} patterns
+            part.gsub(/(?<!\{)(\{\{[^{}]+\}\})(?!\})/,
+                     "pass-format:metanorma[++\\1++]")
           end
         end.join
       end
@@ -199,6 +238,13 @@ module Metanorma
         ret
       end
 
+      private
+
+      def is_valid_macro?(text)
+        # Simple validation - does it look like a macro?
+        text.match?(/^\S+:[^\[]*\[.*\]$/)
+      end
+
       # remove Metanorma namespace, so generated doc containing boilerplate
       # can be queried consistently
       # _\d+ anchor is assigned to titleless clauses, will clash with main doc

data/lib/metanorma/standoc/cleanup_maths.rb

@@ -96,7 +96,8 @@ module Metanorma
 
       def add_misc_container(xmldoc)
         unless ins = xmldoc.at("//metanorma-extension")
-          a = xmldoc.xpath("//termdocsource")&.last || xmldoc.at("//bibdata")
+          a = xmldoc.xpath("//termdocsource")&.last || xmldoc.at("//bibdata") ||
+            xmldoc.root.children.first
           a.next = "<metanorma-extension/>"
           ins = xmldoc.at("//metanorma-extension")
         end

data/lib/metanorma/standoc/cleanup_section_names.rb

@@ -51,9 +51,9 @@ module Metanorma
       NO_SYMABBR = "[.//definitions[not(@type)]]".freeze
       SYMABBR = "[.//definitions[@type = 'symbols']]" \
                 "[.//definitions[@type = 'abbreviated_terms']]".freeze
-      SYMnoABBR = "[.//definitions[@type = 'symbols']]" \
+      SYM_NO_ABBR = "[.//definitions[@type = 'symbols']]" \
                   "[not(.//definitions[@type = 'abbreviated_terms'])]".freeze
-      ABBRnoSYM = "[.//definitions[@type = 'abbreviated_terms']]" \
+      ABBR_NO_SYM = "[.//definitions[@type = 'abbreviated_terms']]" \
                   "[not(.//definitions[@type = 'symbols'])]".freeze
 
       def section_names_terms_cleanup(xml)
@@ -81,9 +81,9 @@ module Metanorma
 
       def section_names_terms1_cleanup(xml)
         auto_name_terms(xml) or return
-        replace_title(xml, "//terms#{SYMnoABBR} | //clause[@type = 'terms']#{SYMnoABBR}",
+        replace_title(xml, "//terms#{SYM_NO_ABBR} | //clause[@type = 'terms']#{SYM_NO_ABBR}",
                       @i18n&.termsdefsymbols, true)
-        replace_title(xml, "//terms#{ABBRnoSYM} | //clause[@type = 'terms']#{ABBRnoSYM}",
+        replace_title(xml, "//terms#{ABBR_NO_SYM} | //clause[@type = 'terms']#{ABBR_NO_SYM}",
                       @i18n&.termsdefabbrev, true)
         replace_title(xml, "//terms#{SYMABBR} | //clause[@type = 'terms']#{SYMABBR}",
                       @i18n&.termsdefsymbolsabbrev, true)
@@ -124,12 +124,12 @@ module Metanorma
                 unless acc[:parent] == :term # don't count Term > Term twice
                   :term
                 end
-              elsif hasterm && node.at("./self::*#{SYMnoABBR}") then :tsna
-              elsif hasterm && node.at("./self::*#{ABBRnoSYM}") then :tans
+              elsif hasterm && node.at("./self::*#{SYM_NO_ABBR}") then :tsna
+              elsif hasterm && node.at("./self::*#{ABBR_NO_SYM}") then :tans
               elsif hasterm && node.at("./self::*#{SYMABBR}") then :tsa
               elsif hasterm && node.at("./self::*#{NO_SYMABBR}") then :tnsa
-              elsif node.at("./self::*#{SYMnoABBR}") then :sna
-              elsif node.at("./self::*#{ABBRnoSYM}") then :ans
+              elsif node.at("./self::*#{SYM_NO_ABBR}") then :sna
+              elsif node.at("./self::*#{ABBR_NO_SYM}") then :ans
               elsif node.at("./self::*#{SYMABBR}") then :sa
               elsif node.at("./self::*#{NO_SYMABBR}") then :nsa
               elsif node.name == "definitions" # ignore

data/lib/metanorma/standoc/converter.rb

@@ -33,11 +33,11 @@ module Metanorma
         block_macro Metanorma::Plugin::Lutaml::LutamlGmlDictionaryBlockMacro
         block Metanorma::Plugin::Lutaml::LutamlGmlDictionaryBlock
         block_macro Metanorma::Plugin::Lutaml::LutamlKlassTableBlockMacro
+        block_macro Metanorma::Plugin::Lutaml::LutamlEnumTableBlockMacro
+        block Metanorma::Plugin::Plantuml::BlockProcessor
         preprocessor Metanorma::Standoc::EmbedIncludeProcessor
         preprocessor Metanorma::Standoc::LinkProtectPreprocessor
         preprocessor Metanorma::Standoc::PassProtectPreprocessor
-        preprocessor Metanorma::Standoc::Datamodel::AttributesTablePreprocessor
-        preprocessor Metanorma::Standoc::Datamodel::DiagramPreprocessor
         preprocessor Metanorma::Plugin::Lutaml::Json2TextPreprocessor
         preprocessor Metanorma::Plugin::Lutaml::Yaml2TextPreprocessor
         preprocessor Metanorma::Plugin::Lutaml::Data2TextPreprocessor
@@ -80,7 +80,6 @@ module Metanorma
         inline_macro Metanorma::Standoc::SourceIncludeInlineMacro
         block Metanorma::Standoc::ToDoAdmonitionBlock
         block Metanorma::Standoc::EditorAdmonitionBlock
-        block Metanorma::Standoc::PlantUMLBlockMacro
         block Metanorma::Standoc::PseudocodeBlockMacro
         block_macro Metanorma::Standoc::ColumnBreakBlockMacro
       end

data/lib/metanorma/standoc/front.rb

@@ -53,13 +53,6 @@ module Metanorma
         end
       end
 
-      def metadata_committee(node, xml)
-        node.attr("technical-committee") or return
-        xml.editorialgroup do |a|
-          committee_component("technical-committee", node, a)
-        end
-      end
-
       def metadata_ics(node, xml)
         ics = node.attr("library-ics")
         ics&.split(/,\s*/)&.each do |i|
@@ -194,7 +187,6 @@ module Metanorma
         metadata_doctype(node, ext)
         metadata_subdoctype(node, ext)
         metadata_flavor(node, ext)
-        metadata_committee(node, ext)
         metadata_ics(node, ext)
         structured_id(node, ext)
         metadata_coverpage_images(node, ext)

data/lib/metanorma/standoc/front_committee.rb

@@ -0,0 +1,140 @@
+module Metanorma
+  module Standoc
+    module Front
+      def committee_number_or_name?(node, type, suffix)
+        node.attr("#{type}-number#{suffix}") || node.attr("#{type}#{suffix}")
+      end
+
+      def committee_contributors(node, xml, agency, _opts)
+        t = metadata_committee_types(node)
+        v = t.first
+        if committee_number_or_name?(node, v, "")
+          node.attr(v) or node.set_attr(v, "")
+          o = committee_contrib_org_prep(node, v, agency, _opts)
+          o[:groups] = t
+          org_contributor(node, xml, o)
+        end
+      end
+
+      def metadata_committee_types(_node)
+        %w(technical-committee)
+      end
+
+      def committee_contrib_org_prep(node, type, agency, _opts)
+        agency_arr, agency_abbrev =
+          committee_org_prep_agency(node, type, agency, [], [])
+        { source: [type], role: "author", desc: "committee",
+          default_org: false, committee: true,
+          agency: agency_arr, agency_abbrev:,
+          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 contrib_committee_build(xml, agency, committee)
+        if name = org_abbrev.invert[agency]
+          committee[:agency_abbrev] = agency
+          agency = name
+        end
+        xml.name agency
+        s = committee
+        loop do
+          contrib_committee_subdiv(xml, s)
+          s = s[:subdiv] or break
+        end
+        abbr = committee[:agency_abbrev] and xml.abbreviation abbr
+        full_committee_id(xml.parent)
+      end
+
+      def contrib_committee_subdiv(xml, committee)
+        contributors_committees_filter_empty?(committee) and return
+        xml.subdivision **attr_code(type: committee[:subdivtype],
+                                    subtype: committee[:type]) do |o|
+          o.name committee[:name]
+          committee[:abbr] and o.abbreviation committee[:abbr]
+          committee[:ident] and o.identifier committee[:ident]
+        end
+      end
+
+      def full_committee_id(contrib)
+        ret = full_committee_agency_id(contrib)
+        ids = contrib.xpath("./subdivision").map do |x|
+          x.at("./identifier")&.text
+        end.compact
+        ins = contrib.at("./subdivision/identifier") and
+          ins.next = "<identifier type='full'>#{ret}#{ids.join('/')}</identifier>"
+      end
+
+      def full_committee_agency_id(contrib)
+        agency = contrib.at("./abbreviation")&.text
+        ret = agency == default_publisher ? "" : "#{agency} "
+        /^\s+/.match?(ret) and ret = ""
+        ret
+      end
+
+      def org_attrs_parse(node, opts)
+        opts_orig = opts.dup
+        ret = []
+        ret << org_attrs_parse_core(node, opts)&.map&.with_index do |x, i|
+          x.merge(agency: opts.dig(:agency, i), subdivtype: opts[:subdivtype],
+                  agency_abbrev: opts.dig(:agency_abbrev, i), abbr: opts[:abbr],
+                  committee: opts[:committee], default_org: opts[:default_org])
+        end
+        if !opts_orig[:groups] || opts_orig[:groups].empty? then ret.first
+        else org_attrs_add_committees(node, ret, opts, opts_orig)
+        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
+
+      # ensure there is subcommittee, workgroup -number_2, -number_3 etc
+      # to parse multiple tech committees
+      def contributors_committees_pad_multiples(committees, node, group)
+        committees.each_with_index do |_r, j|
+          suffix = j.zero? ? "" : "_#{j + 1}"
+          node.attr("#{group}#{suffix}") or
+            node.set_attr("#{group}#{suffix}", "")
+          node.attr("#{group}-number#{suffix}") or
+            node.set_attr("#{group}-number#{suffix}", "")
+        end
+      end
+
+      def contributors_committees_filter_empty?(committee)
+        (committee[:name].nil? || committee[:name].empty?) &&
+          committee[:ident].nil?
+      end
+
+      def contributors_committees_nest1(committees)
+        committees.empty? and return committees
+        committees = committees.reverse
+        committees.each_with_index do |m, i|
+          i.zero? and next
+          m.each_with_index do |m1, j|
+            m1[:subdiv] = committees[i - 1][j]
+          end
+        end
+        committees[-1]
+      end
+    end
+  end
+end

data/lib/metanorma/standoc/front_contributor.rb

@@ -1,13 +1,24 @@
 require_relative "./front_organisation"
+require_relative "./front_committee"
 
 module Metanorma
   module Standoc
     module Front
       def metadata_author(node, xml)
-        org_contributor(node, xml,
-                        { source: ["publisher", "pub"], role: "author",
-                          default: default_publisher })
+        org_author(node, xml)
         personal_author(node, xml)
+        committee_contributors(node, xml, default_publisher, {})
+      end
+
+      def org_author(node, xml)
+        if node.attr("corporate-author")
+          org_contributor(node, xml, { source: ["corporate-author"],
+                                       role: "author" })
+        else
+          org_contributor(node, xml,
+                          { source: ["publisher", "pub"], role: "author",
+                            default: default_publisher })
+        end
       end
 
       def personal_author(node, xml)

data/lib/metanorma/standoc/front_organisation.rb

@@ -1,18 +1,6 @@
 module Metanorma
   module Standoc
     module Front
-      def committee_component(compname, node, out)
-        i = 1
-        suffix = ""
-        while node.attr(compname + suffix)
-          out.send compname.gsub(/-/, "_"), node.attr(compname + suffix),
-                   **attr_code(number: node.attr("#{compname}-number#{suffix}"),
-                               type: node.attr("#{compname}-type#{suffix}"))
-          i += 1
-          suffix = "_#{i}"
-        end
-      end
-
       def organization(org, orgname, node = nil, default_org = nil, attrs = {})
         orgname, abbr = org_name_and_abbrev(attrs, orgname)
         org.name orgname
@@ -147,12 +135,16 @@ module Metanorma
       end
 
       def org_organization(node, xml, org)
-        organization(xml, org[:name], node, !node.attr("publisher"), org)
-        org_address(org, xml)
-        org_logo(xml, org[:logo])
+        if org[:committee]
+          contrib_committee_build(xml, org[:agency], org)
+        else
+          organization(xml, org[:name], node, !node.attr("publisher"), org)
+          org_address(org, xml)
+          org_logo(xml, org[:logo])
+        end
       end
 
-      def org_attrs_parse(node, opts)
+      def org_attrs_parse_core(node, opts)
         source = opts[:source]&.detect { |s| node.attr(s) }
         org_attrs_simple_parse(node, opts, source) ||
           org_attrs_complex_parse(node, opts, source)
@@ -178,7 +170,7 @@ module Metanorma
         i = 1
         suffix = ""
         ret = []
-        while node.attr(source + suffix)
+        while committee_number_or_name?(node, source, suffix)
           ret << extract_org_attrs_complex(node, opts, source, suffix)
           i += 1
           suffix = "_#{i}"
@@ -187,14 +179,28 @@ module Metanorma
       end
 
       def extract_org_attrs_complex(node, opts, source, suffix)
-        { name: node.attr(source + suffix),
+        n = node.attr("#{source}-number#{suffix}") # for committees
+        t = committee_ident(node.attr("#{source}-type#{suffix}"), n, source)
+        { name: node.attr(source + suffix), ident: t,
           abbrev: node.attr("#{source}_abbr#{suffix}"),
           role: opts[:role], desc: opts[:desc],
+          type: node.attr("#{source}-type#{suffix}"),
           subdiv: node.attr("#{source}_subdivision#{suffix}"),
           logo: node.attr("#{source}_logo#{suffix}") }.compact
           .merge(extract_org_attrs_address(node, opts, suffix))
       end
 
+      def committee_abbrevs
+        { "technical-committee" => "TC" }
+      end
+
+      def committee_ident(type, number, level)
+        number.nil? || number.empty? and return
+        type ||= committee_abbrevs[level]
+        type == "Other" and type = ""
+        "#{type} #{number}".strip
+      end
+
       def extract_org_attrs_address(node, opts, suffix)
         %w(address phone fax email uri).each_with_object({}) do |a, m|
           opts[:source]&.each do |s|