metanorma-bipm 2.3.7 → 2.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (14) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/bipm/bipm.brochure.xsl +4 -2
  3. data/lib/isodoc/bipm/bipm.guide.xsl +4 -2
  4. data/lib/isodoc/bipm/bipm.mise-en-pratique.xsl +4 -2
  5. data/lib/isodoc/bipm/bipm.rapport.xsl +4 -2
  6. data/lib/isodoc/bipm/jcgm.standard.xsl +4 -2
  7. data/lib/metanorma/bipm/basicdoc.rng +91 -8
  8. data/lib/metanorma/bipm/biblio-standoc.rng +44 -1
  9. data/lib/metanorma/bipm/biblio.rng +11 -0
  10. data/lib/metanorma/bipm/isodoc.rng +10 -64
  11. data/lib/metanorma/bipm/reqt.rng +0 -16
  12. data/lib/metanorma/bipm/version.rb +1 -1
  13. data/metanorma-bipm.gemspec +2 -2
  14. metadata +6 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 3efde48cdb3e580e92789087f7cbb878b58f8face4f6fa972b6af34b8bcfb57e
4
- data.tar.gz: b2e7a0d15f96128099232f07a32863f1b91857ec36e8fb954a9a254f60efdd5c
3
+ metadata.gz: f320e0d2132fbcd664dea1851ca3fec388a4b892bb2f74f374283f049d691d5f
4
+ data.tar.gz: c8bb33a5f87b4224b46ce54d5676ac15225e3a1f589c12ea7afd334936468906
5
5
  SHA512:
6
- metadata.gz: 16750477381a119c17d8dd7eee7a3897d155998541fe98a78de89e0f5b9260ca58f0987ed9880fece72b7859607d081d4fd81b776324796ecbc7e43d1ef03241
7
- data.tar.gz: ac8291cfa4397812692a770e1fd01dc325622becc1ce0da261969e9b059e1dfb5761bc2694c369af7a665e836692d9b67593208988ce1b8401fb628002c30ffb
6
+ metadata.gz: 5ee12050dce5ce527c0222c941095aca33ccc21552b52b140a60ff87444e38fac645eb58eca675d21693c33561d081d8e6b97c177cd97949a4c54fa59851a8fb
7
+ data.tar.gz: f6987b5587f022c0dc00c06bc9a1a98fbb80071a880690fd815d83881aab9d50e563c42f63867de1efa6014f1689ffb240e4d1866664d7d80b9489dbb37dcc84
data/lib/isodoc/bipm/bipm.brochure.xsl CHANGED
@@ -12484,14 +12484,16 @@
12484
12484
 
12485
12485
  <xsl:template match="*[local-name() = 'annex']">
12486
12486
  <fo:block break-after="page"/>
12487
- <fo:block id="{@id}">
12487
+ <fo:block>
12488
12488
 
12489
12489
  <xsl:call-template name="setBlockSpanAll"/>
12490
12490
 
12491
12491
  <xsl:call-template name="refine_annex_style"/>
12492
12492
 
12493
12493
  </fo:block>
12494
- <xsl:apply-templates/>
12494
+ <fo:block id="{@id}">
12495
+ <xsl:apply-templates/>
12496
+ </fo:block>
12495
12497
  </xsl:template>
12496
12498
 
12497
12499
  <xsl:template name="refine_annex_style">
data/lib/isodoc/bipm/bipm.guide.xsl CHANGED
@@ -12484,14 +12484,16 @@
12484
12484
 
12485
12485
  <xsl:template match="*[local-name() = 'annex']">
12486
12486
  <fo:block break-after="page"/>
12487
- <fo:block id="{@id}">
12487
+ <fo:block>
12488
12488
 
12489
12489
  <xsl:call-template name="setBlockSpanAll"/>
12490
12490
 
12491
12491
  <xsl:call-template name="refine_annex_style"/>
12492
12492
 
12493
12493
  </fo:block>
12494
- <xsl:apply-templates/>
12494
+ <fo:block id="{@id}">
12495
+ <xsl:apply-templates/>
12496
+ </fo:block>
12495
12497
  </xsl:template>
12496
12498
 
12497
12499
  <xsl:template name="refine_annex_style">
data/lib/isodoc/bipm/bipm.mise-en-pratique.xsl CHANGED
@@ -12484,14 +12484,16 @@
12484
12484
 
12485
12485
  <xsl:template match="*[local-name() = 'annex']">
12486
12486
  <fo:block break-after="page"/>
12487
- <fo:block id="{@id}">
12487
+ <fo:block>
12488
12488
 
12489
12489
  <xsl:call-template name="setBlockSpanAll"/>
12490
12490
 
12491
12491
  <xsl:call-template name="refine_annex_style"/>
