metanorma-iso 2.1.6 → 2.1.9

Sign up to get free protection for your applications and to get access to all the features.
Files changed (56) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/rake.yml +3 -1
  3. data/.github/workflows/release.yml +24 -0
  4. data/lib/isodoc/iso/html/html_iso_titlepage.html +2 -2
  5. data/lib/isodoc/iso/html/style-human.css +34 -2
  6. data/lib/isodoc/iso/html/style-human.scss +35 -1
  7. data/lib/isodoc/iso/html/style-iso.css +34 -2
  8. data/lib/isodoc/iso/html/style-iso.scss +36 -1
  9. data/lib/isodoc/iso/i18n-en.yaml +4 -0
  10. data/lib/isodoc/iso/i18n-fr.yaml +5 -0
  11. data/lib/isodoc/iso/i18n-ru.yaml +4 -0
  12. data/lib/isodoc/iso/i18n-zh-Hans.yaml +5 -0
  13. data/lib/isodoc/iso/init.rb +4 -0
  14. data/lib/isodoc/iso/iso.amendment.xsl +195 -197
  15. data/lib/isodoc/iso/iso.international-standard.xsl +195 -197
  16. data/lib/isodoc/iso/presentation_xml_convert.rb +22 -6
  17. data/lib/isodoc/iso/xref.rb +35 -4
  18. data/lib/metanorma/iso/base.rb +4 -0
  19. data/lib/metanorma/iso/biblio.rng +8 -5
  20. data/lib/metanorma/iso/cleanup.rb +5 -1
  21. data/lib/metanorma/iso/front_id.rb +63 -38
  22. data/lib/metanorma/iso/section.rb +5 -0
  23. data/lib/metanorma/iso/validate.rb +3 -2
  24. data/lib/metanorma/iso/version.rb +1 -1
  25. data/lib/metanorma/requirements/modspec.rb +60 -0
  26. data/lib/metanorma/requirements/requirements.rb +16 -0
  27. data/lib/metanorma-iso.rb +2 -1
  28. data/metanorma-iso.gemspec +1 -1
  29. data/spec/assets/iso.adoc +10 -0
  30. data/spec/examples/rice_img/1000-1_ed2amd3fig1a.png +0 -0
  31. data/spec/examples/rice_img/1000-1_ed2amd3fig1b.png +0 -0
  32. data/spec/examples/rice_img/1000-1_ed2amd3fig2.png +0 -0
  33. data/spec/examples/rice_img/1000-1_ed2amd3fig3.png +0 -0
  34. data/spec/examples/rice_img/1000-1_ed2amd3fig4.png +0 -0
  35. data/spec/examples/rice_img/1000-1_ed2amd3fig5_f.png +0 -0
  36. data/spec/examples/rice_img/1000-1_ed2amd3figA.png +0 -0
  37. data/spec/examples/rice_img/1000-1_ed2amd3figA1.png +0 -0
  38. data/spec/examples/rice_img/1000-1_ed2amd3figA2.png +0 -0
  39. data/spec/examples/rice_img/1000-1_ed2amd3figTab1.png +0 -0
  40. data/spec/examples/rice_img/1000-1_ed2amd3figTab2.png +0 -0
  41. data/spec/examples/rice_img/1001_ed2amd3fig1.png +0 -0
  42. data/spec/examples/rice_img/ISO_1213_1.png +0 -0
  43. data/spec/examples/rice_img/SL1000-1_ed2amd3fig1.png +0 -0
  44. data/spec/isodoc/ref_spec.rb +129 -82
  45. data/spec/metanorma/amd_spec.rb +0 -10
  46. data/spec/metanorma/base_spec.rb +15 -12
  47. data/spec/metanorma/cleanup_spec.rb +136 -0
  48. data/spec/metanorma/macros_spec.rb +99 -0
  49. data/spec/metanorma/processor_spec.rb +86 -86
  50. data/spec/metanorma/section_spec.rb +2 -2
  51. data/spec/metanorma/validate_spec.rb +41 -40
  52. data/spec/requirements/requirements_spec.rb +1299 -0
  53. data/spec/requirements/xref_spec.rb +1205 -0
  54. data/spec/vcr_cassettes/docrels.yml +385 -0
  55. data/spec/vcr_cassettes/withdrawn_iso.yml +21 -21
  56. metadata +40 -18
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 668dfbc54c97728ebf7e4e0fdd489e79011776a44dddfc15b7ee3d1a6e8ce9e0
4
- data.tar.gz: 8229dab0adc5a97e1bc133ab8bf4a135824ab7c439e3b484eed901fbf6047b26
3
+ metadata.gz: 736603eaeed361ebf56fc8903c4d25db5a5a38639bce84a8a27923929d5c591d
4
+ data.tar.gz: fa9c3e2707ed1642cbbd934061c556c8bf7613d5d88575cd35bf86b84ed9ce8e
5
5
  SHA512:
6
- metadata.gz: 168f23d9623a5f71d57625268960dec3295bd5dad520ba0f4ba4e9d3c535f6e471104bb5dd2fb1526afd6854f78151294b0be5764870e30b62dd3e6db7ee3169
7
- data.tar.gz: 5b8c4eb9a48b88fcc6fc12445084fcc97db58b1a109a74032b69f1dc40bbea6743d4ac37745e3609a8cff7e5d30bfdfb8c9a10445d7113e782c75ff296c8a3e2
6
+ metadata.gz: 23dbd404fb1b7745a787f7c70f7f7d3885b499b4329c49f821bc7e81361eed76c7378539c973b596b5b033801757081c152069e467267c566f4de14fb56d471e
7
+ data.tar.gz: 975d364c1c59be33c513cb5f010d1b393dd9ff33d336816f8433ca5bfccbf09d94137212fd642737c4c1303815099857acf8518bc28d443256ce95b744905d29
@@ -1,3 +1,5 @@
1
+ # Auto-generated by Cimas: Do not edit it manually!
2
+ # See https://github.com/metanorma/cimas
1
3
  name: rake
2
4
 
3
5
  on:
@@ -8,6 +10,6 @@ on:
8
10
 
9
11
  jobs:
10
12
  rake:
11
- uses: metanorma/metanorma-build-scripts/.github/workflows/plantuml-rake.yml@main
13
+ uses: metanorma/ci/.github/workflows/generic-rake.yml@main
12
14
  secrets:
13
15
  pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}
@@ -0,0 +1,24 @@
1
+ # Auto-generated by Cimas: Do not edit it manually!
2
+ # See https://github.com/metanorma/cimas
3
+ name: release
4
+
5
+ on:
6
+ workflow_dispatch:
7
+ inputs:
8
+ next_version:
9
+ description: |
10
+ Next release version. Possible values: x.y.z, major, minor, patch or pre|rc|etc
11
+ required: true
12
+ default: 'skip'
13
+ push:
14
+ tags: [ v* ]
15
+
16
+ jobs:
17
+ release:
18
+ uses: metanorma/ci/.github/workflows/rubygems-release.yml@main
19
+ with:
20
+ next_version: ${{ github.event.inputs.next_version }}
21
+ secrets:
22
+ rubygems-api-key: ${{ secrets.METANORMA_CI_RUBYGEMS_API_KEY }}
23
+ pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}
24
+
@@ -26,7 +26,7 @@
26
26
  name="CVP_Secretariat_Loca">{{ labels["secretariat"] }}</a>: {{ secretariat }}</p>
27
27
  {% endif %}
28
28
 
29
- <div class="doctitle-en"><div><span class="title">{{ doctitleintro }}{% if doctitleintro and doctitlemain %} &mdash; {% endif %}</span><span class="subtitle">{{ doctitlemain }}{% if doctitlemain and doctitlepart %} &mdash;{% endif %}</span>
29
+ <div class="doctitle-en"><div><span class="title">{{ doctitleintro }}{% if doctitleintro and doctitlemain %} &#x2014; {% endif %}</span><span class="subtitle">{{ doctitlemain }}{% if doctitlemain and doctitlepart %} &#x2014;{% endif %}</span>
30
30
  {% if doctitlepart %}
31
31
  </div><div class="doctitle-part">
32
32
  {% if doctitlepartlabel %}<span class="partlabel">{{ doctitlepartlabel }}: </span>{% endif %}
@@ -41,7 +41,7 @@
41
41
  {% endif %}
42
42
  </div>
43
43
 
44
- <div class="doctitle-fr"><div><span class="title">{{ docsubtitleintro }}{% if docsubtitleintro and docsubtitlemain %} &mdash; {% endif %}</span><span class="subtitle">{{ docsubtitlemain }}{% if docsubtitlemain and docsubtitlepart %} &mdash;{% endif %}</span>
44
+ <div class="doctitle-fr"><div><span class="title">{{ docsubtitleintro }}{% if docsubtitleintro and docsubtitlemain %} &#x2014; {% endif %}</span><span class="subtitle">{{ docsubtitlemain }}{% if docsubtitlemain and docsubtitlepart %} &#x2014;{% endif %}</span>
45
45
  {% if docsubtitlepart %}
46
46
  </div><div>
47
47
  {% if docsubtitlepartlabel %}<span class="partlabel">{{ docsubtitlepartlabel }}: </span>{% endif %}
@@ -882,8 +882,7 @@ table {
882
882
  margin: 1em 0 2em 0;
883
883
  margin-left: auto;
884
884
  margin-right: auto;
885
- padding-right: 2em;
886
- text-align: center; }
885
+ padding-right: 2em; }
887
886
  table, table th, table td {
888
887
  border: 1px solid black;
889
888
  font-size: 0.95em; }
