metanorma-iso 2.1.9 → 2.2.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (34) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/iso/i18n-en.yaml +2 -0
  3. data/lib/isodoc/iso/i18n-fr.yaml +1 -1
  4. data/lib/isodoc/iso/i18n-zh-Hans.yaml +0 -1
  5. data/lib/isodoc/iso/init.rb +15 -10
  6. data/lib/isodoc/iso/iso.amendment.xsl +110 -15
  7. data/lib/isodoc/iso/iso.international-standard.xsl +110 -15
  8. data/lib/isodoc/iso/metadata.rb +1 -1
  9. data/lib/isodoc/iso/presentation_xref.rb +1 -0
  10. data/lib/isodoc/iso/word_convert.rb +6 -0
  11. data/lib/isodoc/iso/xref.rb +43 -99
  12. data/lib/isodoc/iso/xref_section.rb +79 -0
  13. data/lib/metanorma/iso/biblio.rng +32 -1
  14. data/lib/metanorma/iso/front_id.rb +2 -2
  15. data/lib/metanorma/iso/isodoc.rng +9 -0
  16. data/lib/metanorma/iso/isostandard.rng +3 -0
  17. data/lib/metanorma/iso/validate.rb +1 -1
  18. data/lib/metanorma/iso/version.rb +1 -1
  19. data/lib/metanorma/iso.rb +0 -1
  20. data/lib/metanorma/requirements/modspec.rb +74 -8
  21. data/lib/metanorma-iso.rb +1 -0
  22. data/lib/relaton/render/config.yml +53 -1
  23. data/metanorma-iso.gemspec +1 -1
  24. data/spec/isodoc/i18n_spec.rb +2 -2
  25. data/spec/isodoc/ref_spec.rb +4 -4
  26. data/spec/metanorma/base_spec.rb +3 -3
  27. data/spec/metanorma/refs_spec.rb +7 -7
  28. data/spec/relaton/render_spec.rb +568 -0
  29. data/spec/requirements/requirement_components_spec.rb +622 -0
  30. data/spec/requirements/requirements_spec.rb +436 -54
  31. data/spec/requirements/xref_spec.rb +41 -35
  32. data/spec/vcr_cassettes/docrels.yml +33 -33
  33. data/spec/vcr_cassettes/withdrawn_iso.yml +29 -29
  34. metadata +7 -4
data/spec/requirements/xref_spec.rb CHANGED
@@ -31,6 +31,7 @@ RSpec.describe Metanorma::Requirements::Iso::Modspec do
31
31
  <sections>
32
32
  <clause id="scope" type="scope"><title>Scope</title>
33
33
  <requirement model="ogc" id="N">
34
+ <title>First</title>
34
35
  <stem type="AsciiMath">r = 1 %</stem>
35
36
  </requirement>
36
37
  <p><xref target="N"/></p>
@@ -39,6 +40,7 @@ RSpec.describe Metanorma::Requirements::Iso::Modspec do
39
40
  <clause id="widgets"><title>Widgets</title>
40
41
  <clause id="widgets1">
41
42
  <requirement model="ogc" id="note1">
43
+ <title>Second</title>
42
44
  <stem type="AsciiMath">r = 1 %</stem>
43
45
  </requirement>
44
46
  <requirement model="ogc" id="note2">
@@ -51,6 +53,7 @@ RSpec.describe Metanorma::Requirements::Iso::Modspec do
51
53
  <annex id="annex1">
52
54
  <clause id="annex1a">
53
55
  <requirement model="ogc" id="AN">
56
+ <title>Third</title>
54
57
  <stem type="AsciiMath">r = 1 %</stem>
55
58
  </requirement>
56
59
  </clause>
@@ -133,6 +136,7 @@ RSpec.describe Metanorma::Requirements::Iso::Modspec do
133
136
  <sections>
134
137
  <clause id="scope" type="scope"><title>Scope</title>
135
138
  <requirement model="ogc" id="N">
139
+ <title>First</title>
136
140
  <identifier>/ogc/req3</identifier>
137
141
  <stem type="AsciiMath">r = 1 %</stem>
138
142
  </requirement>
@@ -142,6 +146,7 @@ RSpec.describe Metanorma::Requirements::Iso::Modspec do
142
146
  <clause id="widgets"><title>Widgets</title>
143
147
  <clause id="widgets1">
144
148
  <requirement model="ogc" id="note1">
149
+ <title>Second</title>
145
150
  <identifier>/ogc/req4</identifier>
146
151
  <stem type="AsciiMath">r = 1 %</stem>
147
152
  </requirement>
@@ -156,6 +161,7 @@ RSpec.describe Metanorma::Requirements::Iso::Modspec do
156
161
  <annex id="annex1">
157
162
  <clause id="annex1a">
