metanorma-iso 2.0.5 → 2.0.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (48) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/iso/base_convert.rb +3 -3
  3. data/lib/isodoc/iso/html/header-dis.html +391 -0
  4. data/lib/isodoc/iso/html/header.html +42 -33
  5. data/lib/isodoc/iso/html/isodoc-dis.css +4524 -0
  6. data/lib/isodoc/iso/html/isodoc-dis.scss +4289 -0
  7. data/lib/isodoc/iso/html/isodoc.css +9 -7
  8. data/lib/isodoc/iso/html/isodoc.scss +7 -5
  9. data/lib/isodoc/iso/html/style-human.css +0 -1
  10. data/lib/isodoc/iso/html/style-human.scss +0 -1
  11. data/lib/isodoc/iso/html/style-iso.css +0 -1
  12. data/lib/isodoc/iso/html/style-iso.scss +0 -1
  13. data/lib/isodoc/iso/html/word_iso_intro-dis.html +7 -0
  14. data/lib/isodoc/iso/html/word_iso_titlepage-dis.html +51 -0
  15. data/lib/isodoc/iso/html/word_iso_titlepage.html +12 -11
  16. data/lib/isodoc/iso/html/wordstyle-dis.css +2160 -0
  17. data/lib/isodoc/iso/html/wordstyle-dis.scss +2011 -0
  18. data/lib/isodoc/iso/html/wordstyle.css +26 -19
  19. data/lib/isodoc/iso/html/wordstyle.scss +32 -25
  20. data/lib/isodoc/iso/i18n-en.yaml +2 -2
  21. data/lib/isodoc/iso/i18n-fr.yaml +2 -2
  22. data/lib/isodoc/iso/i18n-ru.yaml +2 -2
  23. data/lib/isodoc/iso/i18n-zh-Hans.yaml +2 -2
  24. data/lib/isodoc/iso/index.rb +7 -4
  25. data/lib/isodoc/iso/iso.amendment.xsl +111 -28
  26. data/lib/isodoc/iso/iso.international-standard.xsl +111 -28
  27. data/lib/isodoc/iso/metadata.rb +5 -12
  28. data/lib/isodoc/iso/sts_convert.rb +8 -3
  29. data/lib/isodoc/iso/word_convert.rb +12 -0
  30. data/lib/metanorma/iso/boilerplate-fr.xml +5 -6
  31. data/lib/metanorma/iso/boilerplate-ru.xml +4 -6
  32. data/lib/metanorma/iso/boilerplate.xml +5 -6
  33. data/lib/metanorma/iso/cleanup.rb +8 -2
  34. data/lib/metanorma/iso/front_id.rb +1 -0
  35. data/lib/metanorma/iso/validate_list.rb +20 -5
  36. data/lib/metanorma/iso/version.rb +1 -1
  37. data/metanorma-iso.gemspec +1 -1
  38. data/spec/isodoc/ref_spec.rb +11 -7
  39. data/spec/metanorma/amd_spec.rb +6 -7
  40. data/spec/metanorma/base_spec.rb +0 -1
  41. data/spec/metanorma/cleanup_spec.rb +10 -10
  42. data/spec/metanorma/refs_spec.rb +85 -144
  43. data/spec/metanorma/section_spec.rb +15 -18
  44. data/spec/metanorma/validate_spec.rb +46 -25
  45. data/spec/spec_helper.rb +2 -2
  46. data/spec/vcr_cassettes/docrels.yml +37 -45
  47. data/spec/vcr_cassettes/withdrawn_iso.yml +31 -37
  48. metadata +12 -5
