metanorma-bipm 2.7.2 → 2.7.3

data/lib/isodoc/bipm/metadata.rb

@@ -46,19 +46,22 @@ module IsoDoc
         end.join(" ")
       end
 
-      def docid(isoxml, _out)
+      COMMITEE_XPATH = <<~XPATH.freeze
+        //bibdata/contributor[role/description = 'committee']/organization/subdivision[@type = 'Committee']
+      XPATH
+
+      def docid(xml, _out)
         super
-        docid_part(isoxml, [@i18n.get["level2_ancillary"],
-                            @i18n.get["level2_ancillary_alt"]], "appendix", :appendixid)
-        docid_part(isoxml, [@i18n.get["level3_ancillary"],
-                            @i18n.get["level3_ancillary_alt"]],  "annexid", :annexid)
-        docid_part(isoxml, [@i18n.get["level4_ancillary"],
-                            @i18n.get["level4_ancillary_alt"]],  "part", :partid)
-        docid_part(isoxml, [@i18n.get["level5_ancillary"],
-                            @i18n.get["level5_ancillary_alt"]],  "subpart", :subpartid)
-        set(:org_abbrev,
-            isoxml.at(ns("//bibdata/ext/editorialgroup/committee"\
-                         "[@acronym = 'JCGM']")) ? "JCGM" : "BIPM")
+        [{ label: "level2", elem: "appendix", key: :appendixid },
+         { label: "level3", elem: "annexid", key: :annexid },
+         { label: "level4", elem: "part", key: :partid },
+         { label: "level5", elem: "subpart", key: :subpartid }].each do |m|
+          docid_part(xml, [@i18n.get["#{m[:label]}_ancillary"],
+                           @i18n.get["#{m[:label]}_ancillary_alt"]], m[:elem],
+                     m[:key])
+        end
+        c = xml.at(ns("#{COMMITEE_XPATH}/identifier[not(@type = 'full')][text() = 'JCGM']"))
+        set(:org_abbrev, c ? "JCGM" : "BIPM")
       end
 
       def docid_part(isoxml, labels, elem, key)
@@ -81,6 +84,7 @@ module IsoDoc
       def author(xml, _out)
         super
         authorizer(xml)
+        committee(xml)
       end
 
       def authorizer(xml)
@@ -93,6 +97,13 @@ module IsoDoc
         end
         ret.empty? or set(:authorizer, ret)
       end
+
+      def committee(xml)
+        t = xml.at(ns(COMMITEE_XPATH)) or return
+        n = t.at(ns("./name[@language = '#{@lang}']")) ||
+          t.at(ns("./name[not(@language)]"))
+        n and set(:tc, n.text)
+      end
     end
   end
 end

data/lib/isodoc/bipm/presentation_xml_convert.rb

@@ -12,8 +12,9 @@ module IsoDoc
   module Bipm
     class PresentationXMLConvert < IsoDoc::Generic::PresentationXMLConvert
       def convert1(docxml, filename, dir)
-        @jcgm = docxml&.at(ns("//bibdata/ext/editorialgroup/committee/" \
-                              "@acronym"))&.value == "JCGM"
+        @jcgm = docxml.at(ns(<<~XPATH))&.text == "JCGM"
+          //bibdata/contributor[role/description = 'committee']/organization/subdivision[@type = 'Committee']/identifier[not(@type = 'full')]
+        XPATH
         @xrefs.klass.jcgm = @jcgm
         @jcgm and @iso = iso_processor(docxml)
         super

data/lib/isodoc/bipm/xref.rb

@@ -12,8 +12,9 @@ module IsoDoc
       end
 
       def parse(docxml)
-        @jcgm = docxml.at(ns("//bibdata/ext/editorialgroup/committee/" \
-                             "@acronym"))&.value == "JCGM"
+        @jcgm = docxml.at(ns(<<~XPATH))&.text == "JCGM"
+          //bibdata/contributor[role/description = 'committee']/organization/subdivision[@type = 'Committee']/identifier[not(@type = 'full')]
+        XPATH
         @annexlbl =
           if @jcgm then @labels["iso_annex"]
           elsif docxml.at(ns("//bibdata/ext/structuredidentifier/appendix"))

data/lib/metanorma/bipm/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/bipm/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/bipm/converter.rb

@@ -80,12 +80,12 @@ module Metanorma
       def committee_validate(xml)
         committees = Array(configuration&.committees) || return
         committees.empty? and return
-        xml.xpath("//bibdata/ext/editorialgroup/committee").each do |c|
+        xml.xpath("//bibdata/contributor[role/description = 'committee']/organization/subdivision[@type = 'Committee']/name").each do |c|
           committees.include? c.text or
             @log.add("Document Attributes", nil,
                      "#{c.text} is not a recognised committee")
         end
-        xml.xpath("//bibdata/ext/editorialgroup/committee/@acronym").each do |c|
+        xml.xpath("//bibdata/contributor[role/description = 'committee']/organization/subdivision[@type = 'Committee']/identifier[not(@type = 'full')]").each do |c|
           committees.include? c.text or
             @log.add("Document Attributes", nil,
                      "#{c.text} is not a recognised committee")

data/lib/metanorma/bipm/front.rb

