metanorma-iso 2.2.1 → 2.2.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (29) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/automerge.yml +31 -0
  3. data/lib/isodoc/iso/html/style-human.css +1 -1
  4. data/lib/isodoc/iso/html/style-iso.css +1 -1
  5. data/lib/isodoc/iso/i18n-en.yaml +9 -4
  6. data/lib/isodoc/iso/i18n-fr.yaml +9 -3
  7. data/lib/isodoc/iso/i18n-ru.yaml +9 -2
  8. data/lib/isodoc/iso/i18n-zh-Hans.yaml +1 -2
  9. data/lib/isodoc/iso/iso.amendment.xsl +21 -3
  10. data/lib/isodoc/iso/iso.international-standard.xsl +21 -3
  11. data/lib/isodoc/iso/presentation_xref.rb +10 -7
  12. data/lib/isodoc/iso/sections.rb +1 -1
  13. data/lib/metanorma/iso/basicdoc.rng +0 -27
  14. data/lib/metanorma/iso/biblio-standoc.rng +164 -0
  15. data/lib/metanorma/iso/biblio.rng +45 -18
  16. data/lib/metanorma/iso/isodoc.rng +22 -194
  17. data/lib/metanorma/iso/isostandard-amd.rng +3 -54
  18. data/lib/metanorma/iso/isostandard-compile.rng +7 -0
  19. data/lib/metanorma/iso/isostandard.rng +1 -195
  20. data/lib/metanorma/iso/relaton-iso.rng +225 -0
  21. data/lib/metanorma/iso/validate.rb +6 -6
  22. data/lib/metanorma/iso/version.rb +1 -1
  23. data/lib/metanorma/requirements/modspec.rb +22 -38
  24. data/spec/isodoc/inline_spec.rb +1 -1
  25. data/spec/metanorma/validate_spec.rb +55 -55
  26. data/spec/requirements/requirement_components_spec.rb +51 -63
  27. data/spec/requirements/requirements_spec.rb +177 -262
  28. data/spec/vcr_cassettes/withdrawn_iso.yml +29 -29
  29. metadata +6 -2
data/lib/metanorma/iso/isodoc.rng CHANGED
@@ -19,19 +19,7 @@
19
19
  -->
20
20
  <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">
21
21
  <include href="reqt.rng"/>
22
- <!-- include "biblio.rnc" { } -->
23
22
  <include href="basicdoc.rng">
24
- <start>
25
- <ref name="standard-document"/>
26
- </start>
27
- <define name="doctype">
28
- <element name="doctype">
29
- <optional>
30
- <attribute name="abbreviation"/>
31
- </optional>
32
- <ref name="DocumentType"/>
33
- </element>
34
- </define>
35
23
  <define name="admonition">
36
24
  <element name="admonition">
37
25
  <attribute name="type">
@@ -117,24 +105,6 @@
117
105
  </optional>
118
106
  </element>
119
107
  </define>
120
- <define name="bibitem">
121
- <element name="bibitem">
122
- <attribute name="id">
123
- <data type="ID"/>
124
- </attribute>
125
- <optional>
126
- <attribute name="hidden">
127
- <data type="boolean"/>
128
- </attribute>
129
- </optional>
130
- <optional>
131
- <attribute name="suppress_identifier">
132
- <data type="boolean"/>
133
- </attribute>
134
- </optional>
135
- <ref name="BibliographicItem"/>
136
- </element>
137
- </define>
138
108
  <define name="section-title">
139
109
  <element name="title">
140
110
  <zeroOrMore>
@@ -248,42 +218,6 @@
248
218
  <ref name="PureTextElement"/>
249
219
  </oneOrMore>
250
220
  </define>
