metanorma-bipm 2.7.8 → 2.7.10

data/lib/metanorma/bipm/converter.rb

@@ -2,6 +2,7 @@ require "metanorma/standoc/converter"
 require "metanorma/generic/converter"
 require_relative "front"
 require_relative "cleanup"
+require_relative "validate"
 
 module Metanorma
   module Bipm
@@ -77,19 +78,6 @@ module Metanorma
         super
       end
 
-      def committee_validate(xml)
-        committees = Array(configuration&.committees) || return
-        committees.empty? and return
-        xml.xpath("//bibdata/contributor[role/description = 'committee']/organization/subdivision[@type = 'Committee']/name").each do |c|
-          committees.include? c.text or
-            @log.add("BIPM_1", nil, params: [c.text])
-        end
-        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("BIPM_1", nil, params: [c.text])
-        end
-      end
-
       def document(node)
         @jcgm = node.attr("committee-acronym") == "JCGM"
         super

data/lib/metanorma/bipm/front.rb

@@ -1,17 +1,15 @@
 module Metanorma
   module Bipm
     class Converter < Metanorma::Generic::Converter
-      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]
+      def contrib_committee_subdiv(xml, comm)
+        contributors_committees_filter_empty?(comm) and return
+        xml.subdivision **attr_code(type: comm[:subdivtype],
+                                    subtype: comm[:type]) do |o|
+          add_noko_elem(o, "name", comm[:name])
+          add_noko_elem(o, "name", comm[:name_en], language: "en")
+          add_noko_elem(o, "name", comm[:name_fr], language: "fr")
+          add_noko_elem(o, "abbreviation", comm[:abbr])
+          add_noko_elem(o, "identifier", comm[:ident])
         end
       end
 
@@ -68,11 +66,11 @@ module Metanorma
       def relation_supersedes_self1(xml, date, edition, draft)
         xml.relation type: "supersedes" do |r|
           r.bibitem do |b|
-            date and b.date(date,
-                            type: edition ? "published" : "circulated")
-            edition and b.edition edition
+            add_noko_elem(b, "date", date,
+                          type: edition ? "published" : "circulated")
+            add_noko_elem(b, "edition", edition)
             draft and b.version do |v|
-              v.draft draft
+              add_noko_elem(v, "draft", draft)
             end
           end
         end
@@ -85,7 +83,7 @@ module Metanorma
           role = "editor"
         end
         xml.role type: role.downcase do |d|
-          d << desc
+          d << desc # can be empty
         end
       end
 

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.3 -->
+<!-- VERSION v2.1.5 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -905,15 +905,32 @@ titlecase, or lowercase</a:documentation>
     </element>
   </define>
   <define name="image" combine="choice">
-    <element name="svg">
-      <a:documentation>Add svg mark up to image</a:documentation>
-      <oneOrMore>
-        <choice>
-          <text/>
-          <ref name="AnyElement"/>
-        </choice>
-      </oneOrMore>
-    </element>
+    <choice>
+      <element name="image">
+        <ref name="RequiredId"/>
+        <ref name="ImageAttributes"/>
+        <optional>
+          <element name="svg">
+            <a:documentation>Allow svg in image/svg, for consistency</a:documentation>
+            <oneOrMore>
+              <choice>
+                <text/>
+                <ref name="AnyElement"/>
+              </choice>
+            </oneOrMore>
+          </element>
+        </optional>
+      </element>
+      <element name="svg">
+        <a:documentation>Add svg mark up to image</a:documentation>
+        <oneOrMore>
+          <choice>
+            <text/>
+            <ref name="AnyElement"/>
+          </choice>
+        </oneOrMore>
+      </element>
+    </choice>
   </define>
   <define name="ParagraphFnBody" combine="interleave">
     <ref name="BlockSource">

data/lib/metanorma/bipm/log.rb

