metanorma-generic 2.6.1 → 2.6.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/lib/metanorma/generic/biblio.rng +52 -33
  3. data/lib/metanorma/generic/front.rb +2 -2
  4. data/lib/metanorma/generic/isodoc.rng +67 -55
  5. data/lib/metanorma/generic/version.rb +1 -1
  6. data/metanorma-generic.gemspec +1 -1
  7. metadata +4 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: a7612541a003eb57d929de7faf4085c0891dc7637f261f724ed018f6b076ee67
4
- data.tar.gz: 55800a7f42a8876ddc2023f098a0fd423789fda37a20a14a70ae8c6aaf8fc13c
3
+ metadata.gz: 557b8d4aa015e6861dd788a8d1c848edc78766e571fb1061df8287ea65c40c8f
4
+ data.tar.gz: f930dffa6c7d30eb779ca34bc0b5d33bed997aa07037d54a1502996186863b64
5
5
  SHA512:
6
- metadata.gz: 868f342383da431131e0040c524a5c90633e86f2460f4022adcfec3c1fbfc1595a80dbfbc7ff09765314c6e3a042dba4059bcea955a3577a45f06fc0e2ef6ddd
7
- data.tar.gz: 5e6dfcbdf3046b4052b42ed493a6ee58de158980beb00f1aee132c7d80dd623138f9af1858bceb73bbdfe6bd53514f5d0b84fff6959da5961e70d38564edbc00
6
+ metadata.gz: fed2468c1b067c5635002abe87ff034b6819b9dcddfa749e5bb3a0365f74ebbb1b30d04283137558e336df23e3c70edb80bbc040c047cbf7438224c7cb853929
7
+ data.tar.gz: 904b8076468b554b15fb60e0a50d62ae83522f5a0f5efbfe73dc4bc0cc726198f7daae141833e4cf029fde66413be5a1481f6354271b0ed12c27c0d669701496
data/lib/metanorma/generic/biblio.rng CHANGED
@@ -208,7 +208,9 @@
208
208
  </define>
209
209
  <define name="roledescription">
210
210
  <element name="description">
211
- <ref name="FormattedString"/>
211
+ <oneOrMore>
212
+ <ref name="TextElement"/>
213
+ </oneOrMore>
212
214
  </element>
213
215
  </define>
214
216
  <define name="person">
@@ -333,34 +335,39 @@
333
335
  </define>
334
336
  <define name="affiliationdescription">
335
337
  <element name="description">
336
- <ref name="FormattedString"/>
338
+ <oneOrMore>
339
+ <ref name="TextElement"/>
340
+ </oneOrMore>
337
341
  </element>
338
342
  </define>
339
343
  <define name="organization">
340
344
  <element name="organization">
341
- <oneOrMore>
342
- <ref name="orgname"/>
343
- </oneOrMore>
344
- <zeroOrMore>
345
- <ref name="subdivision"/>
346
- </zeroOrMore>
347
- <optional>
348
- <ref name="abbreviation"/>
349
- </optional>
350
- <zeroOrMore>
351
- <ref name="uri"/>
352
- </zeroOrMore>
353
- <zeroOrMore>
354
- <ref name="org-identifier"/>
355
- </zeroOrMore>
356
- <zeroOrMore>
357
- <ref name="contact"/>
358
- </zeroOrMore>
359
- <optional>
360
- <ref name="logo"/>
361
- </optional>
345
+ <ref name="OrganizationType"/>
362
346
  </element>
363
347
  </define>
348
+ <define name="OrganizationType">
349
+ <oneOrMore>
350
+ <ref name="orgname"/>
351
+ </oneOrMore>
352
+ <zeroOrMore>
353
+ <ref name="subdivision"/>
354
+ </zeroOrMore>
355
+ <optional>
356
+ <ref name="abbreviation"/>
357
+ </optional>
358
+ <zeroOrMore>
359
+ <ref name="uri"/>
360
+ </zeroOrMore>
361
+ <zeroOrMore>
362
+ <ref name="org-identifier"/>
363
+ </zeroOrMore>
364
+ <zeroOrMore>
365
+ <ref name="contact"/>
366
+ </zeroOrMore>
367
+ <optional>
368
+ <ref name="logo"/>
369
+ </optional>
370
+ </define>
364
371
  <define name="orgname">
365
372
  <element name="name">
366
373
  <choice>
@@ -371,10 +378,10 @@
371
378
  </define>
372
379
  <define name="subdivision">
373
380
  <element name="subdivision">
374
- <choice>
375
- <ref name="LocalizedString"/>
376
- <ref name="NameWithVariants"/>
377
- </choice>
381
+ <optional>
382
+ <attribute name="type"/>
383
+ </optional>
384
+ <ref name="OrganizationType"/>
378
385
  </element>
379
386
  </define>
380
387
  <define name="logo">
@@ -894,7 +901,9 @@
894
901
  </define>
895
902
  <define name="formattedref">
896
903
  <element name="formattedref">
897
- <ref name="FormattedString"/>
904
+ <oneOrMore>
905
+ <ref name="TextElement"/>
906
+ </oneOrMore>
898
907
  </element>
899
908
  </define>
900
909
  <define name="license">
@@ -939,7 +948,9 @@
939
948
  <optional>
940
949
  <attribute name="type"/>
941
950
  </optional>
942
- <ref name="FormattedString"/>
951
+ <zeroOrMore>
952
+ <ref name="TextElement"/>
953
+ </zeroOrMore>
943
954
  </define>
944
955
  <!-- TitleType = ( "alternative" | "original" | "unofficial" | "subtitle" | "main" ) -->
945
956
  <define name="TypedUri">
@@ -1039,7 +1050,9 @@
1039
1050
  <optional>
1040
1051
  <attribute name="script"/>
1041
1052
  </optional>
1042
- <text/>
1053
+ <oneOrMore>
1054
+ <ref name="TextElement"/>
1055
+ </oneOrMore>
1043
1056
  </element>
1044
1057
  </define>
1045
1058
  <define name="docnumber">
@@ -1264,12 +1277,16 @@
1264
1277
  <optional>
1265
1278
  <attribute name="type"/>
1266
1279
  </optional>
1267
- <ref name="FormattedString"/>
1280
+ <oneOrMore>
1281
+ <ref name="TextElement"/>
1282
+ </oneOrMore>
1268
1283
  </element>
1269
1284
  </define>
1270
1285
  <define name="bibabstract">
1271
1286
  <element name="abstract">
1272
- <ref name="FormattedString"/>
1287
+ <oneOrMore>
1288
+ <ref name="TextElement"/>
1289
+ </oneOrMore>
1273
1290
  </element>
1274
1291
  </define>
1275
1292
  <define name="copyright">
@@ -1374,7 +1391,9 @@
1374
1391
  </attribute>
1375
1392
  <optional>
1376
1393
  <element name="description">
1377
- <ref name="FormattedString"/>
1394
+ <oneOrMore>
1395
+ <ref name="TextElement"/>
1396
+ </oneOrMore>
1378
1397
  </element>
1379
1398
  </optional>
1380
1399
  <element name="bibitem">
data/lib/metanorma/generic/front.rb CHANGED
@@ -45,8 +45,8 @@ module Metanorma
45
45
  end
46
46
 
47
47
  def metadata_id(node, xml)
48
- xml.docidentifier type:
49
- configuration.organization_name_short do |i|
48
+ xml.docidentifier primary: "true",
49
+ type: configuration.organization_name_short do |i|
50
50
  i << (node.attr("docidentifier") || "")
51
51
  end
52
52
  end
data/lib/metanorma/generic/isodoc.rng CHANGED
@@ -156,44 +156,7 @@
156
156
  </define>
157
157
  <define name="xref">
158
158
  <element name="xref">
159
- <attribute name="target">
160
- <data type="string">
161
- <param name="pattern">\i\c*|\c+#\c+</param>
162
- </data>
163
- </attribute>
164
- <optional>
165
- <attribute name="to">
166
- <data type="string">
167
- <param name="pattern">\i\c*|\c+#\c+</param>
168
- </data>
169
- </attribute>
170
- </optional>
171
- <optional>
172
- <attribute name="type">
173
- <ref name="ReferenceFormat"/>
174
- </attribute>
175
- </optional>
176
- <optional>
177
- <attribute name="alt"/>
178
- </optional>
179
- <optional>
180
- <attribute name="case">
181
- <choice>
182
- <value>capital</value>
183
- <value>lowercase</value>
184
- </choice>
185
- </attribute>
186
- </optional>
187
- <optional>
188
- <attribute name="droploc">
189
- <data type="boolean"/>
190
- </attribute>
191
- </optional>
192
- <optional>
193
- <attribute name="style">
194
- <ref name="XrefStyleType"/>
195
- </attribute>
196
- </optional>
159
+ <ref name="XrefAttributes"/>
197
160
  <ref name="XrefBody"/>
198
161
  </element>
199
162
  </define>
@@ -407,23 +370,7 @@
407
370
  </define>
408
371
  <define name="figure">
409
372
  <element name="figure">
410
- <attribute name="id">
411
- <data type="ID"/>
412
- </attribute>
413
- <optional>
414
- <attribute name="unnumbered">
415
- <data type="boolean"/>
416
- </attribute>
417
- </optional>
418
- <optional>
419
- <attribute name="number"/>
420
- </optional>
421
- <optional>
422
- <attribute name="subsequence"/>
423
- </optional>
424
- <optional>
425
- <attribute name="class"/>
426
- </optional>
373
+ <ref name="FigureAttributes"/>
427
374
  <ref name="BlockAttributes"/>
428
375
  <optional>
429
376
  <ref name="tname"/>
@@ -2450,6 +2397,49 @@
2450
2397
  </zeroOrMore>
2451
2398
  </element>
2452
2399
  </define>
2400
+ <define name="XrefAttributes">
2401
+ <attribute name="target">
2402
+ <data type="string">
2403
+ <param name="pattern">\i\c*|\c+#\c+</param>
2404
+ </data>
2405
+ </attribute>
2406
+ <optional>
2407
+ <attribute name="to">
2408
+ <data type="string">
2409
+ <param name="pattern">\i\c*|\c+#\c+</param>
2410
+ </data>
2411
+ </attribute>
2412
+ </optional>
2413
+ <optional>
2414
+ <attribute name="type">
2415
+ <ref name="ReferenceFormat"/>
2416
+ </attribute>
2417
+ </optional>
2418
+ <optional>
2419
+ <attribute name="alt"/>
2420
+ </optional>
2421
+ <optional>
2422
+ <attribute name="case">
2423
+ <choice>
2424
+ <value>capital</value>
2425
+ <value>lowercase</value>
2426
+ </choice>
2427
+ </attribute>
2428
+ </optional>
2429
+ <optional>
2430
+ <attribute name="droploc">
2431
+ <data type="boolean"/>
2432
+ </attribute>
2433
+ </optional>
2434
+ <optional>
2435
+ <attribute name="style">
2436
+ <ref name="XrefStyleType"/>
2437
+ </attribute>
2438
+ </optional>
2439
+ <optional>
2440
+ <attribute name="label"/>
2441
+ </optional>
2442
+ </define>
2453
2443
  <define name="XrefBody">
2454
2444
  <zeroOrMore>
2455
2445
  <ref name="XrefTarget"/>
@@ -2528,6 +2518,28 @@
2528
2518
  <attribute name="columns"/>
2529
2519
  </optional>
2530
2520
  </define>
2521
+ <define name="FigureAttributes">
2522
+ <attribute name="id">
2523
+ <data type="ID"/>
2524
+ </attribute>
2525
+ <optional>
2526
+ <attribute name="unnumbered">
2527
+ <data type="boolean"/>
2528
+ </attribute>
2529
+ </optional>
2530
+ <optional>
2531
+ <attribute name="number"/>
2532
+ </optional>
2533
+ <optional>
2534
+ <attribute name="subsequence"/>
2535
+ </optional>
2536
+ <optional>
2537
+ <attribute name="class"/>
2538
+ </optional>
2539
+ <optional>
2540
+ <attribute name="width"/>
2541
+ </optional>
2542
+ </define>
2531
2543
  <start>
2532
2544
  <ref name="standard-document"/>
2533
2545
  </start>
data/lib/metanorma/generic/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Generic
3
- VERSION = "2.6.1".freeze
3
+ VERSION = "2.6.3".freeze
4
4
  end
5
5
  end
data/metanorma-generic.gemspec CHANGED
@@ -27,7 +27,7 @@ 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-standoc", "~> 2.8.2"
30
+ spec.add_dependency "metanorma-standoc", "~> 2.8.4"
31
31
 
32
32
  spec.add_development_dependency "debug"
33
33
  spec.add_development_dependency "equivalent-xml", "~> 0.6"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-generic
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.6.1
4
+ version: 2.6.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2024-02-19 00:00:00.000000000 Z
11
+ date: 2024-03-25 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: metanorma-standoc
@@ -16,14 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: 2.8.2
19
+ version: 2.8.4
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.8.2
26
+ version: 2.8.4
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: debug
29
29
  requirement: !ruby/object:Gem::Requirement