251
- <define name="localityStack">
252
- <element name="localityStack">
253
- <optional>
254
- <attribute name="connective">
255
- <choice>
256
- <value>and</value>
257
- <value>or</value>
258
- <value>from</value>
259
- <value>to</value>
260
- <value/>
261
- </choice>
262
- </attribute>
263
- </optional>
264
- <zeroOrMore>
265
- <ref name="locality"/>
266
- </zeroOrMore>
267
- </element>
268
- </define>
269
- <define name="sourceLocalityStack">
270
- <element name="sourceLocalityStack">
271
- <optional>
272
- <attribute name="connective">
273
- <choice>
274
- <value>and</value>
275
- <value>or</value>
276
- <value>from</value>
277
- <value>to</value>
278
- <value/>
279
- </choice>
280
- </attribute>
281
- </optional>
282
- <zeroOrMore>
283
- <ref name="sourceLocality"/>
284
- </zeroOrMore>
285
- </element>
286
- </define>
287
221
  <define name="ul">
288
222
  <element name="ul">
289
223
  <attribute name="id">
@@ -827,21 +761,6 @@
827
761
  </zeroOrMore>
828
762
  </element>
829
763
  </define>
830
- <define name="BibDataExtensionType">
831
- <ref name="doctype"/>
832
- <optional>
833
- <ref name="docsubtype"/>
834
- </optional>
835
- <optional>
836
- <ref name="editorialgroup"/>
837
- </optional>
838
- <zeroOrMore>
839
- <ref name="ics"/>
840
- </zeroOrMore>
841
- <zeroOrMore>
842
- <ref name="structuredidentifier"/>
843
- </zeroOrMore>
844
- </define>
845
764
  <!-- TitleType = text -->
846
765
  <define name="sections">
847
766
  <element name="sections">
@@ -881,7 +800,7 @@
881
800
  <ref name="BasicBlock"/>
882
801
  </zeroOrMore>
883
802
  <zeroOrMore>
884
- <ref name="bibitem"/>
803
+ <ref name="doc_bibitem"/>
885
804
  <zeroOrMore>
886
805
  <ref name="note"/>
887
806
  </zeroOrMore>
@@ -1219,6 +1138,24 @@
1219
1138
  </define>
1220
1139
  </include>
1221
1140
  <!-- end overrides -->
1141
+ <define name="doc_bibitem">
1142
+ <element name="bibitem">
1143
+ <attribute name="id">
1144
+ <data type="ID"/>
1145
+ </attribute>
1146
+ <optional>
1147
+ <attribute name="hidden">
1148
+ <data type="boolean"/>
1149
+ </attribute>
1150
+ </optional>
1151
+ <optional>
1152
+ <attribute name="suppress_identifier">
1153
+ <data type="boolean"/>
1154
+ </attribute>
1155
+ </optional>
1156
+ <ref name="BibliographicItem"/>
1157
+ </element>
1158
+ </define>
1222
1159
  <define name="image" combine="choice">
1223
1160
  <element name="svg">
1224
1161
  <oneOrMore>
@@ -1237,14 +1174,6 @@
1237
1174
  <value>tag</value>
1238
1175
  </choice>
1239
1176
  </define>
1240
- <define name="docsubtype">
1241
- <element name="subdoctype">
1242
- <ref name="DocumentSubtype"/>
1243
- </element>
1244
- </define>
1245
- <define name="DocumentSubtype">
1246
- <text/>
1247
- </define>
1248
1177
  <define name="colgroup">
1249
1178
  <element name="colgroup">
1250
1179
  <oneOrMore>
@@ -1606,45 +1535,6 @@
1606
1535
  </choice>
1607
1536
  </element>
1608
1537
  </define>
1609
- <define name="editorialgroup">
1610
- <element name="editorialgroup">
1611
- <oneOrMore>
1612
- <ref name="technical-committee"/>
1613
- </oneOrMore>
1614
- </element>
1615
- </define>
1616
- <define name="technical-committee">
1617
- <element name="technical-committee">
1618
- <ref name="IsoWorkgroup"/>
1619
- </element>
1620
- </define>
1621
- <define name="IsoWorkgroup">
1622
- <optional>
1623
- <attribute name="number"/>
1624
- </optional>
1625
- <optional>
1626
- <attribute name="type"/>
1627
- </optional>
1628
- <optional>
1629
- <attribute name="identifier"/>
1630
- </optional>
1631
- <optional>
1632
- <attribute name="prefix"/>
1633
- </optional>
1634
- <text/>
1635
- </define>
1636
- <define name="ics">
1637
- <element name="ics">
1638
- <element name="code">
1639
- <text/>
1640
- </element>
1641
- <optional>
1642
- <element name="text">
1643
- <text/>
1644
- </element>
1645
- </optional>
1646
- </element>
1647
- </define>
1648
1538
  <define name="standard-document">