@@ -892,6 +891,12 @@ table {
892
891
  table td.header {
893
892
  font-weigth: 400; }
894
893
 
894
+ td > p:first-child, th > p:first-child {
895
+ margin-top: 0em; }
896
+
897
+ td > p:last-child, th > p:last-child {
898
+ margin-bottom: 0em; }
899
+
895
900
  td,
896
901
  th {
897
902
  padding: 1em !important; }
@@ -905,6 +910,33 @@ p.TableTitle {
905
910
  .TableFootnote {
906
911
  text-align: left !important; }
907
912
 
913
+ /*
914
+ table.modspec {
915
+ @include table($border: none !important);
916
+ text-align: left;
917
+
918
+ color: #010d16;
919
+
920
+ tr:nth-child(even) {
921
+ background: #ffffff
922
+ }
923
+ tr:nth-child(odd) {
924
+ background: #ffffff
925
+ }
926
+
927
+ thead tr th {
928
+ background-color: #5d99d6;
929
+ }
930
+
931
+ td, th {
932
+ padding: 1em;
933
+ }
934
+
935
+ td.header {
936
+ font-weight: 400;
937
+ }
938
+ }
939
+ */
908
940
  /*
909
941
  3.10 Footnotes
910
942
  */
@@ -578,7 +578,13 @@ pre {
578
578
 
579
579
  table {
580
580
  @include table(1px solid black);
581
- text-align: center;
581
+ }
582
+
583
+ td > p:first-child, th > p:first-child {
584
+ margin-top: 0em;
585
+ }
586
+ td > p:last-child, th > p:last-child {
587
+ margin-bottom: 0em;
582
588
  }
583
589
 
584
590
  td,
@@ -597,6 +603,34 @@ p.TableTitle {
597
603
  text-align: left !important;
598
604
  }
599
605
 
606
+ /*
607
+ table.modspec {
608
+ @include table($border: none !important);
609
+ text-align: left;
610
+
611
+ color: #010d16;
612
+
613
+ tr:nth-child(even) {
614
+ background: #ffffff
615
+ }
616
+ tr:nth-child(odd) {
617
+ background: #ffffff
618
+ }
619
+
620
+ thead tr th {
621
+ background-color: #5d99d6;
622
+ }
623
+
624
+ td, th {
625
+ padding: 1em;
626
+ }
627
+
628
+ td.header {
629
+ font-weight: 400;
630
+ }
631
+ }
632
+ */
633
+
600
634
  /*
601
635
  3.10 Footnotes
602
636
  */
@@ -924,8 +924,7 @@ table {
924
924
  margin: 1em 0 2em 0;
925
925
  margin-left: auto;
926
926
  margin-right: auto;
927
- padding-right: 2em;
928
- text-align: center; }
927
+ padding-right: 2em; }
929
928
  table, table th, table td {
930
929
  border: 1px solid black;
931
930
  font-size: 0.95em; }
@@ -938,6 +937,12 @@ td,
938
937
  th {
939
938
  padding: 1em !important; }
940
939
 
940
+ td > p:first-child, th > p:first-child {
941
+ margin-top: 0em; }
942
+
943
+ td > p:last-child, th > p:last-child {
944
+ margin-bottom: 0em; }
945
+
941
946
  p.TableTitle {
942
947
  text-align: center;
943
948
  margin-top: 2.5em;
@@ -947,6 +952,33 @@ p.TableTitle {
947
952
  .TableFootnote {
948
953
  text-align: left !important; }
949
954
 
955
+ /*
956
+ table.modspec {
957
+ @include table($border: none !important);
958
+ text-align: left;
959
+
960
+ color: #010d16;
961
+
962
+ tr:nth-child(even) {
963
+ background: #ffffff
964
+ }
965
+ tr:nth-child(odd) {
966
+ background: #ffffff
967
+ }
968
+
969
+ thead tr th {
970
+ background-color: #5d99d6;
971
+ }
972
+
973
+ td, th {
974
+ padding: 1em;
975
+ }
976
+
977
+ td.header {
978
+ font-weight: 400;
979
+ }
980
+ }
981
+ */
950
982
  /*
951
983
  3.10 Footnotes
952
984
  */
@@ -611,7 +611,6 @@ div.zzHelp {
611
611
 
612
612
  table {
613
613
  @include table(1px solid black);
614
- text-align: center;
615
614
  }
616
615
 
617
616
  td,
@@ -619,6 +618,14 @@ th {
619
618
  padding: 1em !important;
620
619
  }
621
620
 
621
+ td > p:first-child, th > p:first-child {
622
+ margin-top: 0em;
623
+ }
624
+ td > p:last-child, th > p:last-child {
625
+ margin-bottom: 0em;
626
+ }
627
+
628
+
622
629
  p.TableTitle {
623
630
  text-align: center;
624
631
  margin-top: 2.5em;
@@ -630,6 +637,34 @@ p.TableTitle {
630
637
  text-align: left !important;
631
638
  }
632
639
 
640
+ /*
641
+ table.modspec {
642
+ @include table($border: none !important);
643
+ text-align: left;
644
+
645
+ color: #010d16;
646
+
647
+ tr:nth-child(even) {
648
+ background: #ffffff
649
+ }
650
+ tr:nth-child(odd) {
651
+ background: #ffffff
652
+ }
653
+
654
+ thead tr th {
655
+ background-color: #5d99d6;
656
+ }
657
+
658
+ td, th {
659
+ padding: 1em;
660
+ }
661
+
662
+ td.header {
663
+ font-weight: 400;
664
+ }
665
+ }
666
+ */
667
+
633
668
  /*
634
669
  3.10 Footnotes
635
670
  */
@@ -74,3 +74,7 @@ stage_dict:
74
74
  "95": Withdrawal
75
75
  locality:
76
76
  appendix: Appendix
77
+ requirements:
78
+ modspec:
79
+ description: Description
80
+ provisions: Provisions
@@ -68,3 +68,8 @@ stage_dict:
68
68
  "95": Retrait
69
69
  locality:
70
70
  appendix: Appendice
71
+ requirements:
72
+ modspec:
73
+ description: Description
74
+ provisions: Dispositions
75
+
@@ -72,3 +72,7 @@ stage_dict:
72
72
  "95": Отмена
73
73
  locality:
74
74
  appendix: Приложение
75
+ requirements:
76
+ modspec:
77
+ description: Описание
78
+ provisions: Условия
@@ -69,3 +69,8 @@ stage_dict:
69
69
  "95": 提款
70
70
  locality:
71
71
  appendix: 附录
72
+ requirements:
73
+ modspec:
74
+ description: 描述
75
+ provisions: 条件
76
+
@@ -28,6 +28,10 @@ module IsoDoc
28
28
  ""
29
29
  end
30
30
 
31
+ def requirements_processor
32
+ ::Metanorma::Requirements::Iso
33
+ end
34
+
31
35
  def std_docid_semantic(id)
32
36
  return nil if id.nil?
33
37