@@ -778,9 +778,9 @@ p.zzCopyright, li.zzCopyright, div.zzCopyright {
778
778
  mso-style-unhide: no;
779
779
  mso-style-next: Normal;
780
780
  margin-top: 0cm;
781
- margin-right: 14.2pt;
781
+ margin-right: 0pt;
782
782
  margin-bottom: 6.0pt;
783
- margin-left: 14.2pt;
783
+ margin-left: 0pt;
784
784
  text-align: justify;
785
785
  line-height: 12.0pt;
786
786
  mso-pagination: widow-orphan;
@@ -800,9 +800,9 @@ p.zzCopyright1 {
800
800
  mso-style-unhide: no;
801
801
  mso-style-next: Normal;
802
802
  margin-top: 0cm;
803
- margin-right: 14.2pt;
803
+ margin-right: 0pt;
804
804
  margin-bottom: 6.0pt;
805
- margin-left: 14.2pt;
805
+ margin-left: 0pt;
806
806
  text-align: justify;
807
807
  line-height: 12.0pt;
808
808
  mso-pagination: widow-orphan;
@@ -810,7 +810,7 @@ p.zzCopyright1 {
810
810
  border: none;
811
811
  padding: 0cm;
812
812
  mso-padding-alt: 1.0pt 4.0pt 1.0pt 4.0pt;
813
- font-size: 11.0pt;
813
+ font-size: 10.0pt;
814
814
  font-family: {{bodyfont}};
815
815
  mso-fareast-font-family: "SimSun",serif;
816
816
  mso-bidi-font-family: {{bodyfont}};
@@ -1211,9 +1211,11 @@ div.coverpage_warning {
1211
1211
  .coverpage-warning .content {
1212
1212
  font-style: italic; }
1213
1213
 
1214
+ /*
1214
1215
  .boilerplate-copyright {
1215
- padding: 1em; }
1216
-
1216
+ padding: 1em;
1217
+ }
1218
+ */
1217
1219
  .boilerplate-copyright .boilerplate-name {
1218
1220
  color: #485094;
1219
1221
  font-weight: 600; }
@@ -742,9 +742,9 @@ p.zzCopyright, li.zzCopyright, div.zzCopyright
742
742
  mso-style-unhide:no;
743
743
  mso-style-next:Normal;
744
744
  margin-top:0cm;
745
- margin-right:14.2pt;
745
+ margin-right:0pt;
746
746
  margin-bottom:6.0pt;
747
- margin-left:14.2pt;
747
+ margin-left:0pt;
748
748
  text-align:justify;
749
749
  line-height:12.0pt;
750
750
  mso-pagination:widow-orphan;
@@ -763,9 +763,9 @@ p.zzCopyright1
763
763
  mso-style-unhide:no;
764
764
  mso-style-next:Normal;
765
765
  margin-top:0cm;
766
- margin-right:14.2pt;
766
+ margin-right:0pt;
767
767
  margin-bottom:6.0pt;
768
- margin-left:14.2pt;
768
+ margin-left:0pt;
769
769
  text-align:justify;
770
770
  line-height:12.0pt;
771
771
  mso-pagination:widow-orphan;
@@ -773,7 +773,7 @@ p.zzCopyright1
773
773
  border:none;
774
774
  padding:0cm;
775
775
  mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt;
776
- font-size:11.0pt;
776
+ font-size:10.0pt;
777
777
  font-family:$bodyfont;
778
778
  mso-fareast-font-family:"SimSun",serif;
779
779
  mso-bidi-font-family:$bodyfont;
@@ -1161,9 +1161,11 @@ div.coverpage_warning
1161
1161
  font-style: italic;
1162
1162
  }
1163
1163
 
1164
+ /*
1164
1165
  .boilerplate-copyright {
1165
1166
  padding: 1em;
1166
1167
  }
1168
+ */
1167
1169
 
1168
1170
  .boilerplate-copyright .boilerplate-name {
1169
1171
  color: #485094;
@@ -436,7 +436,6 @@ li p {
436
436
 
437
437
  p.AltTerms {
438
438
  margin-bottom: 0;
439
- font-style: italic;
440
439
  margin-left: 2em; }
441
440
 
442
441
  p.Terms {
@@ -249,7 +249,6 @@ li p {
249
249
 
250
250
  p.AltTerms {
251
251
  margin-bottom: 0;
252
- font-style: italic;
253
252
  margin-left: 2em;
254
253
  }
255
254
 
@@ -383,7 +383,6 @@ li p {
383
383
 
384
384
  p.AltTerms {
385
385
  margin-bottom: 0;
386
- font-style: italic;
387
386
  margin-left: 2em; }
388
387
 
389
388
  p.Terms {
@@ -188,7 +188,6 @@ li p {
188
188
 
189
189
  p.AltTerms {
190
190
  margin-bottom: 0;
191
- font-style: italic;
192
191
  margin-left: 2em;
193
192
  }
194
193
 
@@ -0,0 +1,7 @@
1
+ {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
2
+ {% else %}
3
+
4
+ <p class="zzContents" style='margin-top:0cm'><span lang="EN-GB">{{ labels["table_of_contents"] }}</span></p>
5
+
6
+ WORDTOC
7
+ {% endif %}
@@ -0,0 +1,51 @@
1
+ {% if tc_docnumber.size > 0 %}
2
+ {% for num in tc_docnumber %}
3
+ <p class="zzCover"><span lang="EN-GB">Reference number of working document: {{agency}}/{{tc}} {{ num }}</span><span lang="EN-GB"><o:p></o:p></span></p>
4
+ {% endfor %}
5
+ {% endif %}
6
+
7
+ {% if revdate %}
8
+ <p class="MsoNormal" align="right" style='text-align:right'><span lang="EN-GB">Date: <span style='mso-no-proof:yes'>{{ revdate }}</span></span></p>
9
+ {% endif %}
10
+
11
+ <p class="zzCover"><span lang="EN-GB">Reference number of project: {{ docnumber_lang }} {{ draftinfo }}</span></p>
12
+
13
+ <p class="zzCover"><span lang="EN-GB">Committee identification: {{agency}}/{{ editorialgroup | join: "/" }}</span></p>
14
+
15
+ {% if doctitleamdlabel %}
16
+ <p class="zzCover"><b>{{ doctitleamdlabel }}</b></p>
17
+ {% endif %}
18
+
19
+ {% if doctitlecorrlabel %}
20
+ <p class="zzCover"><b>{{ doctitlecorrlabel }}</b></p>
21
+ {% endif %}
22
+
23
+ {% if secretariat %}
24
+ <p class="zzCover"><span lang="EN-GB">Secretariat: <span>{{ secretariat }}</span></span></p>
25
+ {% endif %}
26
+
27
+ <p class="zzCover">
28
+ <span lang="EN-GB">{{ doctitleintro }}{% if doctitleintro and doctitlemain %} &mdash; {% endif %}{{ doctitlemain }}{% if doctitlemain and doctitlepart %} &mdash; {% endif %}{% if doctitlepart %}{% if doctitlepartlabel %}{{ doctitlepartlabel }}: {% endif %}{{ doctitlepart }}</span>{% endif %}
29
+ </p>
30
+ {% if doctitleamdlabel %}
31
+ <p class="zzCover">{{ doctitleamdlabel }}{% if doctitleamd %}: {{ doctitleamd }}{% endif %}</p>
32
+ {% endif %}
33
+ {% if doctitlecorrlabel %}
34
+ <p class="zzCover">{{ doctitlecorrlabel }}</p>
35
+ {% endif %}
36
+
37
+ <p class="zzCover">{{ docsubtitleintro }}{% if docsubtitleintro and docsubtitlemain %} &mdash; {% endif %}{{ docsubtitlemain }}{% if docsubtitlemain and docsubtitlepart %} &mdash; {% endif %}{% if docsubtitlepart %}{% if docsubtitlepartlabel %}{{ docsubtitlepartlabel }}: {% endif %}{{ docsubtitlepart }}{% endif %}
38
+ </p>
39
+ {% if docsubtitleamdlabel %}
40
+ <p class="zzCover">{{ docsubtitleamdlabel }}{% if docsubtitleamd %}: {{ docsubtitleamd }}{% endif %}</p>
41
+ {% endif %}
42
+ {% if docsubtitlecorrlabel %}
43
+ <p class="zzCover">{{ docsubtitlecorrlabel }}</p>
44
+ {% endif %}
45
+ {% endif %}
46
+
47
+ </div>
48
+
49
+ <!--</div>-->
50
+
51
+
@@ -10,10 +10,6 @@ normal'><span lang="EN-GB" style='font-size:14.0pt;mso-no-proof:yes'>{{ docnumbe
10
10
  style='mso-bidi-font-weight:normal'><span lang="EN-GB" style='font-size:14.0pt'><o:p></o:p></span></b></p>
11
11
  {% endif %}
12
12
 
13
- {% if revdate %}
14
- <p class="MsoNormal" align="right" style='text-align:right'><span lang="EN-GB" style='mso-no-proof:yes'>{{ labels["date"]}}: {{ revdate }}</span></p>
15
- {% endif %}
16
-
17
13
  {% if tc_docnumber.size > 0 %}
18
14
  <p class="MsoNormal" align="right" style='text-align:right'><span lang="EN-GB" style='mso-no-proof:yes'>{{ docnumber_lang }} {{ draftinfo }}</span></p>
19
15
  {% endif %}
@@ -27,14 +23,19 @@ style='mso-bidi-font-weight:normal'><span lang="EN-GB" style='font-size:14.0pt'>
27
23
  {% endif %}
28
24
 
29
25
  <p class="MsoNormal" align="right" style='text-align:right'><span lang="EN-GB"
30
- style='mso-no-proof:yes'>{{ agency }}/{{ editorialgroup | join: "/" }}</span></p>
26
+ style='mso-no-proof:yes'>{{ agency }}&#xa0;{{ editorialgroup | join: "/" }}</span></p>
31
27
 
32
- <p class="MsoNormal" align="right" style='margin-bottom:100.0pt;text-align:right'><span lang="EN-GB">{{ labels["secretariat"] }}: <span style='mso-no-proof:yes'>{{ secretariat }}</span></span></p>
28
+ {% if secretariat %}
29
+ <p class="MsoNormal" align="right" style='text-align:right'><span lang="EN-GB">{{ labels["secretariat"] }}: <span style='mso-no-proof:yes'>{{ secretariat }}</span></span></p>
30
+ {% endif %}
33
31
 
34
- <p class="MsoNormal" align="left" style='text-align:left;line-height:18.0pt;margin-bottom:0.0pt;font-size:16.0pt'>
32
+ {% if revdate %}
33
+ <p class="MsoNormal" align="right" style='text-align:right'><span lang="EN-GB">{{ labels["date"] }}: <span style='mso-no-proof:yes'>{{ revdate }}</span></span></p>
34
+ {% endif %}
35
+
36
+ <p class="MsoNormal" align="left" style='text-align:left;line-height:18.0pt;margin-top:100.0pt;margin-bottom:0.0pt;font-size:16.0pt'>
35
37
  <span class="title"><b>{{ doctitleintro }}{% if doctitleintro and doctitlemain %} &mdash; {% endif %}</b></span><b><span class="subtitle">{{ doctitlemain }}{% if doctitlemain and doctitlepart %} &mdash;{% endif %}</b></span>
36
38
  {% if doctitlepart %}
37
- </p><p class="MsoNormal" align="left" style='text-align:left;line-height:18.0pt;margin-bottom:0.0pt;margin-top:6.0pt;font-size:16.0pt'>
38
39
  {% if doctitlepartlabel %}<span class="partlabel">{{ doctitlepartlabel }}: </span><br/>{% endif %}
39
40
  <span class="part"><b>{{ doctitlepart }}</b></span>
40
41
  {% endif %}
@@ -46,12 +47,12 @@ style='mso-no-proof:yes'>{{ agency }}/{{ editorialgroup | join: "/" }}</span></p
46
47
  <p class="MsoNormal" style='text-align:left;line-height:18.0pt;margin-bottom:0.0pt;margin-top:6.0pt;font-size:16.0pt'>{{ doctitlecorrlabel }}</p>
47
48
  {% endif %}
48
49
 
49
-
50
+ {% if unpublished %}
51
+ {% else %}
50
52
  <br/>
51
53
  <p class="MsoNormal" align="left" style='text-align:left;line-height:18.0pt;margin-bottom:0.0pt;font-size:16.0pt'>
52
54
  <span class="title">{{ docsubtitleintro }}{% if docsubtitleintro and docsubtitlemain %} &mdash; {% endif %}</span><span class="subtitle">{{ docsubtitlemain }}{% if docsubtitlemain and docsubtitlepart %} &mdash;{% endif %}</span>
53
55
  {% if docsubtitlepart %}
54
- </p><p class="MsoNormal" align="left" style='text-align:left;line-height:18.0pt;margin-bottom:0.0pt;margin-top:6.0pt;font-size:16.0pt'>
55
56
  {% if docsubtitlepartlabel %}<span class="partlabel">{{ docsubtitlepartlabel }}: </span><br/>{% endif %}
56
57
  <span class="part">{{ docsubtitlepart }}</span>
57
58
  {% endif %}
@@ -62,7 +63,7 @@ style='mso-no-proof:yes'>{{ agency }}/{{ editorialgroup | join: "/" }}</span></p
62
63
  {% if docsubtitlecorrlabel %}
63
64
  <p class="MsoNormal" style='text-align:left;line-height:18.0pt;margin-bottom:0.0pt;margin-top:6.0pt;font-size:16.0pt'>{{ docsubtitlecorrlabel }}</p>
64
65
  {% endif %}
65
-
66
+ {% endif %}
66
67
 
67
68
 
68
69