1649
1539
  <element name="standard-document">
1650
1540
  <attribute name="version"/>
@@ -2475,71 +2365,6 @@
2475
2365
  </optional>
2476
2366
  </element>
2477
2367
  </define>
2478
- <define name="structuredidentifier">
2479
- <element name="structuredidentifier">
2480
- <optional>
2481
- <attribute name="type"/>
2482
- </optional>
2483
- <oneOrMore>
2484
- <element name="agency">
2485
- <text/>
2486
- </element>
2487
- </oneOrMore>
2488
- <optional>
2489
- <element name="class">
2490
- <text/>
2491
- </element>
2492
- </optional>
2493
- <element name="docnumber">
2494
- <text/>
2495
- </element>
2496
- <optional>
2497
- <element name="partnumber">
2498
- <text/>
2499
- </element>
2500
- </optional>
2501
- <optional>
2502
- <element name="edition">
2503
- <text/>
2504
- </element>
2505
- </optional>
2506
- <optional>
2507
- <element name="version">
2508
- <text/>
2509
- </element>
2510
- </optional>
2511
- <optional>
2512
- <element name="supplementtype">
2513
- <text/>
2514
- </element>
2515
- </optional>
2516
- <optional>
2517
- <element name="supplementnumber">
2518
- <text/>
2519
- </element>
2520
- </optional>
2521
- <optional>
2522
- <element name="amendment">
2523
- <text/>
2524
- </element>
2525
- </optional>
2526
- <optional>
2527
- <element name="corrigendum">
2528
- <text/>
2529
- </element>
2530
- </optional>
2531
- <optional>
2532
- <element name="language">
2533
- <text/>
2534
- </element>
2535
- </optional>
2536
- <optional>
2537
- <element name="year">
2538
- <text/>
2539
- </element>
2540
- </optional>
2541
- </element>
2542
- </define>
2543
2368
  <define name="term-clause">
2544
2369
  <element name="clause">
2545
2370
  <optional>
@@ -2813,4 +2638,7 @@
2813
2638
  </attribute>
2814
2639
  </element>
2815
2640
  </define>
2641
+ <start>
2642
+ <ref name="standard-document"/>
2643
+ </start>
2816
2644
  </grammar>
data/lib/metanorma/iso/isostandard-amd.rng CHANGED
@@ -1,6 +1,7 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
- <grammar ns="https://www.metanorma.org/ns/iso" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
2
+ <grammar ns="https://www.metanorma.org/ns/iso" xmlns="http://relaxng.org/ns/structure/1.0">
3
3
  <!-- default namespace isostandard = "https://www.metanorma.com/ns/iso" -->
4
+ <include href="relaton-iso.rng"/>
4
5
  <include href="isostandard.rng">
5
6
  <start>
6
7
  <ref name="iso-standard"/>
@@ -51,58 +52,6 @@
51
52
  </oneOrMore>
52
53
  </element>
53
54
  </define>
54
- <define name="documentnumber">
55
- <element name="project-number">
56
- <optional>
57
- <attribute name="part">
58
- <data type="int"/>
59
- </attribute>
60
- </optional>
61
- <optional>
62
- <attribute name="subpart">
63
- <data type="int"/>
64
- </attribute>
65
- </optional>
66
- <optional>
67
- <attribute name="amendment">
68
- <data type="int"/>
69
- </attribute>
70
- </optional>
71
- <optional>
72
- <attribute name="corrigendum">
73
- <data type="int"/>
74
- </attribute>
75
- </optional>
76
- <optional>
77
- <attribute name="origyr">
78
- <ref name="ISO8601Date"/>
79
- </attribute>
80
- </optional>
81
- <text/>
82
- </element>
83
- </define>
84
- <define name="BibDataExtensionType">
85
- <ref name="doctype"/>
86
- <optional>
87
- <ref name="docsubtype"/>
88
- </optional>
89
- <ref name="editorialgroup"/>
90
- <zeroOrMore>
91
- <ref name="ics"/>
92
- </zeroOrMore>
93
- <ref name="structuredidentifier"/>
94
- <optional>
95
- <ref name="stagename"/>
96
- </optional>
97
- <optional>
98
- <ref name="updates_document_type"/>
99
- </optional>
100
- </define>
101
55
  </include>