158
163
  <requirement model="ogc" id="AN">
164
+ <title>Third</title>
159
165
  <identifier>/ogc/req6</identifier>
160
166
  <stem type="AsciiMath">r = 1 %</stem>
161
167
  </requirement>
@@ -393,28 +399,28 @@ RSpec.describe Metanorma::Requirements::Iso::Modspec do
393
399
  <foreword displayorder='1'>
394
400
  <p>
395
401
  <xref target='N1'>
396
- <span class='citetbl'>Table 1, Requirement test 1</span>
402
+ <span class='citetbl'>Table 1, Conformance test 1</span>
397
403
  </xref>
398
404
  <xref target='N2'>
399
- <span class='citetbl'>Table (??), Requirement test (??)</span>
405
+ <span class='citetbl'>Table (??), Conformance test (??)</span>
400
406
  </xref>
401
407
  <xref target='N'>
402
- <span class='citetbl'>Table 2, Requirement test 2</span>
408
+ <span class='citetbl'>Table 2, Conformance test 2</span>
403
409
  </xref>
404
410
  <xref target='note1'>
405
- <span class='citetbl'>Table 3, Requirement test 3</span>
411
+ <span class='citetbl'>Table 3, Conformance test 3</span>
406
412
  </xref>
407
413
  <xref target='note2'>
408
- <span class='citetbl'>Table 4, Requirement test 4</span>
414
+ <span class='citetbl'>Table 4, Conformance test 4</span>
409
415
  </xref>
410
416
  <xref target='AN'>
411
- <span class='citetbl'>Table A.1, Requirement test A.1</span>
417
+ <span class='citetbl'>Table A.1, Conformance test A.1</span>
412
418
  </xref>
413
419
  <xref target='Anote1'>
414
- <span class='citetbl'>Table (??), Requirement test (??)</span>
420
+ <span class='citetbl'>Table (??), Conformance test (??)</span>
415
421
  </xref>
416
422
  <xref target='Anote2'>
417
- <span class='citetbl'>Table A.2, Requirement test A.2</span>
423
+ <span class='citetbl'>Table A.2, Conformance test A.2</span>
418
424
  </xref>
419
425
  </p>
420
426
  </foreword>
@@ -494,28 +500,28 @@ RSpec.describe Metanorma::Requirements::Iso::Modspec do
494
500
  <foreword displayorder='1'>
495
501
  <p>
496
502
  <xref target='N1'>
497
- <span class='citetbl'>Tableau 1, Test d’exigence 1</span>
503
+ <span class='citetbl'>Tableau 1, Test de conformité 1</span>
498
504
  </xref>
499
505
  <xref target='N2'>
500
- <span class='citetbl'>Tableau (??), Test d’exigence (??)</span>
506
+ <span class='citetbl'>Tableau (??), Test de conformité (??)</span>
501
507
  </xref>
502
508
  <xref target='N'>
503
- <span class='citetbl'>Tableau 2, Test d’exigence 2</span>
509
+ <span class='citetbl'>Tableau 2, Test de conformité 2</span>
504
510
  </xref>
505
511
  <xref target='note1'>
506
- <span class='citetbl'>Tableau 3, Test d’exigence 3</span>
512
+ <span class='citetbl'>Tableau 3, Test de conformité 3</span>
507
513
  </xref>
508
514
  <xref target='note2'>
509
- <span class='citetbl'>Tableau 4, Test d’exigence 4</span>
515
+ <span class='citetbl'>Tableau 4, Test de conformité 4</span>
510
516
  </xref>
511
517
  <xref target='AN'>
512
- <span class='citetbl'>Tableau A.1, Test d’exigence A.1</span>
518
+ <span class='citetbl'>Tableau A.1, Test de conformité A.1</span>
513
519
  </xref>
514
520
  <xref target='Anote1'>
515
- <span class='citetbl'>Tableau (??), Test d’exigence (??)</span>
521
+ <span class='citetbl'>Tableau (??), Test de conformité (??)</span>
516
522
  </xref>
517
523
  <xref target='Anote2'>
518
- <span class='citetbl'>Tableau A.2, Test d’exigence A.2</span>
524
+ <span class='citetbl'>Tableau A.2, Test de conformité A.2</span>
519
525
  </xref>
520
526
  </p>
521
527
  </foreword>
@@ -694,28 +700,28 @@ RSpec.describe Metanorma::Requirements::Iso::Modspec do
694
700
  <foreword displayorder='1'>
695
701
  <p>
696
702
  <xref target='N1'>
697
- <span class='citetbl'>Table 1, Recommendation test 1</span>
703
+ <span class='citetbl'>Table 1, Conformance test 1</span>
698
704
  </xref>
699
705
  <xref target='N2'>
