metanorma-iso 2.2.0 → 2.2.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (35) 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 -2
  6. data/lib/isodoc/iso/i18n-fr.yaml +9 -2
  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 +54 -4
  10. data/lib/isodoc/iso/iso.international-standard.xsl +54 -4
  11. data/lib/isodoc/iso/presentation_xref.rb +10 -7
  12. data/lib/isodoc/iso/sections.rb +1 -1
  13. data/lib/isodoc/iso/xref.rb +37 -88
  14. data/lib/isodoc/iso/xref_section.rb +79 -0
  15. data/lib/metanorma/iso/basicdoc.rng +0 -27
  16. data/lib/metanorma/iso/biblio-standoc.rng +164 -0
  17. data/lib/metanorma/iso/biblio.rng +45 -18
  18. data/lib/metanorma/iso/isodoc.rng +31 -194
  19. data/lib/metanorma/iso/isostandard-amd.rng +3 -54
  20. data/lib/metanorma/iso/isostandard-compile.rng +7 -0
  21. data/lib/metanorma/iso/isostandard.rng +1 -192
  22. data/lib/metanorma/iso/relaton-iso.rng +225 -0
  23. data/lib/metanorma/iso/validate.rb +7 -7
  24. data/lib/metanorma/iso/version.rb +1 -1
  25. data/lib/metanorma/requirements/modspec.rb +26 -39
  26. data/spec/isodoc/inline_spec.rb +1 -1
  27. data/spec/metanorma/base_spec.rb +3 -3
  28. data/spec/metanorma/refs_spec.rb +7 -7
  29. data/spec/metanorma/validate_spec.rb +55 -55
  30. data/spec/requirements/requirement_components_spec.rb +53 -65
  31. data/spec/requirements/requirements_spec.rb +178 -263
  32. data/spec/requirements/xref_spec.rb +35 -35
  33. data/spec/vcr_cassettes/docrels.yml +32 -32
  34. data/spec/vcr_cassettes/withdrawn_iso.yml +30 -30
  35. metadata +7 -2
data/spec/requirements/xref_spec.rb CHANGED
@@ -399,28 +399,28 @@ RSpec.describe Metanorma::Requirements::Iso::Modspec do
399
399
  <foreword displayorder='1'>
400
400
  <p>
401
401
  <xref target='N1'>
402
- <span class='citetbl'>Table 1, Requirement test 1</span>
402
+ <span class='citetbl'>Table 1, Conformance test 1</span>
403
403
  </xref>
404
404
  <xref target='N2'>
405
- <span class='citetbl'>Table (??), Requirement test (??)</span>
405
+ <span class='citetbl'>Table (??), Conformance test (??)</span>
406
406
  </xref>
407
407
  <xref target='N'>
408
- <span class='citetbl'>Table 2, Requirement test 2</span>
408
+ <span class='citetbl'>Table 2, Conformance test 2</span>
409
409
  </xref>
410
410
  <xref target='note1'>
411
- <span class='citetbl'>Table 3, Requirement test 3</span>
411
+ <span class='citetbl'>Table 3, Conformance test 3</span>
412
412
  </xref>
413
413
  <xref target='note2'>
414
- <span class='citetbl'>Table 4, Requirement test 4</span>
414
+ <span class='citetbl'>Table 4, Conformance test 4</span>
415
415
  </xref>
416
416
  <xref target='AN'>
417
- <span class='citetbl'>Table A.1, Requirement test A.1</span>
417
+ <span class='citetbl'>Table A.1, Conformance test A.1</span>
418
418
  </xref>
419
419
  <xref target='Anote1'>
420
- <span class='citetbl'>Table (??), Requirement test (??)</span>
420
+ <span class='citetbl'>Table (??), Conformance test (??)</span>
421
421
  </xref>
422
422
  <xref target='Anote2'>
423
- <span class='citetbl'>Table A.2, Requirement test A.2</span>
423
+ <span class='citetbl'>Table A.2, Conformance test A.2</span>
424
424
  </xref>
425
425
  </p>
426
426
  </foreword>
@@ -500,28 +500,28 @@ RSpec.describe Metanorma::Requirements::Iso::Modspec do
500
500
  <foreword displayorder='1'>
501
501
  <p>
502
502
  <xref target='N1'>
503
- <span class='citetbl'>Tableau 1, Test d’exigence 1</span>
503
+ <span class='citetbl'>Tableau 1, Test de conformité 1</span>
504
504
  </xref>
505
505
  <xref target='N2'>
506
- <span class='citetbl'>Tableau (??), Test d’exigence (??)</span>
506
+ <span class='citetbl'>Tableau (??), Test de conformité (??)</span>
507
507
  </xref>
508
508
  <xref target='N'>
509
- <span class='citetbl'>Tableau 2, Test d’exigence 2</span>
509
+ <span class='citetbl'>Tableau 2, Test de conformité 2</span>
510
510
  </xref>
511
511
  <xref target='note1'>
512
- <span class='citetbl'>Tableau 3, Test d’exigence 3</span>
512
+ <span class='citetbl'>Tableau 3, Test de conformité 3</span>
513
513
  </xref>
514
514
  <xref target='note2'>
515
- <span class='citetbl'>Tableau 4, Test d’exigence 4</span>
515
+ <span class='citetbl'>Tableau 4, Test de conformité 4</span>
516
516
  </xref>
517
517
  <xref target='AN'>
518
- <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>
519
519
  </xref>
520
520
  <xref target='Anote1'>
521
- <span class='citetbl'>Tableau (??), Test d’exigence (??)</span>
521
+ <span class='citetbl'>Tableau (??), Test de conformité (??)</span>
522
522
  </xref>
523
523
  <xref target='Anote2'>
524
- <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>
525
525
  </xref>
526
526
  </p>
527
527
  </foreword>
@@ -700,28 +700,28 @@ RSpec.describe Metanorma::Requirements::Iso::Modspec do
700
700
  <foreword displayorder='1'>
701
701
  <p>
702
702
  <xref target='N1'>
703
- <span class='citetbl'>Table 1, Recommendation test 1</span>
703
+ <span class='citetbl'>Table 1, Conformance test 1</span>
704
704
  </xref>
705
705
  <xref target='N2'>
706
- <span class='citetbl'>Table (??), Recommendation test (??)</span>
706
+ <span class='citetbl'>Table (??), Conformance test (??)</span>
707
707
  </xref>
708
708
  <xref target='N'>
709
- <span class='citetbl'>Table 2, Recommendation test 2</span>
709
+ <span class='citetbl'>Table 2, Conformance test 2</span>
710
710
  </xref>
711
711
  <xref target='note1'>
712
- <span class='citetbl'>Table 3, Recommendation test 3</span>
712
+ <span class='citetbl'>Table 3, Conformance test 3</span>
713
713
  </xref>
714
714
  <xref target='note2'>
715
- <span class='citetbl'>Table 4, Recommendation test 4</span>
715
+ <span class='citetbl'>Table 4, Conformance test 4</span>
716
716
  </xref>
717
717
  <xref target='AN'>
718
- <span class='citetbl'>Table A.1, Recommendation test A.1</span>
718
+ <span class='citetbl'>Table A.1, Conformance test A.1</span>
719
719
  </xref>
720
720
  <xref target='Anote1'>
721
- <span class='citetbl'>Table (??), Recommendation test (??)</span>
721
+ <span class='citetbl'>Table (??), Conformance test (??)</span>
722
722
  </xref>
723
723
  <xref target='Anote2'>
724
- <span class='citetbl'>Table A.2, Recommendation test A.2</span>
724
+ <span class='citetbl'>Table A.2, Conformance test A.2</span>
725
725
  </xref>
726
726
  </p>
727
727
  </foreword>
@@ -900,28 +900,28 @@ RSpec.describe Metanorma::Requirements::Iso::Modspec do
900
900
  <foreword displayorder='1'>
901
901
  <p>
902
902
  <xref target='N1'>
903
- <span class='citetbl'>Table 1, Permission test 1</span>
903
+ <span class='citetbl'>Table 1, Conformance test 1</span>
904
904
  </xref>
905
905
  <xref target='N2'>
906
- <span class='citetbl'>Table (??), Permission test (??)</span>
906
+ <span class='citetbl'>Table (??), Conformance test (??)</span>
907
907
  </xref>
908
908
  <xref target='N'>
909
- <span class='citetbl'>Table 2, Permission test 2</span>
909
+ <span class='citetbl'>Table 2, Conformance test 2</span>
910
910
  </xref>
911
911
  <xref target='note1'>
912
- <span class='citetbl'>Table 3, Permission test 3</span>
912
+ <span class='citetbl'>Table 3, Conformance test 3</span>
913
913
  </xref>
914
914
  <xref target='note2'>
915
- <span class='citetbl'>Table 4, Permission test 4</span>
915
+ <span class='citetbl'>Table 4, Conformance test 4</span>
916
916
  </xref>
917
917
  <xref target='AN'>
918
- <span class='citetbl'>Table A.1, Permission test A.1</span>
918
+ <span class='citetbl'>Table A.1, Conformance test A.1</span>
919
919
  </xref>
920
920
  <xref target='Anote1'>
921
- <span class='citetbl'>Table (??), Permission test (??)</span>
921
+ <span class='citetbl'>Table (??), Conformance test (??)</span>
922
922
  </xref>
923
923
  <xref target='Anote2'>
924
- <span class='citetbl'>Table A.2, Permission test A.2</span>
924
+ <span class='citetbl'>Table A.2, Conformance test A.2</span>
925
925
  </xref>
926
926
  </p>
927
927
  </foreword>
@@ -989,15 +989,15 @@ RSpec.describe Metanorma::Requirements::Iso::Modspec do
989
989
  <xref target='N1'>
990
990
  <span class='citetbl'>Table 1, Permission 1</span>
991
991
  </xref>
992
- <xref target='N2'>Table 1, Permission test 1-1</xref>
992
+ <xref target='N2'>Table 1, Conformance test 1-1</xref>
993
993
  <xref target='N'>Table 1, Permission 1-1-1</xref>
994
994
  <xref target='Q1'>Table 1, Requirement 1-1</xref>
995
995
  <xref target='R1'>Table 1, Recommendation 1-1</xref>
996
996
  <xref target='AN1'>
997
- <span class='citetbl'>Table A.1, Permission test A.1</span>
997
+ <span class='citetbl'>Table A.1, Conformance test A.1</span>
998
998
  </xref>
999
999
  <xref target='AN2'>Table A.1, Permission A.1-1</xref>
1000
- <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>
1001
1001
  <xref target='AQ1'>Table A.1, Requirement A.1-1</xref>
1002
1002
  <xref target='AR1'>Table A.1, Recommendation A.1-1</xref>
1003
1003
  </p>