12492
12492
 
12493
12493
  </fo:block>
12494
- <xsl:apply-templates/>
12494
+ <fo:block id="{@id}">
12495
+ <xsl:apply-templates/>
12496
+ </fo:block>
12495
12497
  </xsl:template>
12496
12498
 
12497
12499
  <xsl:template name="refine_annex_style">
data/lib/isodoc/bipm/bipm.rapport.xsl CHANGED
@@ -12484,14 +12484,16 @@
12484
12484
 
12485
12485
  <xsl:template match="*[local-name() = 'annex']">
12486
12486
  <fo:block break-after="page"/>
12487
- <fo:block id="{@id}">
12487
+ <fo:block>
12488
12488
 
12489
12489
  <xsl:call-template name="setBlockSpanAll"/>
12490
12490
 
12491
12491
  <xsl:call-template name="refine_annex_style"/>
12492
12492
 
12493
12493
  </fo:block>
12494
- <xsl:apply-templates/>
12494
+ <fo:block id="{@id}">
12495
+ <xsl:apply-templates/>
12496
+ </fo:block>
12495
12497
  </xsl:template>
12496
12498
 
12497
12499
  <xsl:template name="refine_annex_style">
data/lib/isodoc/bipm/jcgm.standard.xsl CHANGED
@@ -10294,14 +10294,16 @@
10294
10294
 
10295
10295
  <xsl:template match="*[local-name() = 'annex']">
10296
10296
  <fo:block break-after="page"/>
10297
- <fo:block id="{@id}">
10297
+ <fo:block>
10298
10298
 
10299
10299
  <xsl:call-template name="setBlockSpanAll"/>
10300
10300
 
10301
10301
  <xsl:call-template name="refine_annex_style"/>
10302
10302
 
10303
10303
  </fo:block>
10304
- <xsl:apply-templates/>
10304
+ <fo:block id="{@id}">
10305
+ <xsl:apply-templates/>
10306
+ </fo:block>
10305
10307
  </xsl:template>
10306
10308
 
10307
10309
  <xsl:template name="refine_annex_style">
data/lib/metanorma/bipm/basicdoc.rng CHANGED
@@ -95,8 +95,89 @@
95
95
  <ref name="pagebreak"/>
96
96
  <ref name="hr"/>
97
97
  <ref name="bookmark"/>
98
+ <ref name="amend"/>
98
99
  </choice>
99
100
  </define>
101
+ <define name="amend">
102
+ <element name="amend">
103
+ <ref name="AmendType"/>
104
+ </element>
105
+ </define>
106
+ <define name="AmendType">
107
+ <optional>
108
+ <attribute name="id">
109
+ <data type="ID"/>
110
+ </attribute>
111
+ </optional>
112
+ <attribute name="change">
113
+ <choice>
114
+ <value>add</value>
115
+ <value>modify</value>
116
+ <value>delete</value>
117
+ <value>replace</value>
118
+ </choice>
119
+ </attribute>
120
+ <optional>
121
+ <attribute name="path"/>
122
+ </optional>
123
+ <optional>
124
+ <attribute name="path_end"/>
125
+ </optional>
126
+ <optional>
127
+ <attribute name="title"/>
128
+ </optional>
129
+ <optional>
130
+ <element name="location">
131
+ <zeroOrMore>
132
+ <choice>
133
+ <ref name="locality"/>
134
+ <ref name="localityStack"/>
135
+ </choice>
136
+ </zeroOrMore>
137
+ </element>
138
+ </optional>
139
+ <optional>
140
+ <element name="description">
141
+ <zeroOrMore>
142
+ <ref name="BasicBlock"/>
143
+ </zeroOrMore>
144
+ </element>
145
+ </optional>
146
+ <optional>
147
+ <element name="newcontent">
148
+ <optional>
149
+ <attribute name="id">
150
+ <data type="ID"/>
151
+ </attribute>
152
+ </optional>
153
+ <zeroOrMore>
154
+ <ref name="BasicBlock"/>
155
+ </zeroOrMore>
156
+ </element>
157
+ </optional>
158
+ <zeroOrMore>
159
+ <ref name="classification"/>
160
+ </zeroOrMore>
161
+ <zeroOrMore>
162
+ <ref name="contributor"/>
163
+ </zeroOrMore>
164
+ </define>
165
+ <define name="classification">
166
+ <element name="classification">
167
+ <ref name="classification_tag"/>
168
+ <ref name="classification_value"/>
169
+ </element>
170
+ </define>
171
+ <define name="classification_tag">
172
+ <element name="tag">
173
+ <text/>
174
+ </element>
175
+ </define>
176
+ <define name="classification_value">
177
+ <element name="value">
178
+ <text/>
179
+ </element>
180
+ </define>
100
181
  <define name="paragraph">