@@ -5,7 +5,11 @@ module Metanorma
         # rubocop:disable Naming/VariableNumber
         "BIPM_1": { category: "Document Attributes",
                     error: "%s is not a recognised committee",
-                    severity: 2 },
+                    severity: 1 },
+
+        "BIPM_2": { category: "Document Attributes",
+                    error: "%s is not a recognised si-aspect",
+                    severity: 1 },
       }.freeze
       # rubocop:enable Naming/VariableNumber
 

data/lib/metanorma/bipm/validate.rb

@@ -0,0 +1,63 @@
+module Metanorma
+  module Bipm
+    class Converter < Metanorma::Generic::Converter
+      COMMITTEE_XPATH =
+        "//bibdata/contributor[role/description = 'committee']/organization/" \
+        "subdivision[@type = 'Committee']".freeze
+
+      def committee_validate(xml)
+        committees = committees_list or return
+        xml.xpath("#{COMMITTEE_XPATH}/name").each do |c|
+          committees.include? c.text or
+            @log.add("BIPM_1", nil, params: [c.text])
+        end
+        xml.xpath("#{COMMITTEE_XPATH}/identifier[not(@type = 'full')]")
+          .each do |c|
+          committees.include? c.text or
+            @log.add("BIPM_1", nil, params: [c.text])
+        end
+      end
+
+      def committees_list
+        committees = Array(configuration&.committees) or return
+        committees.empty? and return
+        committees
+      end
+
+      def bibdata_validate(doc)
+        super
+        si_aspect_validate(doc)
+      end
+
+      SI_ASPECT_VALUES = %w(
+        A_e_deltanu
+        A_e
+        cd_Kcd_h_deltanu
+        cd_Kcd
+        full
+        K_k_deltanu_h
+        K_k
+        kg_h_c_deltanu
+        kg_h
+        m_c_deltanu
+        m_c
+        mol_NA
+        units_A
+        units_cd
+        units_full
+        units_K
+        units_kg
+        units_m
+        units_mol
+        units_s
+      ).freeze
+
+      def si_aspect_validate(doc)
+        doc.xpath("//bibdata/ext/si-aspect").each do |x|
+          SI_ASPECT_VALUES.include?(x.text) or
+            @log.add("BIPM_2", nil, params: [x.text])
+        end
+      end
+    end
+  end
+end

data/lib/metanorma/bipm/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Bipm
-    VERSION = "2.7.8".freeze
+    VERSION = "2.7.10".freeze
   end
 end

data/metanorma.yml

@@ -10,7 +10,6 @@ html_bodyfont: Times New Roman
 html_headerfont: Times New Roman
 html_normalfontsize: "15px"
 html_footnotefontsize: "0.9em"
-logo_path: lib/isodoc/bipm/html/logo.png
 i18nyaml: 
   en: lib/isodoc/bipm/i18n-en.yaml
   fr: lib/isodoc/bipm/i18n-fr.yaml

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-bipm
 version: !ruby/object:Gem::Version
-  version: 2.7.8
+  version: 2.7.10
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-11-03 00:00:00.000000000 Z
+date: 2025-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic
@@ -262,19 +262,42 @@ files:
 - lib/isodoc/bipm/html/htmlstyle.css
 - lib/isodoc/bipm/html/htmlstyle.scss
 - lib/isodoc/bipm/html/logo.png
