metanorma-iso 2.0.5 → 2.0.6

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/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 +26 -19
  11. data/lib/isodoc/iso/html/wordstyle.scss +32 -25
  12. data/lib/isodoc/iso/i18n-en.yaml +2 -2
  13. data/lib/isodoc/iso/i18n-fr.yaml +2 -2
  14. data/lib/isodoc/iso/i18n-ru.yaml +2 -2
  15. data/lib/isodoc/iso/i18n-zh-Hans.yaml +2 -2
  16. data/lib/isodoc/iso/iso.amendment.xsl +83 -22
  17. data/lib/isodoc/iso/iso.international-standard.xsl +83 -22
  18. data/lib/metanorma/iso/boilerplate-fr.xml +5 -6
  19. data/lib/metanorma/iso/boilerplate-ru.xml +4 -6
  20. data/lib/metanorma/iso/boilerplate.xml +5 -6
  21. data/lib/metanorma/iso/cleanup.rb +8 -2
  22. data/lib/metanorma/iso/front_id.rb +1 -0
  23. data/lib/metanorma/iso/validate_list.rb +20 -5
  24. data/lib/metanorma/iso/version.rb +1 -1
  25. data/metanorma-iso.gemspec +1 -1
  26. data/spec/metanorma/base_spec.rb +0 -1
  27. data/spec/metanorma/cleanup_spec.rb +10 -10
  28. data/spec/metanorma/refs_spec.rb +85 -144
  29. data/spec/metanorma/section_spec.rb +15 -18
  30. data/spec/metanorma/validate_spec.rb +46 -25
  31. data/spec/spec_helper.rb +2 -2
  32. data/spec/vcr_cassettes/docrels.yml +33 -33
  33. data/spec/vcr_cassettes/withdrawn_iso.yml +31 -31
  34. metadata +5 -5
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: f140f4856789bed65a390730d55632ca2f620174d21120c83accc65d3e4510e7
4
- data.tar.gz: 41cd96ea7bb74776030af95a192063c4236aad23ab01a2756fa1fb7cef11fd07
3
+ metadata.gz: 63ecf1ebdfd0ef2668af3e53087b9f962bd1e05ca50ec4e52209582ad714d24d
4
+ data.tar.gz: 955d7831d3fb5426b694deb29c856304fdbc18f5053b3d1eeaf763df837e3a0f
5
5
  SHA512:
6
- metadata.gz: eb2eea8e66a5fa1ae643ed51449c35e56468419920172b3fb4d34a0eaa017ab050828bfb0b00137aa25784a5def33d17be61aded658ae41191805c061ca80fab
7
- data.tar.gz: 0b34c98d38635fe1b92d4ccbc9dc97f4fd6f385ac5b06b6c222ab3777d3baf8c047d80c9697dfbc8539dac039465896cc7ec7104105ba7aed46e403cdcff1829
6
+ metadata.gz: cecbe0d887a0a4f22bc32714b44ef7a5bfc2414cdda4e0176cb939ddcc82966b4c189930c15f92a8293fe00f502e1fa1c762664381891847882f65e542b6a381
7
+ data.tar.gz: a53c81228ae4fec81b760f5dc414284931ef7d180dd2b134bb579a0114aaa4bdc523414f4303736bbc45ab5dbdc585cdad428d9ac1ab4050707daa3e1391dde0
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}};
@@ -1199,13 +1199,14 @@ p.TOCTitle, li.TOCTitle, div.TOCTitle {
1199
1199
  mso-facing-pages: yes; }
1200
1200
 
1201
1201
  @page WordSection1 {
1202
- size: 595.0pt 842.0pt;
1203
- margin: 72.0pt 90.0pt 72.0pt 90.0pt;
1204
- mso-header-margin: 35.4pt;
1205
- 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;
1206
1207
  mso-even-header: url("file:///C:/Doc/FILENAME_files/header.html") eha;
1207
- mso-header: url("file:///C:/Doc/FILENAME_files/header.html") ha;
1208
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;
1209
1210
  mso-paper-source: 0; }
1210
1211
 