101
182
  <element name="p">
102
183
  <ref name="ParagraphType"/>
@@ -939,18 +1020,12 @@
939
1020
  </optional>
940
1021
  <optional>
941
1022
  <attribute name="width">
942
- <choice>
943
- <data type="int"/>
944
- <value>auto</value>
945
- </choice>
1023
+ <ref name="ImageSize"/>
946
1024
  </attribute>
947
1025
  </optional>
948
1026
  <optional>
949
1027
  <attribute name="height">
950
- <choice>
951
- <data type="int"/>
952
- <value>auto</value>
953
- </choice>
1028
+ <ref name="ImageSize"/>
954
1029
  </attribute>
955
1030
  </optional>
956
1031
  <optional>
@@ -965,6 +1040,14 @@
965
1040
  </attribute>
966
1041
  </optional>
967
1042
  </define>
1043
+ <define name="ImageSize">
1044
+ <choice>
1045
+ <data type="string">
1046
+ <param name="pattern">\d+([.]\d+)?(%?)</param>
1047
+ </data>
1048
+ <value>auto</value>
1049
+ </choice>
1050
+ </define>
968
1051
  <define name="video">
969
1052
  <element name="video">
970
1053
  <attribute name="id">
data/lib/metanorma/bipm/biblio-standoc.rng CHANGED
@@ -9,11 +9,42 @@
9
9
  -->
10
10
  <include href="biblio.rng">
11
11
  <define name="BibData">
12
- <ref name="BibliographicItem"/>
12
+ <ref name="StandardBibliographicItem"/>
13
13
  <optional>
14
14
  <ref name="ext"/>
15
15
  </optional>
16
16
  </define>
17
+ <define name="docrelation">
18
+ <element name="relation">
19
+ <attribute name="type">
20
+ <ref name="DocRelationType"/>
21
+ </attribute>
22
+ <optional>
23
+ <element name="description">
24
+ <ref name="FormattedString"/>
25
+ </element>
26
+ </optional>
27
+ <element name="bibitem">
28
+ <ref name="StandardReducedBibliographicItem"/>
29
+ </element>
30
+ <choice>
31
+ <zeroOrMore>
32
+ <ref name="locality"/>
33
+ </zeroOrMore>
34
+ <zeroOrMore>
35
+ <ref name="localityStack"/>
36
+ </zeroOrMore>
37
+ </choice>
38
+ <choice>
39
+ <zeroOrMore>
40
+ <ref name="sourceLocality"/>
41
+ </zeroOrMore>
42
+ <zeroOrMore>
43
+ <ref name="sourceLocalityStack"/>
44
+ </zeroOrMore>
45
+ </choice>
46
+ </element>
47
+ </define>
17
48
  </include>
18
49
  <define name="ext">
19
50
  <element name="ext">
@@ -161,4 +192,16 @@
161
192
  </optional>
162
193
  </element>
163
194
  </define>
195
+ <define name="StandardBibliographicItem">
196
+ <ref name="BibliographicItem"/>
197
+ <zeroOrMore>
198
+ <ref name="amend"/>
199
+ </zeroOrMore>
200
+ </define>
201
+ <define name="StandardReducedBibliographicItem">
202
+ <ref name="ReducedBibliographicItem"/>
203
+ <zeroOrMore>
204
+ <ref name="amend"/>
205
+ </zeroOrMore>
206
+ </define>
164
207
  </grammar>
data/lib/metanorma/bipm/biblio.rng CHANGED
@@ -241,6 +241,9 @@
241
241
  </element>
242
242
  </define>
243
243
  <define name="FullNameType">
244
+ <optional>
245
+ <ref name="name_abbreviation"/>
246
+ </optional>
244
247
  <choice>
245
248
  <group>
246
249
  <zeroOrMore>
@@ -266,6 +269,11 @@
266
269
  <ref name="variantname"/>
267
270
  </zeroOrMore>
268
271
  </define>
272
+ <define name="name_abbreviation">
273
+ <element name="abbreviation">
274
+ <ref name="LocalizedString"/>
275
+ </element>
276
+ </define>
269
277
  <define name="prefix">
270
278
  <element name="prefix">
271
279
  <ref name="LocalizedString"/>
@@ -870,6 +878,9 @@
870
878
  <optional>
871
879
  <ref name="validity"/>
872
880
  </optional>
881
+ <optional>
882
+ <ref name="depiction"/>
883
+ </optional>
873
884
  </define>
874
885
  <define name="btitle">
875
886
  <element name="title">
data/lib/metanorma/bipm/isodoc.rng CHANGED
@@ -17,10 +17,19 @@
17
17
  these elements; we just want one namespace for any child grammars