-- lib/isodoc/bipm/html/si-aspect/A_e.png
-- lib/isodoc/bipm/html/si-aspect/A_e_deltanu.png
-- lib/isodoc/bipm/html/si-aspect/K_k.png
-- lib/isodoc/bipm/html/si-aspect/K_k_deltanu_h.png
-- lib/isodoc/bipm/html/si-aspect/cd_Kcd.png
-- lib/isodoc/bipm/html/si-aspect/cd_Kcd_h_deltanu.png
-- lib/isodoc/bipm/html/si-aspect/full.png
-- lib/isodoc/bipm/html/si-aspect/kg_h.png
-- lib/isodoc/bipm/html/si-aspect/kg_h_c_deltanu.png
-- lib/isodoc/bipm/html/si-aspect/m_c.png
-- lib/isodoc/bipm/html/si-aspect/m_c_deltanu.png
-- lib/isodoc/bipm/html/si-aspect/mol_NA.png
-- lib/isodoc/bipm/html/si-aspect/s_deltanu.png
+- lib/isodoc/bipm/html/logo/bipm-logo_bipm.svg
+- lib/isodoc/bipm/html/logo/bipm-logo_ccauv.svg
+- lib/isodoc/bipm/html/logo/bipm-logo_ccem.svg
+- lib/isodoc/bipm/html/logo/bipm-logo_ccl.svg
+- lib/isodoc/bipm/html/logo/bipm-logo_ccm.svg
+- lib/isodoc/bipm/html/logo/bipm-logo_ccpr.svg
+- lib/isodoc/bipm/html/logo/bipm-logo_ccqm.svg
+- lib/isodoc/bipm/html/logo/bipm-logo_ccri.svg
+- lib/isodoc/bipm/html/logo/bipm-logo_cct.svg
+- lib/isodoc/bipm/html/logo/bipm-logo_cctf.svg
+- lib/isodoc/bipm/html/logo/bipm-logo_ccu.svg
+- lib/isodoc/bipm/html/logo/bipm-logo_cgpm.svg
+- lib/isodoc/bipm/html/logo/bipm-logo_cipm-mra.svg
+- lib/isodoc/bipm/html/logo/bipm-logo_full.svg
+- lib/isodoc/bipm/html/logo/bipm-logo_jcgm.svg
+- lib/isodoc/bipm/html/si-aspect/si-circle-constants_A_e.svg
+- lib/isodoc/bipm/html/si-aspect/si-circle-constants_A_e_deltanu.svg
+- lib/isodoc/bipm/html/si-aspect/si-circle-constants_K_k.svg
+- lib/isodoc/bipm/html/si-aspect/si-circle-constants_K_k_h_deltanu.svg
+- lib/isodoc/bipm/html/si-aspect/si-circle-constants_cd_Kcd.svg
+- lib/isodoc/bipm/html/si-aspect/si-circle-constants_cd_Kcd_h_deltanu.svg
+- lib/isodoc/bipm/html/si-aspect/si-circle-constants_full.svg
+- lib/isodoc/bipm/html/si-aspect/si-circle-constants_kg_h.svg
+- lib/isodoc/bipm/html/si-aspect/si-circle-constants_kg_h_c_deltanu.svg
+- lib/isodoc/bipm/html/si-aspect/si-circle-constants_m_c.svg
+- lib/isodoc/bipm/html/si-aspect/si-circle-constants_m_c_deltanu.svg
+- lib/isodoc/bipm/html/si-aspect/si-circle-constants_mol_NA.svg
+- lib/isodoc/bipm/html/si-aspect/si-circle-constants_s_deltanu.svg
+- lib/isodoc/bipm/html/si-aspect/si-circle-units_a.svg
+- lib/isodoc/bipm/html/si-aspect/si-circle-units_cd.svg
+- lib/isodoc/bipm/html/si-aspect/si-circle-units_full.svg
+- lib/isodoc/bipm/html/si-aspect/si-circle-units_k.svg
+- lib/isodoc/bipm/html/si-aspect/si-circle-units_kg.svg
+- lib/isodoc/bipm/html/si-aspect/si-circle-units_m.svg
+- lib/isodoc/bipm/html/si-aspect/si-circle-units_mol.svg
+- lib/isodoc/bipm/html/si-aspect/si-circle-units_s.svg
 - lib/isodoc/bipm/html_convert.rb
 - lib/isodoc/bipm/i18n-en.yaml
 - lib/isodoc/bipm/i18n-fr.yaml
@@ -306,6 +329,7 @@ files:
 - lib/metanorma/bipm/processor.rb
 - lib/metanorma/bipm/relaton-bipm.rng
 - lib/metanorma/bipm/reqt.rng
+- lib/metanorma/bipm/validate.rb
 - lib/metanorma/bipm/version.rb
 - lib/relaton/render/citations.rb
 - lib/relaton/render/config.yml