@@ -1,46 +1,50 @@
 module Metanorma
   module Bipm
     class Converter < Metanorma::Generic::Converter
-      def metadata_committee(node, xml)
-        node.attr("committee-en") || node.attr("committee-fr") or return
-        xml.editorialgroup do |a|
-          metadata_committee1(node, a)
-          i = 2
-          while node.attr("committee-en_#{i}") || node.attr("committee-fr_#{i}")
-            metadata_committee2(node, a, i)
-            i += 1
-          end
-          metadata_workgroup(node, a)
+      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|
+          committee[:name] and o.name committee[:name]
+          committee[:name_en] and o.name committee[:name_en],
+                                         language: "en"
+          committee[:name_fr] and o.name committee[:name_fr],
+                                         language: "fr"
+          committee[:abbr] and o.abbreviation committee[:abbr]
+          committee[:ident] and o.identifier committee[:ident]
         end
       end
 
-      def metadata_committee1(node, xml)
-        %w(en fr).each do |lg|
-          e = node.attr("committee-#{lg}") or next
-          xml.committee e, **attr_code(acronym: node.attr("committee-acronym"),
-                                       language: lg, script: "Latn")
-        end
+      def contributors_committees_filter_empty?(committee)
+        (committee[:name].nil? || committee[:name].empty?) &&
+          (committee[:name_en].nil? || committee[:name_en].empty?) &&
+          (committee[:name_fr].nil? || committee[:name_fr].empty?) &&
+          committee[:ident].nil?
       end
 
-      def metadata_committee2(node, xml, num)
-        %w(en fr).each do |lg|
-          e = node.attr("committee-#{lg}_#{num}") or next
-          xml.committee e, **attr_code(acronym: node.attr("committee-acronym"),
-                                       language: lg, script: "Latn")
-        end
+      def committee_number_or_name?(node, type, suffix)
+        node.attr("#{type}-number#{suffix}") || node.attr("#{type}#{suffix}") ||
+          node.attr("#{type}-en#{suffix}") || node.attr("#{type}-fr#{suffix}")
       end
 
-      def metadata_workgroup(node, xml)
-        xml.workgroup(node.attr("workgroup"),
-                      **attr_code(acronym: node.attr("workgroup-acronym")))
-        i = 2
-        while node.attr("workgroup_#{i}")
-          xml.workgroup(
-            node.attr("workgroup_#{i}"),
-            **attr_code(acronym: node.attr("workgroup-acronym_#{i}")),
-          )
+      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 extract_org_attrs_complex(node, opts, source, suffix)
+        ident = node.attr("#{source}-acronym#{suffix}")
+        ret = super.merge(name_en: node.attr("#{source}-en#{suffix}"),
+                          name_fr: node.attr("#{source}-fr#{suffix}"))
+        ident and ret[:ident] = ident
+        ret
       end
 
       def metadata_relations(node, xml)

data/lib/metanorma/bipm/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
@@ -2233,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/bipm/relaton-bipm.rng

@@ -17,16 +17,6 @@
         <value>policy</value>
       </choice>
     </define>
-    <define name="editorialgroup">
-      <element name="editorialgroup">
-        <oneOrMore>
-          <ref name="committee"/>
-        </oneOrMore>
-        <zeroOrMore>
-          <ref name="workgroup"/>
-        </zeroOrMore>
-      </element>
-    </define>
     <define name="structuredidentifier">
       <element name="structuredidentifier">
         <element name="docnumber">
@@ -91,41 +81,6 @@
       </choice>
     </element>
   </define>
-  <define name="committee">
-    <element name="committee">
-      <attribute name="acronym">
-        <choice>
-          <value>CGPM</value>
-          <value>CIPM</value>
-          <value>BIPM</value>
-          <value>CCAUV</value>
-          <value>CCEM</value>
-          <value>CCL</value>
-          <value>CCM</value>
-          <value>CCPR</value>
-          <value>CCQM</value>
-          <value>CCRI</value>
-          <value>CCT</value>
-          <value>CCTF</value>
-          <value>CCU</value>
-          <value>CCL-CCTF-WGFS</value>
-          <value>JCGM</value>
-          <value>JCRB</value>
-          <value>JCTLM</value>
-          <value>INetQI</value>
-        </choice>
-      </attribute>
-      <ref name="LocalizedString"/>
-    </element>
-  </define>
-  <define name="workgroup">
-    <element name="workgroup">
-      <optional>
-        <attribute name="acronym"/>
-      </optional>
-      <text/>
-    </element>
-  </define>
   <define name="meeting-note">
     <element name="meeting-note">
       <text/>

data/lib/metanorma/bipm/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Bipm
-    VERSION = "2.7.2".freeze
+    VERSION = "2.7.3".freeze
   end
 end

data/metanorma.yml

@@ -97,6 +97,9 @@ committees:
   - Comité commun pour la traçabilité en médecine de laboratoire
   - INetQI
   - International Network on Quality Infrastructure
+committee_types:
+  - committee
+  - workgroup
 metadata_extensions:
   structuredidentifier:
     docnumber:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-bipm
 version: !ruby/object:Gem::Version
-  version: 2.7.2
+  version: 2.7.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-08-04 00:00:00.000000000 Z
+date: 2025-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic