metanorma-iso 2.0.4 → 2.0.6.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (44) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/iso/html/header.html +42 -33
  3. data/lib/isodoc/iso/html/isodoc.css +9 -7
  4. data/lib/isodoc/iso/html/isodoc.scss +7 -5
  5. data/lib/isodoc/iso/html/style-human.css +0 -1
  6. data/lib/isodoc/iso/html/style-human.scss +0 -1
  7. data/lib/isodoc/iso/html/style-iso.css +0 -1
  8. data/lib/isodoc/iso/html/style-iso.scss +0 -1
  9. data/lib/isodoc/iso/html/word_iso_titlepage.html +12 -11
  10. data/lib/isodoc/iso/html/wordstyle.css +46 -19
  11. data/lib/isodoc/iso/html/wordstyle.scss +52 -25
  12. data/lib/isodoc/iso/i18n-en.yaml +7 -2
  13. data/lib/isodoc/iso/i18n-fr.yaml +5 -2
  14. data/lib/isodoc/iso/i18n-ru.yaml +5 -2
  15. data/lib/isodoc/iso/i18n-zh-Hans.yaml +6 -2
  16. data/lib/isodoc/iso/init.rb +1 -2
  17. data/lib/isodoc/iso/iso.amendment.xsl +704 -328
  18. data/lib/isodoc/iso/iso.international-standard.xsl +704 -328
  19. data/lib/isodoc/iso/presentation_xml_convert.rb +58 -21
  20. data/lib/metanorma/iso/boilerplate-fr.xml +5 -6
  21. data/lib/metanorma/iso/boilerplate-ru.xml +4 -6
  22. data/lib/metanorma/iso/boilerplate.xml +5 -6
  23. data/lib/metanorma/iso/cleanup.rb +43 -10
  24. data/lib/metanorma/iso/front_id.rb +1 -0
  25. data/lib/metanorma/iso/processor.rb +14 -7
  26. data/lib/metanorma/iso/validate.rb +29 -1
  27. data/lib/metanorma/iso/validate_image.rb +3 -3
  28. data/lib/metanorma/iso/validate_list.rb +122 -0
  29. data/lib/metanorma/iso/validate_section.rb +39 -32
  30. data/lib/metanorma/iso/validate_style.rb +32 -2
  31. data/lib/metanorma/iso/validate_title.rb +13 -1
  32. data/lib/metanorma/iso/version.rb +1 -1
  33. data/metanorma-iso.gemspec +1 -1
  34. data/spec/isodoc/inline_spec.rb +127 -10
  35. data/spec/isodoc/postproc_spec.rb +2 -4
  36. data/spec/isodoc/terms_spec.rb +4 -4
  37. data/spec/metanorma/cleanup_spec.rb +11 -11
  38. data/spec/metanorma/refs_spec.rb +273 -61
  39. data/spec/metanorma/section_spec.rb +18 -26
  40. data/spec/metanorma/validate_spec.rb +448 -17
  41. data/spec/spec_helper.rb +6 -4
  42. data/spec/vcr_cassettes/docrels.yml +393 -0
  43. data/spec/vcr_cassettes/withdrawn_iso.yml +301 -0
  44. metadata +8 -5
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: f550f6f6de1d0b367b35a21f5857f5616d8ab01e392c348988f8432bda72f050
4
- data.tar.gz: a0b04ee7c488547e054bbcfe76847d90bc4cbdb711e8143730034f9e4cec4ef5
3
+ metadata.gz: 7761657a2efbfa702496c692949ac143df0bba062835b781cc9158c2717b4024
4
+ data.tar.gz: c7cd475f6998bede848b173e7dff0510229946ec59285ef294d7d1e08843804e
5
5
  SHA512:
6
- metadata.gz: 2cc09a796e8fb7da929c6bd8ec30ae82394ddc697f0b512f37f117b6d91bda68b25fc8c773587c6d834ce82486607a990e799e6b77aa23ee536f3b4ae085475c
7
- data.tar.gz: a912d817e08a2b77d574076bd94ecfe127ce26274e92791e72d943aa87c410c60760d886bcb5de257c599e947b674c230be779094821ea7f997fdcd9ed23e99b
6
+ metadata.gz: 60feeea49a0f4144a96b4c5a5b49f4fef72df74a90e3bbb51df61d26fc0a02e14ffb225e75b43229cfc986cf61873982b1e8ee7c4efbc9cfc98cc7101134bbdf
7
+ data.tar.gz: 7eff954750a4748af78a8c7577712dd4bdca48b39a17efa4623e49b61d718310ca31d996ed707da4cb523eace8664035eb3d31f305bd107f86b8b7be43adbc4d
data/lib/isodoc/iso/html/header.html CHANGED
@@ -70,15 +70,6 @@ mso-line-height-rule:exactly'><span lang=EN-GB>{{ docnumber_reference }}{{ draft
70
70
 
