metanorma-bipm 2.3.3 → 2.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e86acd17d4afc8d0c5e82dc6b17926a1eb108ff43c034db565986d71f5449b1
-  data.tar.gz: 96696fbe1571b1d1ae037615521cbbfd5ae3ca9ef14a0c2c9e5c76eac16246d8
+  metadata.gz: cdee6da354fab10d4a63ffc5fde9a96d861a03f79143b116fa70ff13533db52c
+  data.tar.gz: 7f017530163e46bcfd22fd01674143cacb1e3f836f9802a868457b21de856ba7
 SHA512:
-  metadata.gz: 63638c49a461cc643e9fdf7c1078b352f684b2f5bc15fbcde9c6568bef6c25df1bdb93d1f5e2f2cba8a919d89f00dcf1826983f049b738c4fde9ab6b593df451
-  data.tar.gz: 2f92c603f71569b59fc4157f5ae22ef8e3d3b6191d6852f2c9b514f853431ba54827388ba506b2c44fce3068ac31de3d8a88cebdb441fb2ef663b1bf7c03bb3f
+  metadata.gz: 7ba6f99f9f9e0704a5cef0407ebb623123227e81a10b235eb115e21470e6d8267064a7a2ccd8913fd1a847cbeb637f2cfb66dd28b126dbf9cade2e278da7e67d
+  data.tar.gz: cc9d900ea1a7d0914a8297dc7ebc8ca5a6efef5895af93c79a75c1a4513359bc468142e4f81f7e72ccca700544c087b4127d566836f1f114b258bd7287c9b77f

data/Gemfile

@@ -4,8 +4,12 @@ Encoding.default_internal = Encoding::UTF_8
 source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}" }
 
-gemspec
+group :development, :test do
+  gem "rspec"
+end
 
 if File.exist? "Gemfile.devel"
   eval File.read("Gemfile.devel"), nil, "Gemfile.devel" # rubocop:disable Security/Eval
 end
+
+gemspec

data/lib/isodoc/bipm/xref.rb

@@ -213,11 +213,11 @@ module IsoDoc
         l10n("<strong>#{@annexlbl} #{num}</strong>")
       end
 
-      def sequential_formula_names(clause)
+      def sequential_formula_names(clause, container: false)
         c = Counter.new
         clause.xpath(ns(".//formula")).noblank.each do |t|
           @anchors[t["id"]] = anchor_struct(
-            c.increment(t).print, nil,
+            c.increment(t).print, container ? t : nil,
             t["inequality"] ? @labels["inequality"] : @labels["formula"],
             "formula", t["unnumbered"]
           )
@@ -232,9 +232,9 @@ module IsoDoc
         end
       end
 
-      def sequential_figure_names(clause)
+      def sequential_figure_names(clause, container: false)
         @jcgm or return super
-        @iso.sequential_figure_names(clause)
+        @iso.sequential_figure_names(clause, container: container)
         @anchors.merge!(@iso.get)
       end
 

data/lib/metanorma/bipm/biblio.rng

@@ -374,6 +374,16 @@
       <ref name="image"/>
     </element>
   </define>
+  <define name="depiction">
+    <element name="depiction">
+      <optional>
+        <attribute name="scope"/>
+      </optional>
+      <zeroOrMore>
+        <ref name="image"/>
+      </zeroOrMore>
+    </element>
+  </define>
   <define name="NameWithVariants">
     <element name="primary">
       <ref name="LocalizedString"/>
@@ -760,6 +770,9 @@
     <optional>
       <ref name="validity"/>
     </optional>
+    <optional>
+      <ref name="depiction"/>
+    </optional>
   </define>
   <define name="ReducedBibliographicItem">
     <optional>

data/lib/metanorma/bipm/front.rb

@@ -85,7 +85,9 @@ module Metanorma
           desc = role
           role = "editor"
         end
-        xml.role desc, type: role.downcase
+        xml.role type: role.downcase do |d|
+          d << desc
+        end
       end
 
       def title(node, xml)

data/lib/metanorma/bipm/isodoc.rng

@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.2.8 -->
+<!-- VERSION v1.2.9 -->
 <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">
   <include href="reqt.rng"/>
   <include href="basicdoc.rng">
@@ -1958,6 +1958,16 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="type">
+          <choice>
+            <value>letter</value>
+            <value>symbol</value>
+            <value>formula</value>
+            <value>equation</value>
+          </choice>
+        </attribute>
+      </optional>
       <element name="name">
         <oneOrMore>
           <choice>

data/lib/metanorma/bipm/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module BIPM
-    VERSION = "2.3.3".freeze
+    VERSION = "2.3.5".freeze
   end
 end

data/metanorma-bipm.gemspec

@@ -27,8 +27,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
-  spec.add_dependency "metanorma-generic", "~> 2.5.3"
-  spec.add_dependency "metanorma-iso", "~> 2.5.4"
+  spec.add_dependency "metanorma-generic", "~> 2.5.4"
+  spec.add_dependency "metanorma-iso", "~> 2.6.0"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-bipm
 version: !ruby/object:Gem::Version
-  version: 2.3.3
+  version: 2.3.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-11-20 00:00:00.000000000 Z
+date: 2023-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.3
+        version: 2.5.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.3
+        version: 2.5.4
 - !ruby/object:Gem::Dependency
   name: metanorma-iso
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.4
+        version: 2.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.4
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement