metanorma-iso 2.0.5 → 2.0.7

Sign up to get free protection for your applications and to get access to all the features.
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
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: f140f4856789bed65a390730d55632ca2f620174d21120c83accc65d3e4510e7
4
- data.tar.gz: 41cd96ea7bb74776030af95a192063c4236aad23ab01a2756fa1fb7cef11fd07
3
+ metadata.gz: d0ab6798337782ba38553fa7a2bff698116c2ab6a2a3f86ff1c527de2603e4c6
4
+ data.tar.gz: 5fb2bd8e338ad4d7277cd6a5459ba41ad93d9dcabe88816304f437b7ba7f7704
5
5
  SHA512:
6
- metadata.gz: eb2eea8e66a5fa1ae643ed51449c35e56468419920172b3fb4d34a0eaa017ab050828bfb0b00137aa25784a5def33d17be61aded658ae41191805c061ca80fab
7
- data.tar.gz: 0b34c98d38635fe1b92d4ccbc9dc97f4fd6f385ac5b06b6c222ab3777d3baf8c047d80c9697dfbc8539dac039465896cc7ec7104105ba7aed46e403cdcff1829
6
+ metadata.gz: 332c563391b705ca5c237770e39a48ec8b3c6a05fa97114544ce6a0d3f26662520953afb111c4205a6b5b78fb2e449c801a7e72c684bf738fe0264fd8ad90b75
7
+ data.tar.gz: 219553636a274835f7e1f44ae0818ac568947014a89958b540bae0057912f3efa686cce6c9230158090c75593807df5a47152bd69dcd056f002ff3925f402d34
data/lib/isodoc/iso/base_convert.rb CHANGED
@@ -37,9 +37,8 @@ module IsoDoc
37
37
  end
38
38
 
39
39
  def example_p_parse(node, div)
40
- name = node&.at(ns("./name"))&.remove
41
40
  div.p do |p|
42
- example_span_label(node, p, name)
41
+ example_span_label(node, p, node&.at(ns("./name"))&.remove)
43
42
  insert_tab(p, 1)
44
43
  node.first_element_child.children.each { |n| parse(n, p) }
45
44
  end
@@ -163,7 +162,8 @@ module IsoDoc
163
162
  def clause_etc1(clause, out, num)
164
163
  out.div **attr_code(
165
164
  id: clause["id"],
166
- class: clause.name == "definitions" ? "Symbols" : nil) do |div|
165
+ class: clause.name == "definitions" ? "Symbols" : nil,
166
+ ) do |div|
167
167
  num = num + 1
168
168
  clause_name(num, clause&.at(ns("./title")), div, nil)
169
169
  clause.elements.each do |e|
data/lib/isodoc/iso/html/header-dis.html ADDED
@@ -0,0 +1,391 @@
1
+ <html xmlns:v="urn:schemas-microsoft-com:vml"
2
+ xmlns:o="urn:schemas-microsoft-com:office:office"
3
+ xmlns:w="urn:schemas-microsoft-com:office:word"
4
+ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml"
5
+ xmlns:mv="http://macVmlSchemaUri" xmlns="http://www.w3.org/TR/REC-html40">
6
+
7
+ <head>
8
+ <meta name=Title content="">
9
+ <meta name=Keywords content="">
10
+ <meta http-equiv=Content-Type content="text/html; charset=utf-8">
11
+ <meta name=ProgId content=Word.Document>
12
+ <meta name=Generator content="Microsoft Word 15">
13
+ <meta name=Originator content="Microsoft Word 15">
14
+ <link id=Main-File rel=Main-File href="../{{ filename }}.html">
15
+ <!--[if gte mso 9]><xml>
16
+ <o:shapedefaults v:ext="edit" spidmax="2049"/>
17
+ </xml><xml>
18
+ <o:shapelayout v:ext="edit">
19
+ <o:idmap v:ext="edit" data="1"/>
20
+ </o:shapelayout></xml><![endif]-->
21
+ </head>
22
+
23
+ <body lang=EN link=blue vlink="#954F72">
24
+
25
+ <div style='mso-element:footnote-separator' id=fs>
26
+
27
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
28
+ normal'><span lang=EN-GB><span style='mso-special-character:footnote-separator'><![if !supportFootnotes]>
29
+
30
+ <hr align=left size=1 width="33%">
31
+
32
+ <![endif]></span></span></p>
33
+
34
+ </div>
35
+
36
+ <div style='mso-element:footnote-continuation-separator' id=fcs>
37
+
38
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
39
+ normal'><span lang=EN-GB><span style='mso-special-character:footnote-continuation-separator'><![if !supportFootnotes]>
40
+
41
+ <hr align=left size=1>
42
+
43
+ <![endif]></span></span></p>
44
+
45
+ </div>
46
+
47
+ <div style='mso-element:endnote-separator' id=es>
48
+
49
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
50
+ normal'><span lang=EN-GB><span style='mso-special-character:footnote-separator'><![if !supportFootnotes]>
51
+
52
+ <hr align=left size=1 width="33%">
53
+
54
+ <![endif]></span></span></p>
55
+
56
+ </div>
57
+
58
+ <div style='mso-element:endnote-continuation-separator' id=ecs>
59
+
60
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
61
+ normal'><span lang=EN-GB><span style='mso-special-character:footnote-continuation-separator'><![if !supportFootnotes]>
62
+
63
+ <hr align=left size=1>
64
+
65
+ <![endif]></span></span></p>
66
+
67
+ </div>
68
+
69
+ <div style='mso-element:header' id=eha>
70
+
71
+ <p class=MsoHeader align=left style='text-align:left;line-height:12.0pt;
72
+ mso-line-height-rule:exactly'><span lang=EN-GB style='mso-no-proof:yes'><!--[if gte vml 1]><v:shapetype
73
+ id="_x0000_t202" coordsize="21600,21600" o:spt="202" path="m,l,21600r21600,l21600,xe">
74
+ <v:stroke joinstyle="miter"/>
75
+ <v:path gradientshapeok="t" o:connecttype="rect"/>
76
+ </v:shapetype><v:shape id="WordArt_x0020_2" o:spid="_x0000_s1026" type="#_x0000_t202"
77
+ style='position:absolute;margin-left:0;margin-top:0;width:284.05pt;height:16.75pt;
78
+ z-index:251658240;visibility:visible;mso-wrap-style:square;
79
+ mso-width-percent:0;mso-height-percent:0;mso-wrap-distance-left:9pt;
80
+ mso-wrap-distance-top:0;mso-wrap-distance-right:9pt;
81
+ mso-wrap-distance-bottom:0;mso-position-horizontal:center;
82
+ mso-position-horizontal-relative:page;mso-position-vertical:bottom;
83
+ mso-position-vertical-relative:page;mso-width-percent:0;mso-height-percent:0;
84
+ mso-width-relative:page;mso-height-relative:page;v-text-anchor:top' o:gfxdata="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
112
+ BADzAAAAPwUAAAAA
113
+ " filled="f" stroked="f">
114
+ <v:stroke joinstyle="round"/>
115
+ <v:path arrowok="t"/>
116
+ <v:textbox inset="0,0,0,0">
117
+ <![if !mso]>
118
+ <table cellpadding=0 cellspacing=0 width="100%">
119
+ <tr>
120
+ <td><![endif]>
121
+ <div>
122
+ <p class=MsoNormal align=center style='text-align:center'><span lang=EN-GB
123
+ style='font-size:24.0pt;color:#C45911;mso-style-textfill-fill-color:#C45911;
124
+ mso-style-textfill-fill-alpha:50.0%'>Edited DIS - MUST BE USED FOR FINAL
125
+ DRAFT<o:p></o:p></span></p>
126
+ </div>
127
+ <![if !mso]></td>
128
+ </tr>
129
+ </table>
130
+ <![endif]></v:textbox>
131
+ <w:wrap anchorx="page" anchory="page"/>
132
+ </v:shape><![endif]--></span><span lang=EN-GB>{{ docnumber_reference }}{{ draftinfo }}</span></p>
133
+
134
+ </div>
135
+
136
+ <div style='mso-element:header' id=h1>
137
+
138
+ <p class=MsoHeader align=right style='text-align:right;line-height:12.0pt;
139
+ mso-line-height-rule:exactly'><span lang=EN-GB style='mso-no-proof:yes'><!--[if gte vml 1]><v:shape
140
+ id="WordArt_x0020_1" o:spid="_x0000_s1025" type="#_x0000_t202" style='position:absolute;
141
+ left:0;text-align:left;margin-left:0;margin-top:0;width:284.05pt;height:16.75pt;
142
+ z-index:251659264;visibility:visible;mso-wrap-style:square;
143
+ mso-width-percent:0;mso-height-percent:0;mso-wrap-distance-left:9pt;
144
+ mso-wrap-distance-top:0;mso-wrap-distance-right:9pt;
145
+ mso-wrap-distance-bottom:0;mso-position-horizontal:center;
146
+ mso-position-horizontal-relative:page;mso-position-vertical:bottom;
147
+ mso-position-vertical-relative:page;mso-width-percent:0;mso-height-percent:0;
148
+ mso-width-relative:page;mso-height-relative:page;v-text-anchor:top' o:gfxdata="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
176
+ AAAEAAQA8wAAAEMFAAAAAA==
177
+ " filled="f" stroked="f">
178
+ <v:stroke joinstyle="round"/>
179
+ <v:path arrowok="t"/>
180
+ <v:textbox inset="0,0,0,0">
181
+ <![if !mso]>
182
+ <table cellpadding=0 cellspacing=0 width="100%">
183
+ <tr>
184
+ <td><![endif]>
185
+ <div>
186
+ <p class=MsoNormal align=center style='text-align:center'><span lang=EN-GB
187
+ style='font-size:24.0pt;color:#C45911;mso-style-textfill-fill-color:#C45911;
188
+ mso-style-textfill-fill-alpha:50.0%'>Edited DIS - MUST BE USED FOR FINAL
189
+ DRAFT<o:p></o:p></span></p>
190
+ </div>
191
+ <![if !mso]></td>
192
+ </tr>
193
+ </table>
194
+ <![endif]></v:textbox>
195
+ <w:wrap anchorx="page" anchory="page"/>
196
+ </v:shape><![endif]--></span><span lang=EN-GB>{{ docnumber_reference }}{{ draftinfo }}</span></p>
197
+
198
+ </div>
199
+
200
+
201
+ <div style='mso-element:footer' id=efa>
202
+
203
+ <p class=MsoFooter style='line-height:12.0pt;mso-line-height-rule:
204
+ exactly'><!--[if supportFields]><span
205
+ lang=EN-GB style='font-size:10.0pt'><span style='mso-element:field-begin'></span><span
206
+ style='mso-spacerun:yes'> </span>PAGE<span style='mso-spacerun:yes'>  
207
+ </span>\* MERGEFORMAT <span style='mso-element:field-separator'></span></span><![endif]--><span
208
+ lang=EN-GB style='font-size:10.0pt'><span style='mso-no-proof:yes'>2</span></span><!--[if supportFields]><span
209
+ lang=EN-GB style='font-size:10.0pt'><span style='mso-element:field-end'></span></span><![endif]--><span
210
+ lang=EN-GB style='font-size:10.0pt;'><span
211
+ style='mso-tab-count:1'>                                                                                                                                                                           </span>©
212
+ {{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ labels["all_rights_reserved"] }}<o:p></o:p></span></p>
213
+
214
+ </div>
215
+
216
+ <div style='mso-element:footer' id=fa>
217
+
218
+ <p class=MsoFooter style='line-height:12.0pt;mso-line-height-rule:exactly'><span
219
+ lang=EN-GB style='font-size:10.0pt'>© {{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ labels["all_rights_reserved"] }}<span
220
+ style='mso-tab-count:1'>                                                                                                                                                                            </span></span><!--[if supportFields]><span
221
+ lang=EN-GB style='font-size:10.0pt'><span style='mso-element:field-begin'></span>
222
+ PAGE<span style='mso-spacerun:yes'>   </span>\* MERGEFORMAT <span
223
+ style='mso-element:field-separator'></span></span><![endif]--><span lang=EN-GB
224
+ style='font-size:10.0pt'><span style='mso-no-proof:yes'>3</span></span><!--[if supportFields]><span
225
+ lang=EN-GB style='font-size:10.0pt'><span style='mso-element:field-end'></span></span><![endif]--><span
226
+ lang=EN-GB style='font-size:10.0pt'><o:p></o:p></span></p>
227
+
228
+ </div>
229
+
230
+
231
+ <div style='mso-element:header' id=eh2>
232
+ <p class=MsoHeader align=left style='margin-bottom:36.0pt;text-align:left;line-height:12.0pt;
233
+ mso-line-height-rule:exactly'><span lang=EN-GB>{{ docnumber_reference }}{{ draftinfo }}</span></p>
234
+ </div>
235
+
236
+ <div style='mso-element:header' id=eh2l>
237
+ <p class=MsoHeaderLandscape align=left style='margin-bottom:36.0pt;text-align:left;line-height:12.0pt;
238
+ mso-line-height-rule:exactly'><span lang=EN-GB>{{ docnumber_reference }}{{ draftinfo }}</span></p>
239
+ </div>
240
+
241
+ <div style='mso-element:header' id=h2>
242
+ <p class=MsoHeader align=right style='margin-bottom:36.0pt;text-align:right;line-height:12.0pt;
243
+ mso-line-height-rule:exactly'><span lang=EN-GB>{{ docnumber_reference }}{{ draftinfo }}</span></p>
244
+ </div>
245
+
246
+ <div style='mso-element:header' id=h2l>
247
+ <p class=MsoHeaderLandscape align=right style='margin-bottom:36.0pt;text-align:right;line-height:12.0pt;
248
+ mso-line-height-rule:exactly'><span lang=EN-GB>{{ docnumber_reference }}{{ draftinfo }}</span></p>
249
+ </div>
250
+
251
+ <div style='mso-element:footer' id=ef2>
252
+ <p class=MsoFooter style='margin-top:12.0pt;line-height:12.0pt;mso-line-height-rule:
253
+ exactly'><p class=MsoFooter style='margin-top:12.0pt;line-height:12.0pt;mso-line-height-rule:
254
+ exactly'><!--[if supportFields]><b style='mso-bidi-font-weight:normal'><span
255
+ lang=EN-GB style='font-size:10.0pt'><span style='mso-element:field-begin'></span><span
256
+ style='mso-spacerun:yes'> </span>PAGE<span style='mso-spacerun:yes'>  
257
+ </span>\* MERGEFORMAT <span style='mso-element:field-separator'></span></span></b><![endif]--><b
258
+ style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt'><span
259
+ style='mso-no-proof:yes'>2</span></span></b><!--[if supportFields]><b
260
+ style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt'><span
261
+ style='mso-element:field-end'></span></span></b><![endif]--><span lang=EN-GB
262
+ style='font-size:10.0pt'><span style='mso-tab-count:1'>                                                                                                                                                                           </span><span
263
+ lang=EN-GB style='font-size:9.0pt'>©
264
+ {{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ labels["all_rights_reserved"] }}<o:p></o:p></span></p>
265
+ </div>
266
+
267
+ <div style='mso-element:footer' id=ef2l>
268
+ <p class=MsoFooter style='margin-top:12.0pt;line-height:12.0pt;mso-line-height-rule:
269
+ exactly'><p class=MsoFooter style='margin-top:12.0pt;line-height:12.0pt;mso-line-height-rule:
270
+ exactly'><!--[if supportFields]><b style='mso-bidi-font-weight:normal'><span
271
+ lang=EN-GB style='font-size:10.0pt'><span style='mso-element:field-begin'></span><span
272
+ style='mso-spacerun:yes'> </span>PAGE<span style='mso-spacerun:yes'>  
273
+ </span>\* MERGEFORMAT <span style='mso-element:field-separator'></span></span></b><![endif]--><b
274
+ style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt'><span
275
+ style='mso-no-proof:yes'>2</span></span></b><!--[if supportFields]><b
276
+ style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt'><span
277
+ style='mso-element:field-end'></span></span></b><![endif]--><span lang=EN-GB
278
+ style='font-size:10.0pt'><span style='mso-tab-count:1'>                                                                                                                                                                           </span><span
279
+ lang=EN-GB style='font-size:9.0pt'>©
280
+ {{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ labels["all_rights_reserved"] }}<o:p></o:p></span></p>
281
+ </div>
282
+
283
+ <div style='mso-element:footer' id=f2>
284
+ <p class=MsoFooter style='line-height:12.0pt;mso-line-height-rule:exactly'><span
285
+ lang=EN-GB style='font-size:10.0pt'>© {{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ labels["all_rights_reserved"] }}</span><span lang=EN-GB
286
+ style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span style='mso-tab-count:1'>                                                                                                                                                                          </span></span><!--[if supportFields]><b
287
+ style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt'><span
288
+ style='mso-element:field-begin'></span> PAGE<span style='mso-spacerun:yes'>  
289
+ </span>\* MERGEFORMAT <span style='mso-element:field-separator'></span></span></b><![endif]--><b
290
+ style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt'><span
291
+ style='mso-no-proof:yes'>3</span></span></b><!--[if supportFields]><b
292
+ style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt'><span
293
+ style='mso-element:field-end'></span></span></b><![endif]--><span lang=EN-GB
294
+ style='font-size:10.0pt'><o:p></o:p></span></p>
295
+ </div>
296
+
297
+ <div style='mso-element:footer' id=f2l>
298
+ <p class=MsoFooter style='line-height:12.0pt;mso-line-height-rule:exactly'><span
299
+ lang=EN-GB style='font-size:10.0pt'>© {{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ labels["all_rights_reserved"] }}</span><span lang=EN-GB
300
+ style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span style='mso-tab-count:1'>                                                                                                                                                                          </span></span><!--[if supportFields]><b
301
+ style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt'><span
302
+ style='mso-element:field-begin'></span> PAGE<span style='mso-spacerun:yes'>  
303
+ </span>\* MERGEFORMAT <span style='mso-element:field-separator'></span></span></b><![endif]--><b
304
+ style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt'><span
305
+ style='mso-no-proof:yes'>3</span></span></b><!--[if supportFields]><b
306
+ style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt'><span
307
+ style='mso-element:field-end'></span></span></b><![endif]--><span lang=EN-GB
308
+ style='font-size:10.0pt'><o:p></o:p></span></p>
309
+ </div>
310
+
311
+ <div style='mso-element:footer' id=ef3>
312
+ <p class=MsoFooter style='margin-top:12.0pt;line-height:12.0pt;mso-line-height-rule:
313
+ exactly'><p class=MsoFooter style='margin-top:12.0pt;line-height:12.0pt;mso-line-height-rule:
314
+ exactly'><!--[if supportFields]><b style='mso-bidi-font-weight:normal'><span
315
+ lang=EN-GB style='font-size:10.0pt'><span style='mso-element:field-begin'></span><span
316
+ style='mso-spacerun:yes'> </span>PAGE<span style='mso-spacerun:yes'>  
317
+ </span>\* MERGEFORMAT <span style='mso-element:field-separator'></span></span></b><![endif]--><b
318
+ style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt'><span
319
+ style='mso-no-proof:yes'>2</span></span></b><!--[if supportFields]><b
320
+ style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt'><span
321
+ style='mso-element:field-end'></span></span></b><![endif]--><span lang=EN-GB
322
+ style='font-size:10.0pt'><span style='mso-tab-count:1'>                                                                                                                                                                           </span><span
323
+ lang=EN-GB style='font-size:9.0pt'>©
324
+ {{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ labels["all_rights_reserved"] }}<o:p></o:p></span></p>
325
+ </div>
326
+
327
+ <div style='mso-element:footer' id=ef3l>
328
+ <p class=MsoFooter style='margin-top:12.0pt;line-height:12.0pt;mso-line-height-rule:
329
+ exactly'><p class=MsoFooter style='margin-top:12.0pt;line-height:12.0pt;mso-line-height-rule:
330
+ exactly'><!--[if supportFields]><b style='mso-bidi-font-weight:normal'><span
331
+ lang=EN-GB style='font-size:10.0pt'><span style='mso-element:field-begin'></span><span
332
+ style='mso-spacerun:yes'> </span>PAGE<span style='mso-spacerun:yes'>  
333
+ </span>\* MERGEFORMAT <span style='mso-element:field-separator'></span></span></b><![endif]--><b
334
+ style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt'><span
335
+ style='mso-no-proof:yes'>2</span></span></b><!--[if supportFields]><b
336
+ style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt'><span
337
+ style='mso-element:field-end'></span></span></b><![endif]--><span lang=EN-GB
338
+ style='font-size:10.0pt'><span style='mso-tab-count:1'>                                                                                                                                                                           </span><span
339
+ lang=EN-GB style='font-size:9.0pt'>©
340
+ {{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ labels["all_rights_reserved"] }}<o:p></o:p></span></p>
341
+ </div>
342
+
343
+ <div style='mso-element:footer' id=f3>
344
+ <p class=MsoFooter style='line-height:12.0pt;mso-line-height-rule:exactly'><span
345
+ lang=EN-GB style='font-size:10.0pt'>© {{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ labels["all_rights_reserved"] }}</span><span lang=EN-GB
346
+ style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span style='mso-tab-count:1'>                                                                                                                                                                          </span></span><!--[if supportFields]><b
347
+ style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt'><span
348
+ style='mso-element:field-begin'></span> PAGE<span style='mso-spacerun:yes'>  
349
+ </span>\* MERGEFORMAT <span style='mso-element:field-separator'></span></span></b><![endif]--><b
350
+ style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt'><span
351
+ style='mso-no-proof:yes'>3</span></span></b><!--[if supportFields]><b
352
+ style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt'><span
353
+ style='mso-element:field-end'></span></span></b><![endif]--><span lang=EN-GB
354
+ style='font-size:10.0pt'><o:p></o:p></span></p>
355
+ </div>
356
+
357
+ <div style='mso-element:footer' id=f3l>
358
+ <p class=MsoFooter style='line-height:12.0pt;mso-line-height-rule:exactly'><span
359
+ lang=EN-GB style='font-size:10.0pt'>© {{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ labels["all_rights_reserved"] }}</span><span lang=EN-GB
360
+ style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span style='mso-tab-count:1'>                                                                                                                                                                          </span></span><!--[if supportFields]><b
361
+ style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt'><span
362
+ style='mso-element:field-begin'></span> PAGE<span style='mso-spacerun:yes'>  
363
+ </span>\* MERGEFORMAT <span style='mso-element:field-separator'></span></span></b><![endif]--><b
364
+ style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt'><span
365
+ style='mso-no-proof:yes'>3</span></span></b><!--[if supportFields]><b
366
+ style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt'><span
367
+ style='mso-element:field-end'></span></span></b><![endif]--><span lang=EN-GB
368
+ style='font-size:10.0pt'><o:p></o:p></span></p>
369
+ </div>
370
+
371
+ <div style='mso-element:footer' id=f4>
372
+ {% if ics %}
373
+ <p class=MsoFooter><b style='mso-bidi-font-weight:normal'><span>ICS {{ ics }}<o:p></o:p></span></b></p>
374
+ {% endif %}
375
+ {% if keywords.size > 0 %}
376
+ <p class=MsoFooter><b>Descriptors:</b> {{ keywords | join: ", " }}</p>
377
+ {% endif %}
378
+
379
+ <p class=MsoFooter style='margin-top:0cm'><span lang=EN-AU style='font-size:
380
+ 10.0pt;mso-ansi-language:EN-AU'>{{ labels["price_based_on"] | replace: "%", "<span style='mso-element:field-begin'></span><span style='mso-spacerun:yes'> </span>NUMPAGES<span style='mso-spacerun:yes'>  </span>\* MERGEFORMAT <span style='mso-element:field-separator'></span><span style='mso-no-proof:yes'>26</span><span style='mso-element:field-end'></span>" }}</span></p>
381
+
382
+ <p class=MsoFooter><span lang=EN-AU style='font-size:10.0pt;'>©
383
+ {{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ labels["all_rights_reserved"] }}<o:p></o:p></span></p>
384
+
385
+ </div>
386
+
387
+
388
+
389
+ </body>
390
+
391
+ </html>
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