71
71
  </div>
72
72
 
73
- <div style='mso-element:header' id=ha>
74
-
75
- <p class=MsoHeader style='margin-bottom:18.0pt'><span lang=EN-GB
76
- style='font-size:10.0pt;mso-bidi-font-size:11.0pt;font-weight:normal'>©
77
- {{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ labels["all_rights_reserved"] }}</span><span lang=EN-GB
78
- style='font-weight:normal'><o:p></o:p></span></p>
79
-
80
- </div>
81
-
82
73
  <div style='mso-element:footer' id=efa>
83
74
 
84
75
  <p class=MsoFooter style='margin-top:12.0pt;line-height:12.0pt;mso-line-height-rule:
@@ -97,28 +88,38 @@ style='mso-tab-count:1'>                            
97
88
 
98
89
  </div>
99
90
 
91
+ <div style='mso-element:footer' id=fa>
92
+
93
+ <p class=MsoHeader align=right style='margin-top:18.0pt;margin-right:0cm;
94
+ margin-bottom:24.0pt;margin-left:0cm;text-align:right;line-height:12.0pt;
95
+ mso-line-height-rule:exactly'><span lang=EN-GB style='font-size:10.0pt;
96
+ font-weight:normal'>© {{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ labels["all_rights_reserved"] }}<o:p></o:p></span></p>
97
+
98
+ </div>
99
+
100
+
100
101
  <div style='mso-element:header' id=eh2>
101
- <p class=MsoHeader align=left style='text-align:left;line-height:12.0pt;
102
+ <p class=MsoHeader align=left style='margin-bottom:36.0pt;text-align:left;line-height:12.0pt;
102
103
  mso-line-height-rule:exactly'><span lang=EN-GB>{{ docnumber_reference }}{{ draftinfo }}</span></p>
103
104
  </div>
104
105
 
105
106
  <div style='mso-element:header' id=eh2l>
106
- <p class=MsoHeaderLandscape align=left style='text-align:left;line-height:12.0pt;
107
+ <p class=MsoHeaderLandscape align=left style='margin-bottom:36.0pt;text-align:left;line-height:12.0pt;
107
108
  mso-line-height-rule:exactly'><span lang=EN-GB>{{ docnumber_reference }}{{ draftinfo }}</span></p>
108
109
  </div>
109
110
 
110
111
  <div style='mso-element:header' id=h2>
111
- <p class=MsoHeader align=right style='text-align:right;line-height:12.0pt;
112
+ <p class=MsoHeader align=right style='margin-bottom:36.0pt;text-align:right;line-height:12.0pt;
112
113
  mso-line-height-rule:exactly'><span lang=EN-GB>{{ docnumber_reference }}{{ draftinfo }}</span></p>
113
114
  </div>
114
115
 
115
116
  <div style='mso-element:header' id=h2l>
116
- <p class=MsoHeaderLandscape align=right style='text-align:right;line-height:12.0pt;
117
+ <p class=MsoHeaderLandscape align=right style='margin-bottom:36.0pt;text-align:right;line-height:12.0pt;
117
118
  mso-line-height-rule:exactly'><span lang=EN-GB>{{ docnumber_reference }}{{ draftinfo }}</span></p>
118
119
  </div>
119
120
 
120
121
  <div style='mso-element:footer' id=ef2>
121
- <p class=MsoFooter style='line-height:12.0pt;mso-line-height-rule:exactly'><!--[if supportFields]><span
122
+ <p class=MsoFooter style='margin-bottom:24.0pt;line-height:12.0pt;mso-line-height-rule:exactly'><!--[if supportFields]><span
122
123
  lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
123
124
  style='mso-element:field-begin'></span><span
124
125
  style='mso-spacerun:yes'> </span>PAGE<span style='mso-spacerun:yes'>  
@@ -128,12 +129,13 @@ style='mso-no-proof:yes'>ii</span></span><!--[if supportFields]><span
128
129
  lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
129
130
  style='mso-element:field-end'></span></span><![endif]--><span lang=EN-GB