700
- <span class='citetbl'>Table (??), Recommendation test (??)</span>
706
+ <span class='citetbl'>Table (??), Conformance test (??)</span>
701
707
  </xref>
702
708
  <xref target='N'>
703
- <span class='citetbl'>Table 2, Recommendation test 2</span>
709
+ <span class='citetbl'>Table 2, Conformance test 2</span>
704
710
  </xref>
705
711
  <xref target='note1'>
706
- <span class='citetbl'>Table 3, Recommendation test 3</span>
712
+ <span class='citetbl'>Table 3, Conformance test 3</span>
707
713
  </xref>
708
714
  <xref target='note2'>
709
- <span class='citetbl'>Table 4, Recommendation test 4</span>
715
+ <span class='citetbl'>Table 4, Conformance test 4</span>
710
716
  </xref>
711
717
  <xref target='AN'>
712
- <span class='citetbl'>Table A.1, Recommendation test A.1</span>
718
+ <span class='citetbl'>Table A.1, Conformance test A.1</span>
713
719
  </xref>
714
720
  <xref target='Anote1'>
715
- <span class='citetbl'>Table (??), Recommendation test (??)</span>
721
+ <span class='citetbl'>Table (??), Conformance test (??)</span>
716
722
  </xref>
717
723
  <xref target='Anote2'>
718
- <span class='citetbl'>Table A.2, Recommendation test A.2</span>
724
+ <span class='citetbl'>Table A.2, Conformance test A.2</span>
719
725
  </xref>
720
726
  </p>
721
727
  </foreword>
@@ -894,28 +900,28 @@ RSpec.describe Metanorma::Requirements::Iso::Modspec do
894
900
  <foreword displayorder='1'>
895
901
  <p>
896
902
  <xref target='N1'>
897
- <span class='citetbl'>Table 1, Permission test 1</span>
903
+ <span class='citetbl'>Table 1, Conformance test 1</span>
898
904
  </xref>
899
905
  <xref target='N2'>
900
- <span class='citetbl'>Table (??), Permission test (??)</span>
906
+ <span class='citetbl'>Table (??), Conformance test (??)</span>
901
907
  </xref>
902
908
  <xref target='N'>
903
- <span class='citetbl'>Table 2, Permission test 2</span>
909
+ <span class='citetbl'>Table 2, Conformance test 2</span>
904
910
  </xref>
905
911
  <xref target='note1'>
906
- <span class='citetbl'>Table 3, Permission test 3</span>
912
+ <span class='citetbl'>Table 3, Conformance test 3</span>
907
913
  </xref>
908
914
  <xref target='note2'>
909
- <span class='citetbl'>Table 4, Permission test 4</span>
915
+ <span class='citetbl'>Table 4, Conformance test 4</span>
910
916
  </xref>
911
917
  <xref target='AN'>
912
- <span class='citetbl'>Table A.1, Permission test A.1</span>
918
+ <span class='citetbl'>Table A.1, Conformance test A.1</span>
913
919
  </xref>
914
920
  <xref target='Anote1'>
915
- <span class='citetbl'>Table (??), Permission test (??)</span>
921
+ <span class='citetbl'>Table (??), Conformance test (??)</span>
916
922
  </xref>
917
923
  <xref target='Anote2'>
918
- <span class='citetbl'>Table A.2, Permission test A.2</span>
924
+ <span class='citetbl'>Table A.2, Conformance test A.2</span>
919
925
  </xref>
920
926
  </p>
921
927
  </foreword>
@@ -983,15 +989,15 @@ RSpec.describe Metanorma::Requirements::Iso::Modspec do
983
989
  <xref target='N1'>
984
990
  <span class='citetbl'>Table 1, Permission 1</span>
985
991
  </xref>
986
- <xref target='N2'>Table 1, Permission test 1-1</xref>
992
+ <xref target='N2'>Table 1, Conformance test 1-1</xref>
987
993
  <xref target='N'>Table 1, Permission 1-1-1</xref>
988
994
  <xref target='Q1'>Table 1, Requirement 1-1</xref>
989
995
  <xref target='R1'>Table 1, Recommendation 1-1</xref>
990
996
  <xref target='AN1'>
991
- <span class='citetbl'>Table A.1, Permission test A.1</span>
997
+ <span class='citetbl'>Table A.1, Conformance test A.1</span>
992
998
  </xref>
993
999
  <xref target='AN2'>Table A.1, Permission A.1-1</xref>
994
- <xref target='AN'>Table A.1, Permission test A.1-1-1</xref>
1000
+ <xref target='AN'>Table A.1, Conformance test A.1-1-1</xref>
995
1001
  <xref target='AQ1'>Table A.1, Requirement A.1-1</xref>
996
1002
  <xref target='AR1'>Table A.1, Recommendation A.1-1</xref>
997
1003
  </p>