metanorma-bipm 2.3.4 → 2.3.5

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 49a2de0fbaf23045e9ce9213dd23ac50fcfeca32013bea91585531c4c30ba422
4
- data.tar.gz: 2ded97694aac9ff9b8f9a2dc045c4e6cc1ad5206b8aa0c004ccb0b4ff446cf20
3
+ metadata.gz: cdee6da354fab10d4a63ffc5fde9a96d861a03f79143b116fa70ff13533db52c
4
+ data.tar.gz: 7f017530163e46bcfd22fd01674143cacb1e3f836f9802a868457b21de856ba7
5
5
  SHA512:
6
- metadata.gz: bdf6b536298d7990aa834d73824801f80f68280408f6a4b6ae0a1555b7976784a2da345d68452c7618e0c5703c827b7279bdecf5fd2aca2024053cd73f43cff5
7
- data.tar.gz: 6ca8f857941657d15b2e129598f6993da8a5dc5987fa04f5c0e4cbd0a55d2a97421015057b10cdace2a7ebc89c508982a3256d81618a2b22128072b499050c39
6
+ metadata.gz: 7ba6f99f9f9e0704a5cef0407ebb623123227e81a10b235eb115e21470e6d8267064a7a2ccd8913fd1a847cbeb637f2cfb66dd28b126dbf9cade2e278da7e67d
7
+ data.tar.gz: cc9d900ea1a7d0914a8297dc7ebc8ca5a6efef5895af93c79a75c1a4513359bc468142e4f81f7e72ccca700544c087b4127d566836f1f114b258bd7287c9b77f
@@ -213,11 +213,11 @@ module IsoDoc
213
213
  l10n("<strong>#{@annexlbl} #{num}</strong>")
214
214
  end
215
215
 
216
- def sequential_formula_names(clause)
216
+ def sequential_formula_names(clause, container: false)
217
217
  c = Counter.new
218
218
  clause.xpath(ns(".//formula")).noblank.each do |t|
219
219
  @anchors[t["id"]] = anchor_struct(
220
- c.increment(t).print, nil,
220
+ c.increment(t).print, container ? t : nil,
221
221
  t["inequality"] ? @labels["inequality"] : @labels["formula"],
222
222
  "formula", t["unnumbered"]
223
223
  )
@@ -232,9 +232,9 @@ module IsoDoc
232
232
  end
233
233
  end
234
234
 
235
- def sequential_figure_names(clause)
235
+ def sequential_figure_names(clause, container: false)
236
236
  @jcgm or return super
237
- @iso.sequential_figure_names(clause)
237
+ @iso.sequential_figure_names(clause, container: container)
238
238
  @anchors.merge!(@iso.get)
239
239
  end
240
240
 
@@ -374,6 +374,16 @@
374
374
  <ref name="image"/>
375
375
  </element>
376
376
  </define>
377
+ <define name="depiction">
378
+ <element name="depiction">
379
+ <optional>
380
+ <attribute name="scope"/>
381
+ </optional>
382
+ <zeroOrMore>
383
+ <ref name="image"/>
384
+ </zeroOrMore>
385
+ </element>
386
+ </define>
377
387
  <define name="NameWithVariants">
378
388
  <element name="primary">
379
389
  <ref name="LocalizedString"/>
@@ -760,6 +770,9 @@
760
770
  <optional>
761
771
  <ref name="validity"/>
762
772
  </optional>
773
+ <optional>
774
+ <ref name="depiction"/>
775
+ </optional>
763
776
  </define>
764
777
  <define name="ReducedBibliographicItem">
765
778
  <optional>
@@ -17,7 +17,7 @@
17
17
  these elements; we just want one namespace for any child grammars
18
18
  of this.
19
19
  -->
20
- <!-- VERSION v1.2.8 -->
20
+ <!-- VERSION v1.2.9 -->
21
21
  <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">
22
22
  <include href="reqt.rng"/>
23
23
  <include href="basicdoc.rng">
@@ -1958,6 +1958,16 @@
1958
1958
  <data type="boolean"/>
1959
1959
  </attribute>
1960
1960
  </optional>
1961
+ <optional>
1962
+ <attribute name="type">
1963
+ <choice>
1964
+ <value>letter</value>
1965
+ <value>symbol</value>
1966
+ <value>formula</value>
1967
+ <value>equation</value>
1968
+ </choice>
1969
+ </attribute>
1970
+ </optional>
1961
1971
  <element name="name">
1962
1972
  <oneOrMore>
1963
1973
  <choice>
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module BIPM
3
- VERSION = "2.3.4".freeze
3
+ VERSION = "2.3.5".freeze
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-bipm
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.3.4
4
+ version: 2.3.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2023-11-27 00:00:00.000000000 Z
11
+ date: 2023-12-10 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: metanorma-generic