130
131
  style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span style='mso-tab-count:
131
- 1'>                                                                                                                                                                           </span>©
132
- {{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ labels["all_rights_reserved"] }}<o:p></o:p></span></p>
132
+ 1'>                                                                                                                                                                           </span><span
133
+ lang=EN-GB style='font-size:9.0pt'>©
134
+ {{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ labels["all_rights_reserved"] }}<o:p></o:p></span></span></p>
133
135
  </div>
134
136
 
135
137
  <div style='mso-element:footer' id=ef2l>
136
- <p class=MsoFooterLandscape style='line-height:12.0pt;mso-line-height-rule:exactly'><!--[if supportFields]><span
138
+ <p class=MsoFooterLandscape style='margin-bottom:24.0pt;line-height:12.0pt;mso-line-height-rule:exactly'><!--[if supportFields]><span
137
139
  lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
138
140
  style='mso-element:field-begin'></span><span
139
141
  style='mso-spacerun:yes'> </span>PAGE<span style='mso-spacerun:yes'>  
@@ -143,13 +145,15 @@ style='mso-no-proof:yes'>ii</span></span><!--[if supportFields]><span
143
145
  lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
144
146
  style='mso-element:field-end'></span></span><![endif]--><span lang=EN-GB
145
147
  style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span style='mso-tab-count:
146
- 1'>                                                                                                                                                                           </span>©
147
- {{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ labels["all_rights_reserved"] }}<o:p></o:p></span></p>
148
+ 1'>                                                                                                                                                                           </span><span
149
+ lang=EN-GB style='font-size:9.0pt'>©
150
+ {{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ labels["all_rights_reserved"] }}<o:p></o:p></span></span></p>
148
151
  </div>
149
152
 
150
153
  <div style='mso-element:footer' id=f2>
151
- <p class=MsoFooter style='line-height:12.0pt'><span lang=EN-GB
152
- style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© {{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ labels["all_rights_reserved"] }}<span style='mso-tab-count:1'>                                                                                                                                                                          </span></span><!--[if supportFields]><span
154
+ <p class=MsoFooter style='margin-bottom:24.0pt;line-height:12.0pt'><span lang=EN-GB
155
+ style='font-size:9.0pt'>© {{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ labels["all_rights_reserved"] }}</span><span lang=EN-GB
156
+ style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span style='mso-tab-count:1'>                                                                                                                                                                          </span></span><!--[if supportFields]><span
153
157
  lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
154
158
  style='mso-element:field-begin'></span> PAGE<span style='mso-spacerun:yes'>  
155
159
  </span>\* MERGEFORMAT <span style='mso-element:field-separator'></span></span><![endif]--><span
@@ -161,8 +165,9 @@ style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><o:p></o:p></span></p>
161
165
  </div>
162
166
 
163
167
  <div style='mso-element:footer' id=f2l>
164
- <p class=MsoFooterLandscape style='line-height:12.0pt'><span lang=EN-GB
165
- style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© {{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ labels["all_rights_reserved"] }}<span style='mso-tab-count:1'>                                                                                                                                                                          </span></span><!--[if supportFields]><span
168
+ <p class=MsoFooterLandscape style='margin-bottom:24.0pt;line-height:12.0pt'><span lang=EN-GB
169
+ style='font-size:9.0pt'>© {{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ labels["all_rights_reserved"] }}</span><span lang=EN-GB
170
+ style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span style='mso-tab-count:1'>                                                                                                                                                                          </span></span><!--[if supportFields]><span
166
171
  lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
167
172
  style='mso-element:field-begin'></span> PAGE<span style='mso-spacerun:yes'>  
168
173
  </span>\* MERGEFORMAT <span style='mso-element:field-separator'></span></span><![endif]--><span
@@ -174,7 +179,7 @@ style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><o:p></o:p></span></p>
174
179
  </div>
175
180
 
176
181
  <div style='mso-element:footer' id=ef3>
177
- <p class=MsoFooter style='margin-top:12.0pt;line-height:12.0pt;mso-line-height-rule:
182
+ <p class=MsoFooter style='margin-bottom:24.0pt;line-height:12.0pt;mso-line-height-rule:
178
183
  exactly'><!--[if supportFields]><b style='mso-bidi-font-weight:normal'><span
179
184
  lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
180
185
  style='mso-element:field-begin'></span><span
@@ -185,12 +190,13 @@ mso-bidi-font-size:11.0pt'><span style='mso-no-proof:yes'>2</span></span></b><!-
185
190
  style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
186
191
  mso-bidi-font-size:11.0pt'><span style='mso-element:field-end'></span></span></b><![endif]--><span
187
192
  lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
188
- style='mso-tab-count:1'>                                                                                                                                                                           </span>©
189
- {{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ labels["all_rights_reserved"] }}<o:p></o:p></span></p>
193
+ style='mso-tab-count:1'>                                                                                                                                                                           </span><span lang=EN-GB
194
+ style='font-size:9.0pt'>©
195
+ {{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ labels["all_rights_reserved"] }}<o:p></o:p></span></span></p>
190
196
  </div>
191
197
 
192
198
  <div style='mso-element:footer' id=ef3l>
193
- <p class=MsoFooterLandscape style='margin-top:12.0pt;line-height:12.0pt;mso-line-height-rule:
199
+ <p class=MsoFooterLandscape style='margin-bottom:24.0pt;line-height:12.0pt;mso-line-height-rule:
194
200
  exactly'><!--[if supportFields]><b style='mso-bidi-font-weight:normal'><span
195
201
  lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
196
202
  style='mso-element:field-begin'></span><span
@@ -201,13 +207,15 @@ mso-bidi-font-size:11.0pt'><span style='mso-no-proof:yes'>2</span></span></b><!-
201
207
  style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
202
208
  mso-bidi-font-size:11.0pt'><span style='mso-element:field-end'></span></span></b><![endif]--><span
203
209
  lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
204
- style='mso-tab-count:1'>                                                                                                                                                                           </span>©
205
- {{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ labels["all_rights_reserved"] }}<o:p></o:p></span></p>
210
+ style='mso-tab-count:1'>                                                                                                                                                                           </span><span lang=EN-GB
211
+ style='font-size:9.0pt'>©
212
+ {{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ labels["all_rights_reserved"] }}<o:p></o:p></span></span></p>
206
213
  </div>
207
214
 
208
215
  <div style='mso-element:footer' id=f3>
209
- <p class=MsoFooter style='line-height:12.0pt'><span lang=EN-GB
210
- style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© {{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ labels["all_rights_reserved"] }}<span style='mso-tab-count:1'>                                                                                                                                                                           </span></span><!--[if supportFields]><b
216
+ <p class=MsoFooter style='margin-bottom:24.0pt;line-height:12.0pt'><span lang=EN-GB
217
+ style='font-size:9.0pt'>© {{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ labels["all_rights_reserved"] }}</span><span lang=EN-GB
218
+ style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span style='mso-tab-count:1'>                                                                                                                                                                           </span></span><!--[if supportFields]><b
211
219
  style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
212
220
  mso-bidi-font-size:11.0pt'><span style='mso-element:field-begin'></span>
213
221
  PAGE<span style='mso-spacerun:yes'>   </span>\* MERGEFORMAT <span
@@ -220,8 +228,9 @@ lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><o:p></o:p></span>
220
228
  </div>
221
229
 
222
230
  <div style='mso-element:footer' id=f3l>
223
- <p class=MsoFooterLandscape style='line-height:12.0pt'><span lang=EN-GB
224
- style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© {{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ labels["all_rights_reserved"] }}<span style='mso-tab-count:1'>                                                                                                                                                                           </span></span><!--[if supportFields]><b
231
+ <p class=MsoFooterLandscape style='margin-bottom:24.0pt;line-height:12.0pt'><span lang=EN-GB
232
+ style='font-size:9.0pt'>© {{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ labels["all_rights_reserved"] }}</span><span lang=EN-GB
233
+ style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span style='mso-tab-count:1'>                                                                                                                                                                           </span></span><!--[if supportFields]><b
225
234
  style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
226
235
  mso-bidi-font-size:11.0pt'><span style='mso-element:field-begin'></span>
227
236
  PAGE<span style='mso-spacerun:yes'>   </span>\* MERGEFORMAT <span
data/lib/isodoc/iso/html/isodoc.css CHANGED
@@ -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; }
data/lib/isodoc/iso/html/isodoc.scss CHANGED
@@ -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;
data/lib/isodoc/iso/html/style-human.css CHANGED
@@ -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 {
data/lib/isodoc/iso/html/style-human.scss CHANGED
@@ -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
 
data/lib/isodoc/iso/html/style-iso.css CHANGED
@@ -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 {
data/lib/isodoc/iso/html/style-iso.scss CHANGED
@@ -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
 
data/lib/isodoc/iso/html/word_iso_titlepage.html CHANGED
@@ -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
 
data/lib/isodoc/iso/html/wordstyle.css CHANGED
@@ -383,7 +383,7 @@ h1.Annex {
383
383
  font-size: {{normalfontsize}};
384
384
  font-weight: normal;
385
385
  {% else %}
386
- font-size: 13.0pt;
386
+ font-size: 11.0pt;
387
387
  font-weight: bold;
388
388
  {% endif %}
389
389
  mso-bidi-font-size: {{normalfontsize}};
@@ -421,7 +421,7 @@ h2 {
421
421
  font-size: {{normalfontsize}};
422
422
  font-weight: normal;
423
423
  {% else %}
424
- font-size: 13.0pt;
424
+ font-size: 11.0pt;
425
425
  font-weight: bold;
426
426
  {% endif %}
427
427
  font-family: {{headerfont}};
@@ -1169,6 +1169,26 @@ p.Tablebody, li.Tablebody, div.Tablebody {
1169
1169
  mso-fareast-font-family: "SimSun",serif;
1170
1170
  mso-hansi-font-family: {{bodyfont}}; }
1171
1171
 
1172
+ p.TOCTitle, li.TOCTitle, div.TOCTitle {
1173
+ mso-style-name: "TOC Title";
1174
+ mso-style-unhide: no;
1175
+ margin-top: 0in;
1176
+ margin-right: 0in;
1177
+ margin-bottom: {{normalfontsize}};
1178
+ margin-left: 0in;
1179
+ text-align: left;
1180
+ page-break-after: avoid;
1181
+ mso-pagination: none;
1182
+ mso-hyphenate: none;
1183
+ mso-layout-grid-align: none;
1184
+ font-size: {{normalfontsize}};
1185
+ mso-bidi-font-size: 10.0pt;
1186
+ font-weight: bold;
1187
+ font-family: {{headerfont}};
1188
+ mso-fareast-font-family: {{headerfont}};
1189
+ mso-bidi-font-family: {{headerfont}};
1190
+ mso-fareast-language: EN-US; }
1191
+
1172
1192
  /* Page Definitions */
1173
1193
  @page {
1174
1194
  mso-mirror-margins: yes;
@@ -1179,13 +1199,14 @@ p.Tablebody, li.Tablebody, div.Tablebody {
1179
1199
  mso-facing-pages: yes; }
1180
1200
 
1181
1201
  @page WordSection1 {
1182
- size: 595.0pt 842.0pt;
1183
- margin: 72.0pt 90.0pt 72.0pt 90.0pt;
1184
- mso-header-margin: 35.4pt;
1185
- mso-footer-margin: 35.4pt;
1202
+ size: 595.3pt 841.9pt;
1203
+ margin: 39.7pt 36.85pt 14.2pt 42.55pt;
1204
+ mso-header-margin: 35.45pt;
1205
+ mso-footer-margin: 0cm;
1206
+ mso-gutter-margin: 1.0cm;
1186
1207
  mso-even-header: url("file:///C:/Doc/FILENAME_files/header.html") eha;
1187
- mso-header: url("file:///C:/Doc/FILENAME_files/header.html") ha;
1188
1208
  mso-even-footer: url("file:///C:/Doc/FILENAME_files/header.html") efa;
1209
+ mso-footer: url("file:///C:/Doc/FILENAME_files/header.html") fa;
1189
1210
  mso-paper-source: 0; }
1190
1211
 
1191
1212
  div.WordSection1 {
@@ -1193,9 +1214,10 @@ div.WordSection1 {
1193
1214
 
1194
1215
  @page WordSection2 {
1195
1216
  size: 595.3pt 841.9pt;
1196
- margin: 39.7pt 53.85pt 1.0cm 53.85pt;
1217
+ margin: 39.7pt 36.85pt 14.2pt 42.55pt;
1197
1218
  mso-header-margin: 35.45pt;
1198
- mso-footer-margin: 14.2pt;
1219
+ mso-footer-margin: 0cm;
1220
+ mso-gutter-margin: 1.0cm;
1199
1221
  mso-page-numbers: roman-lower;
1200
1222
  mso-even-header: url("file:///C:/Doc/FILENAME_files/header.html") eh2;
1201
1223
  mso-header: url("file:///C:/Doc/FILENAME_files/header.html") h2;
@@ -1205,9 +1227,10 @@ div.WordSection1 {
1205
1227
 
1206
1228
  @page WordSection2L {
1207
1229
  size: 841.9pt 595.3pt;
1208
- margin: 39.7pt 53.85pt 1.0cm 53.85pt;
1230
+ margin: 39.7pt 36.85pt 14.2pt 42.55pt;
1209
1231
  mso-header-margin: 35.45pt;
1210
- mso-footer-margin: 14.2pt;
1232
+ mso-footer-margin: 0cm;
1233
+ mso-gutter-margin: 1.0cm;
1211
1234
  mso-even-header: url("file:///C:/Doc/FILENAME_files/header.html") eh2l;
1212
1235
  mso-header: url("file:///C:/Doc/FILENAME_files/header.html") h2l;
1213
1236
  mso-even-footer: url("file:///C:/Doc/FILENAME_files/header.html") ef2l;
@@ -1216,9 +1239,10 @@ div.WordSection1 {
1216
1239
 
1217
1240
  @page WordSection2P {
1218
1241
  size: 595.3pt 841.9pt;
1219
- margin: 39.7pt 53.85pt 1.0cm 53.85pt;
1242
+ margin: 39.7pt 36.85pt 14.2pt 42.55pt;
1220
1243
  mso-header-margin: 35.45pt;
1221
- mso-footer-margin: 14.2pt;
1244
+ mso-footer-margin: 0cm;
1245
+ mso-gutter-margin: 1.0cm;
1222
1246
  mso-even-header: url("file:///C:/Doc/FILENAME_files/header.html") eh2;
1223
1247
  mso-header: url("file:///C:/Doc/FILENAME_files/header.html") h2;
1224
1248
  mso-even-footer: url("file:///C:/Doc/FILENAME_files/header.html") ef2;
@@ -1230,9 +1254,10 @@ div.WordSection2 {
1230
1254
 
1231
1255
  @page WordSection3 {
1232
1256
  size: 595.3pt 841.9pt;
1233
- margin: 39.7pt 53.85pt 1.0cm 53.85pt;
1257
+ margin: 39.7pt 36.85pt 14.2pt 42.55pt;
1234
1258
  mso-header-margin: 35.45pt;
1235
- mso-footer-margin: 14.2pt;
1259
+ mso-footer-margin: 0cm;
1260
+ mso-gutter-margin: 1.0cm;
1236
1261
  mso-page-numbers: 1;
1237
1262
  mso-even-header: url("file:///C:/Doc/FILENAME_files/header.html") eh2;
1238
1263
  mso-header: url("file:///C:/Doc/FILENAME_files/header.html") h2;
@@ -1242,9 +1267,10 @@ div.WordSection2 {
1242
1267
 
1243
1268
  @page WordSection3L {
1244
1269
  size: 841.9pt 595.3pt;
1245
- margin: 39.7pt 53.85pt 1.0cm 53.85pt;
1270
+ margin: 39.7pt 36.85pt 14.2pt 42.55pt;
1246
1271
  mso-header-margin: 35.45pt;
1247
- mso-footer-margin: 14.2pt;
1272
+ mso-footer-margin: 0cm;
1273
+ mso-gutter-margin: 1.0cm;
1248
1274
  mso-even-header: url("file:///C:/Doc/FILENAME_files/header.html") eh2l;
1249
1275
  mso-header: url("file:///C:/Doc/FILENAME_files/header.html") h2l;
1250
1276
  mso-even-footer: url("file:///C:/Doc/FILENAME_files/header.html") ef3l;
@@ -1253,9 +1279,10 @@ div.WordSection2 {
1253
1279
 
1254
1280
  @page WordSection3P {
1255
1281
  size: 595.3pt 841.9pt;
1256
- margin: 39.7pt 53.85pt 1.0cm 53.85pt;
1282
+ margin: 39.7pt 36.85pt 14.2pt 42.55pt;
1257
1283
  mso-header-margin: 35.45pt;
1258
- mso-footer-margin: 14.2pt;
1284
+ mso-footer-margin: 0cm;
1285
+ mso-gutter-margin: 1.0cm;
1259
1286
  mso-even-header: url("file:///C:/Doc/FILENAME_files/header.html") eh2;
1260
1287
  mso-header: url("file:///C:/Doc/FILENAME_files/header.html") h2;
1261
1288
  mso-even-footer: url("file:///C:/Doc/FILENAME_files/header.html") ef3;