102
- <!-- end overrides -->
103
- <define name="updates_document_type">
104
- <element name="updates-document-type">
105
- <ref name="DocumentType"/>
106
- </element>
107
- </define>
108
56
  </grammar>
57
+ <!-- end overrides -->
data/lib/metanorma/iso/isostandard-compile.rng ADDED
@@ -0,0 +1,7 @@
1
+ <?xml version="1.0" encoding="UTF-8"?>
2
+ <grammar ns="https://www.metanorma.org/ns/iso" xmlns="http://relaxng.org/ns/structure/1.0">
3
+ <!-- default namespace isostandard = "https://www.metanorma.com/ns/iso" -->
4
+ <include href="relaton-iso.rng"/>
5
+ <include href="isostandard.rng"/>
6
+ </grammar>
7
+ <!-- end overrides -->
data/lib/metanorma/iso/isostandard.rng CHANGED
@@ -1,90 +1,10 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
- <grammar ns="https://www.metanorma.org/ns/iso" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
2
+ <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
3
3
  <!-- default namespace isostandard = "https://www.metanorma.com/ns/iso" -->
4
4
  <include href="isodoc.rng">
5
5
  <start>
6
6
  <ref name="iso-standard"/>
7
7
  </start>
8
- <define name="organization">
9
- <element name="organization">
10
- <oneOrMore>
11
- <ref name="orgname"/>
12
- </oneOrMore>
13
- <optional>
14
- <ref name="abbreviation"/>
15
- </optional>
16
- <optional>
17
- <ref name="uri"/>
18
- </optional>
19
- <zeroOrMore>
20
- <ref name="org-identifier"/>
21
- </zeroOrMore>
22
- <zeroOrMore>
23
- <ref name="contact"/>
24
- </zeroOrMore>
25
- <optional>
26
- <ref name="technical-committee"/>
27
- </optional>
28
- <optional>
29
- <ref name="subcommittee"/>
30
- </optional>
31
- <optional>
32
- <ref name="workgroup"/>
33
- </optional>
34
- <optional>
35
- <ref name="secretariat"/>
36
- </optional>
37
- </element>
38
- </define>
39
- <define name="BibDataExtensionType">
40
- <ref name="doctype"/>
41
- <optional>
42
- <ref name="docsubtype"/>
43
- </optional>
44
- <optional>
45
- <ref name="horizontal"/>
46
- </optional>
47
- <ref name="editorialgroup"/>
48
- <optional>
49
- <ref name="approvalgroup"/>
50
- </optional>
51
- <zeroOrMore>
52
- <ref name="ics"/>
53
- </zeroOrMore>
54
- <ref name="structuredidentifier"/>
55
- <optional>
56
- <ref name="stagename"/>
57
- </optional>
58
- </define>
59
- <define name="bdate">
60
- <element name="date">
61
- <attribute name="type">
62
- <choice>
63
- <ref name="BibliographicDateType"/>
64
- <text/>
65
- </choice>
66
- </attribute>
67
- <choice>
68
- <group>
69
- <element name="from">
70
- <ref name="ISO8601Date"/>
71
- </element>
72
- <optional>
73
- <element name="to">
74
- <ref name="ISO8601Date"/>
75
- </element>
76
- </optional>
77
- </group>
78
- <element name="on">
79
- <choice>
80
- <ref name="ISO8601Date"/>
81
- <value>--</value>
82
- <value>–</value>
83
- </choice>
84
- </element>
85
- </choice>
86
- </element>
87
- </define>
88
8
  <define name="sections">
89
9
  <element name="sections">
90
10
  <zeroOrMore>
@@ -266,40 +186,6 @@
266
186
  </optional>
267
187
  </element>
268
188
  </define>