1211
1212
  div.WordSection1 {
@@ -1213,9 +1214,10 @@ div.WordSection1 {
1213
1214
 
1214
1215
  @page WordSection2 {
1215
1216
  size: 595.3pt 841.9pt;
1216
- margin: 39.7pt 53.85pt 1.0cm 53.85pt;
1217
+ margin: 39.7pt 36.85pt 14.2pt 42.55pt;
1217
1218
  mso-header-margin: 35.45pt;
1218
- mso-footer-margin: 14.2pt;
1219
+ mso-footer-margin: 0cm;
1220
+ mso-gutter-margin: 1.0cm;
1219
1221
  mso-page-numbers: roman-lower;
1220
1222
  mso-even-header: url("file:///C:/Doc/FILENAME_files/header.html") eh2;
1221
1223
  mso-header: url("file:///C:/Doc/FILENAME_files/header.html") h2;
@@ -1225,9 +1227,10 @@ div.WordSection1 {
1225
1227
 
1226
1228
  @page WordSection2L {
1227
1229
  size: 841.9pt 595.3pt;
1228
- margin: 39.7pt 53.85pt 1.0cm 53.85pt;
1230
+ margin: 39.7pt 36.85pt 14.2pt 42.55pt;
1229
1231
  mso-header-margin: 35.45pt;
1230
- mso-footer-margin: 14.2pt;
1232
+ mso-footer-margin: 0cm;
1233
+ mso-gutter-margin: 1.0cm;
1231
1234
  mso-even-header: url("file:///C:/Doc/FILENAME_files/header.html") eh2l;
1232
1235
  mso-header: url("file:///C:/Doc/FILENAME_files/header.html") h2l;
1233
1236
  mso-even-footer: url("file:///C:/Doc/FILENAME_files/header.html") ef2l;
@@ -1236,9 +1239,10 @@ div.WordSection1 {
1236
1239
 
1237
1240
  @page WordSection2P {
1238
1241
  size: 595.3pt 841.9pt;
1239
- margin: 39.7pt 53.85pt 1.0cm 53.85pt;
1242
+ margin: 39.7pt 36.85pt 14.2pt 42.55pt;
1240
1243
  mso-header-margin: 35.45pt;
1241
- mso-footer-margin: 14.2pt;
1244
+ mso-footer-margin: 0cm;
1245
+ mso-gutter-margin: 1.0cm;
1242
1246
  mso-even-header: url("file:///C:/Doc/FILENAME_files/header.html") eh2;
1243
1247
  mso-header: url("file:///C:/Doc/FILENAME_files/header.html") h2;
1244
1248
  mso-even-footer: url("file:///C:/Doc/FILENAME_files/header.html") ef2;
@@ -1250,9 +1254,10 @@ div.WordSection2 {
1250
1254
 
1251
1255
  @page WordSection3 {
1252
1256
  size: 595.3pt 841.9pt;
1253
- margin: 39.7pt 53.85pt 1.0cm 53.85pt;
1257
+ margin: 39.7pt 36.85pt 14.2pt 42.55pt;
1254
1258
  mso-header-margin: 35.45pt;
1255
- mso-footer-margin: 14.2pt;
1259
+ mso-footer-margin: 0cm;
1260
+ mso-gutter-margin: 1.0cm;
1256
1261
  mso-page-numbers: 1;
1257
1262
  mso-even-header: url("file:///C:/Doc/FILENAME_files/header.html") eh2;
1258
1263
  mso-header: url("file:///C:/Doc/FILENAME_files/header.html") h2;
@@ -1262,9 +1267,10 @@ div.WordSection2 {
1262
1267
 
1263
1268
  @page WordSection3L {
1264
1269
  size: 841.9pt 595.3pt;
1265
- margin: 39.7pt 53.85pt 1.0cm 53.85pt;
1270
+ margin: 39.7pt 36.85pt 14.2pt 42.55pt;
1266
1271
  mso-header-margin: 35.45pt;
1267
- mso-footer-margin: 14.2pt;
1272
+ mso-footer-margin: 0cm;
1273
+ mso-gutter-margin: 1.0cm;
1268
1274
  mso-even-header: url("file:///C:/Doc/FILENAME_files/header.html") eh2l;
1269
1275
  mso-header: url("file:///C:/Doc/FILENAME_files/header.html") h2l;
1270
1276
  mso-even-footer: url("file:///C:/Doc/FILENAME_files/header.html") ef3l;
@@ -1273,9 +1279,10 @@ div.WordSection2 {
1273
1279
 
1274
1280
  @page WordSection3P {
1275
1281
  size: 595.3pt 841.9pt;
1276
- margin: 39.7pt 53.85pt 1.0cm 53.85pt;
1282
+ margin: 39.7pt 36.85pt 14.2pt 42.55pt;
1277
1283
  mso-header-margin: 35.45pt;
1278
- mso-footer-margin: 14.2pt;
1284
+ mso-footer-margin: 0cm;
1285
+ mso-gutter-margin: 1.0cm;
1279
1286
  mso-even-header: url("file:///C:/Doc/FILENAME_files/header.html") eh2;
1280
1287
  mso-header: url("file:///C:/Doc/FILENAME_files/header.html") h2;
1281
1288
  mso-even-footer: url("file:///C:/Doc/FILENAME_files/header.html") ef3;
data/lib/isodoc/iso/html/wordstyle.scss CHANGED
@@ -361,7 +361,7 @@ h1.Annex
361
361
  font-size:$normalfontsize;
362
362
  font-weight: normal ;
363
363
  {% else %}
364
- font-size:13.0pt;
364
+ font-size:11.0pt;
365
365
  font-weight:bold;
366
366
  {% endif %}
367
367
  mso-bidi-font-size:$normalfontsize;
@@ -398,7 +398,7 @@ h2
398
398
  font-size:$normalfontsize;
399
399
  font-weight: normal ;
400
400
  {% else %}
401
- font-size:13.0pt;
401
+ font-size:11.0pt;
402
402
  font-weight:bold;
403
403
  {% endif %}
404
404
  font-family:$headerfont;
@@ -1132,21 +1132,23 @@ p.TOCTitle, li.TOCTitle, div.TOCTitle
1132
1132
  mso-facing-pages:yes;
1133
1133
  }
1134
1134
  @page WordSection1
1135
- {size:595.0pt 842.0pt;
1136
- margin:72.0pt 90.0pt 72.0pt 90.0pt;
1137
- mso-header-margin:35.4pt;
1138
- mso-footer-margin:35.4pt;
1135
+ {size:595.3pt 841.9pt;
1136
+ margin:39.7pt 36.85pt 14.2pt 42.55pt;
1137
+ mso-header-margin:35.45pt;
1138
+ mso-footer-margin:0cm;
1139
+ mso-gutter-margin:1.0cm;
1139
1140
  mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eha;
1140
- mso-header:url("file:///C:/Doc/FILENAME_files/header.html") ha;
1141
1141
  mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") efa;
1142
+ mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") fa;
1142
1143
  mso-paper-source:0;}
1143
1144
  div.WordSection1
1144
1145
  {page:WordSection1;}
1145
1146
  @page WordSection2
1146
1147
  {size:595.3pt 841.9pt;
1147
- margin:39.7pt 53.85pt 1.0cm 53.85pt;
1148
- mso-header-margin:35.45pt;
1149
- mso-footer-margin:14.2pt;
1148
+ margin:39.7pt 36.85pt 14.2pt 42.55pt;
1149
+ mso-header-margin:35.45pt;
1150
+ mso-footer-margin:0cm;
1151
+ mso-gutter-margin:1.0cm;
1150
1152
  mso-page-numbers:roman-lower;
1151
1153
  mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2;
1152
1154
  mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
@@ -1155,9 +1157,10 @@ div.WordSection1
1155
1157
  mso-paper-source:0;}
1156
1158
  @page WordSection2L
1157
1159
  {size:841.9pt 595.3pt;
1158
- margin:39.7pt 53.85pt 1.0cm 53.85pt;
1159
- mso-header-margin:35.45pt;
1160
- mso-footer-margin:14.2pt;
1160
+ margin:39.7pt 36.85pt 14.2pt 42.55pt;
1161
+ mso-header-margin:35.45pt;
1162
+ mso-footer-margin:0cm;
1163
+ mso-gutter-margin:1.0cm;
1161
1164
  mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2l;
1162
1165
  mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2l;
1163
1166
  mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef2l;
@@ -1165,9 +1168,10 @@ div.WordSection1
1165
1168
  mso-paper-source:0;}
1166
1169
  @page WordSection2P
1167
1170
  {size:595.3pt 841.9pt;
1168
- margin:39.7pt 53.85pt 1.0cm 53.85pt;
1169
- mso-header-margin:35.45pt;
1170
- mso-footer-margin:14.2pt;
1171
+ margin:39.7pt 36.85pt 14.2pt 42.55pt;
1172
+ mso-header-margin:35.45pt;
1173
+ mso-footer-margin:0cm;
1174
+ mso-gutter-margin:1.0cm;
1171
1175
  mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2;
1172
1176
  mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
1173
1177
  mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef2;
@@ -1177,9 +1181,10 @@ div.WordSection2
1177
1181
  {page:WordSection2;}
1178
1182
  @page WordSection3
1179
1183
  {size:595.3pt 841.9pt;
1180
- margin:39.7pt 53.85pt 1.0cm 53.85pt;
1181
- mso-header-margin:35.45pt;
1182
- mso-footer-margin:14.2pt;
1184
+ margin:39.7pt 36.85pt 14.2pt 42.55pt;
1185
+ mso-header-margin:35.45pt;
1186
+ mso-footer-margin:0cm;
1187
+ mso-gutter-margin:1.0cm;
1183
1188
  mso-page-numbers:1;
1184
1189
  mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2;
1185
1190
  mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
@@ -1188,9 +1193,10 @@ div.WordSection2
1188
1193
  mso-paper-source:0;}
1189
1194
  @page WordSection3L
1190
1195
  {size:841.9pt 595.3pt;
1191
- margin:39.7pt 53.85pt 1.0cm 53.85pt;
1192
- mso-header-margin:35.45pt;
1193
- mso-footer-margin:14.2pt;
1196
+ margin:39.7pt 36.85pt 14.2pt 42.55pt;
1197
+ mso-header-margin:35.45pt;
1198
+ mso-footer-margin:0cm;
1199
+ mso-gutter-margin:1.0cm;
1194
1200
  mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2l;
1195
1201
  mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2l;
1196
1202
  mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef3l;
@@ -1198,9 +1204,10 @@ div.WordSection2
1198
1204
  mso-paper-source:0;}
1199
1205
  @page WordSection3P
1200
1206
  {size:595.3pt 841.9pt;
1201
- margin:39.7pt 53.85pt 1.0cm 53.85pt;
1202
- mso-header-margin:35.45pt;
1203
- mso-footer-margin:14.2pt;
1207
+ margin:39.7pt 36.85pt 14.2pt 42.55pt;
1208
+ mso-header-margin:35.45pt;
1209
+ mso-footer-margin:0cm;
1210
+ mso-gutter-margin:1.0cm;
1204
1211
  mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2;
1205
1212
  mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
1206
1213
  mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef3;
data/lib/isodoc/iso/i18n-en.yaml CHANGED
@@ -4,9 +4,9 @@ term_def_boilerplate: |
4
4
 
5
5
  <ul>
6
6
  <li> <p>ISO Online browsing platform: available at
7
- <link target="http://www.iso.org/obp"/>.</p></li>
7
+ <link target="https://www.iso.org/obp"/></p></li>
8
8
  <li> <p>IEC Electropedia: available at
9
- <link target="http://www.electropedia.org"/>.
9
+ <link target="https://www.electropedia.org"/>
10
10
  </p> </li> </ul>
11
11
  all_rights_reserved: All rights reserved
12
12
  reference_number: Reference Number
data/lib/isodoc/iso/i18n-fr.yaml CHANGED
@@ -4,9 +4,9 @@ term_def_boilerplate: |
4
4
  suivantes:</p>
5
5
  <ul>
6
6
  <li> <p>ISO Online browsing platform: disponible à l'adresse
7
- <link target="http://www.iso.org/obp"/>.</p></li>
7
+ <link target="https://www.iso.org/obp"/></p></li>
8
8
  <li> <p>IEC Electropedia: disponible à l'adresse
9
- <link target="http://www.electropedia.org"/>.
9
+ <link target="https://www.electropedia.org"/>
10
10
  </p> </li> </ul>
11
11
  all_rights_reserved: Tous droits réservés
12
12
  reference_number: Numéro de référence