18
18
  of this.
19
19
  -->
20
- <!-- VERSION v1.2.9 -->
20
+ <!-- VERSION v1.2.12 -->
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">
24
+ <define name="amend">
25
+ <element name="amend">
26
+ <ref name="BlockAttributes"/>
27
+ <ref name="AmendType"/>
28
+ <zeroOrMore>
29
+ <ref name="autonumber"/>
30
+ </zeroOrMore>
31
+ </element>
32
+ </define>
24
33
  <define name="admonition">
25
34
  <element name="admonition">
26
35
  <attribute name="type">
@@ -2319,69 +2328,6 @@
2319
2328
  <ref name="CitationType"/>
2320
2329
  </element>
2321
2330
  </define>
2322
- <define name="amend">
2323
- <element name="amend">
2324
- <optional>
2325
- <attribute name="id">
2326
- <data type="ID"/>
2327
- </attribute>
2328
- </optional>
2329
- <attribute name="change">
2330
- <choice>
2331
- <value>add</value>
2332
- <value>modify</value>
2333
- <value>delete</value>
2334
- <value>replace</value>
2335
- </choice>
2336
- </attribute>
2337
- <optional>
2338
- <attribute name="path"/>
2339
- </optional>
2340
- <optional>
2341
- <attribute name="path_end"/>
2342
- </optional>
2343
- <optional>
2344
- <attribute name="title"/>
2345
- </optional>
2346
- <ref name="BlockAttributes"/>
2347
- <optional>
2348
- <element name="location">
2349
- <zeroOrMore>
2350
- <ref name="locality"/>
2351
- </zeroOrMore>
2352
- </element>
2353
- </optional>
2354
- <zeroOrMore>
2355
- <ref name="autonumber"/>
2356
- </zeroOrMore>
2357
- <optional>
2358
- <element name="description">
2359
- <zeroOrMore>
2360
- <ref name="BasicBlock"/>
2361
- </zeroOrMore>
2362
- </element>
2363
- </optional>
2364
- <optional>
2365
- <element name="newcontent">
2366
- <optional>
2367
- <attribute name="id">
2368
- <data type="ID"/>
2369
- </attribute>
2370
- </optional>
2371
- <zeroOrMore>
2372
- <ref name="BasicBlock"/>
2373
- </zeroOrMore>
2374
- </element>
2375
- </optional>
2376
- <optional>
2377
- <element name="description">
2378
- <zeroOrMore>
2379
- <ref name="BasicBlock"/>
2380
- </zeroOrMore>
2381
- </element>
2382
- </optional>
2383
- </element>
2384
- </define>
2385
2331
  <define name="autonumber">
2386
2332
  <element name="autonumber">
2387
2333
  <attribute name="type">
data/lib/metanorma/bipm/reqt.rng CHANGED
@@ -207,20 +207,4 @@
207
207
  <value>permission</value>
208
208
  </choice>
209
209
  </define>
210
- <define name="classification">
211
- <element name="classification">
212
- <ref name="classification_tag"/>
213
- <ref name="classification_value"/>
214
- </element>
215
- </define>
216
- <define name="classification_tag">
217
- <element name="tag">
218
- <text/>
219
- </element>
220
- </define>
221
- <define name="classification_value">
222
- <element name="value">
223
- <text/>
224
- </element>
225
- </define>
226
210
  </grammar>
data/lib/metanorma/bipm/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module BIPM
3
- VERSION = "2.3.7".freeze
3
+ VERSION = "2.4.0".freeze
4
4
  end
5
5
  end
data/metanorma-bipm.gemspec CHANGED
@@ -27,8 +27,8 @@ Gem::Specification.new do |spec|
27
27
  spec.require_paths = ["lib"]
28
28
  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
29
29
 
30
- spec.add_dependency "metanorma-generic", "~> 2.5.4"
31
- spec.add_dependency "metanorma-iso", "~> 2.6.0"
30
+ spec.add_dependency "metanorma-generic", "~> 2.6.0"
31
+ spec.add_dependency "metanorma-iso", "~> 2.7.0"
32
32
 
33
33
  spec.add_development_dependency "debug"
34
34
  spec.add_development_dependency "equivalent-xml", "~> 0.6"
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.7
4
+ version: 2.4.0
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-12-22 00:00:00.000000000 Z
11
+ date: 2024-01-09 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: metanorma-generic
@@ -16,28 +16,28 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: 2.5.4
19
+ version: 2.6.0
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: 2.5.4
26
+ version: 2.6.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: metanorma-iso
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: 2.6.0
33
+ version: 2.7.0
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
- version: 2.6.0
40
+ version: 2.7.0
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: debug
43
43
  requirement: !ruby/object:Gem::Requirement