269
- <define name="DocumentType">
270
- <choice>
271
- <value>international-standard</value>
272
- <value>technical-specification</value>
273
- <value>technical-report</value>
274
- <value>publicly-available-specification</value>
275
- <value>international-workshop-agreement</value>
276
- <value>guide</value>
277
- <value>amendment</value>
278
- <value>technical-corrigendum</value>
279
- <value>directive</value>
280
- </choice>
281
- </define>
282
- <define name="DocumentSubtype">
283
- <choice>
284
- <value>specification</value>
285
- <value>method-of-test</value>
286
- <value>vocabulary</value>
287
- <value>code-of-practice</value>
288
- </choice>
289
- </define>
290
- <define name="structuredidentifier">
291
- <element name="structuredidentifier">
292
- <optional>
293
- <attribute name="type"/>
294
- </optional>
295
- <group>
296
- <ref name="documentnumber"/>
297
- <optional>
298
- <ref name="tc-documentnumber"/>
299
- </optional>
300
- </group>
301
- </element>
302
- </define>
303
189
  <define name="foreword">
304
190
  <element name="foreword">
305
191
  <ref name="Basic-Section"/>
@@ -310,11 +196,6 @@
310
196
  <ref name="Content-Section"/>
311
197
  </element>
312
198
  </define>
313
- <define name="editorialgroup">
314
- <element name="editorialgroup">
315
- <ref name="ISOProjectGroup"/>
316
- </element>
317
- </define>
318
199
  <define name="Content-Section">
319
200
  <optional>
320
201
  <attribute name="id">
@@ -360,33 +241,6 @@
360
241
  </define>
361
242
  </include>
362
243
  <!-- end overrides -->
363
- <define name="ISOProjectGroup">
364
- <zeroOrMore>
365
- <ref name="agency"/>
366
- </zeroOrMore>
367
- <oneOrMore>
368
- <ref name="technical-committee"/>
369
- </oneOrMore>
370
- <zeroOrMore>
371
- <ref name="subcommittee"/>
372
- </zeroOrMore>
373
- <zeroOrMore>
374
- <ref name="workgroup"/>
375
- </zeroOrMore>
376
- <optional>
377
- <ref name="secretariat"/>
378
- </optional>
379
- </define>
380
- <define name="approvalgroup">
381
- <element name="approvalgroup">
382
- <ref name="ISOProjectGroup"/>
383
- </element>
384
- </define>
385
- <define name="agency">
386
- <element name="agency">
387
- <text/>
388
- </element>
389
- </define>
390
244
  <!--
391
245
  We display the Normative References between scope and terms; but to keep the
392
246
  grammar simple, we keep the references together
@@ -423,46 +277,6 @@
423
277
  </zeroOrMore>
424
278
  </element>
425
279
  </define>
426
- <define name="horizontal">
427
- <element name="horizontal">
428
- <data type="boolean"/>
429
- </element>
430
- </define>
431
- <define name="documentnumber">
432
- <element name="project-number">
433
- <optional>
434
- <attribute name="part">
435
- <data type="int"/>
436
- </attribute>
437
- </optional>
438
- <optional>
439
- <attribute name="subpart">
440
- <data type="int"/>
441
- </attribute>
442
- </optional>
443
- <text/>
444
- </element>
445
- </define>
446
- <define name="tc-documentnumber">
447
- <element name="tc-document-number">
448
- <data type="int"/>
449
- </element>
450
- </define>
451
- <define name="subcommittee">
452
- <element name="subcommittee">
453
- <ref name="IsoWorkgroup"/>
454
- </element>
455
- </define>
456
- <define name="workgroup">
457
- <element name="workgroup">
458
- <ref name="IsoWorkgroup"/>
459
- </element>
460
- </define>
461
- <define name="secretariat">
462
- <element name="secretariat">
463
- <text/>
464
- </element>
465
- </define>
466
280
  <define name="clause-hanging-paragraph-with-footnote">
467
281
  <element name="clause">
468
282
  <optional>
@@ -506,12 +320,4 @@
506
320
  <ref name="Clause-Section"/>
507
321
  </element>
508
322
  </define>
509
- <define name="stagename">
510
- <element name="stagename">
511
- <optional>
512
- <attribute name="abbreviation"/>
513
- </optional>
514
- <text/>
515
- </element>
516
- </define>
517
323
  </grammar>