metanorma-bipm 2.7.1 → 2.7.3

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
@@ -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/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.1".freeze
+    VERSION = "2.7.3".freeze
   end
 end

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

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.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-generic
@@ -207,7 +207,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: xml-c14n
+  name: canon
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="