metanorma-iso 2.2.1 → 2.2.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (119) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/iso/html/header-dis.html +111 -29
  3. data/lib/isodoc/iso/html/isodoc-dis.css +65 -64
  4. data/lib/isodoc/iso/html/isodoc-dis.scss +65 -64
  5. data/lib/isodoc/iso/html/style-human.css +2 -3
  6. data/lib/isodoc/iso/html/style-human.scss +0 -1
  7. data/lib/isodoc/iso/html/style-iso.css +2 -3
  8. data/lib/isodoc/iso/html/style-iso.scss +0 -1
  9. data/lib/isodoc/iso/html/wordstyle-dis.css +10 -4
  10. data/lib/isodoc/iso/html/wordstyle-dis.scss +10 -4
  11. data/lib/isodoc/iso/i18n-en.yaml +13 -8
  12. data/lib/isodoc/iso/i18n-fr.yaml +9 -3
  13. data/lib/isodoc/iso/i18n-ru.yaml +9 -2
  14. data/lib/isodoc/iso/i18n-zh-Hans.yaml +1 -2
  15. data/lib/isodoc/iso/iso.amendment.xsl +226 -40
  16. data/lib/isodoc/iso/iso.international-standard.xsl +226 -40
  17. data/lib/isodoc/iso/presentation_bibdata.rb +13 -9
  18. data/lib/isodoc/iso/presentation_xml_convert.rb +5 -3
  19. data/lib/isodoc/iso/presentation_xref.rb +10 -7
  20. data/lib/isodoc/iso/sections.rb +1 -1
  21. data/lib/isodoc/iso/word_convert.rb +6 -4
  22. data/lib/isodoc/iso/word_dis_cleanup.rb +24 -3
  23. data/lib/isodoc/iso/word_dis_convert.rb +4 -1
  24. data/lib/metanorma/iso/base.rb +2 -1
  25. data/lib/metanorma/iso/basicdoc.rng +0 -27
  26. data/lib/metanorma/iso/biblio-standoc.rng +164 -0
  27. data/lib/metanorma/iso/biblio.rng +50 -18
  28. data/lib/metanorma/iso/isodoc.rng +68 -206
  29. data/lib/metanorma/iso/isostandard-amd.rng +3 -54
  30. data/lib/metanorma/iso/isostandard-compile.rng +7 -0
  31. data/lib/metanorma/iso/isostandard.rng +1 -195
  32. data/lib/metanorma/iso/relaton-iso.rng +225 -0
  33. data/lib/metanorma/iso/validate.rb +6 -6
  34. data/lib/metanorma/iso/version.rb +1 -1
  35. data/lib/metanorma/requirements/modspec.rb +22 -38
  36. data/metanorma-iso.gemspec +5 -2
  37. metadata +7 -86
  38. data/.github/workflows/rake.yml +0 -15
  39. data/.github/workflows/release.yml +0 -24
  40. data/.github/workflows/ubuntu.yml +0 -41
  41. data/Rakefile +0 -8
  42. data/bin/rspec +0 -17
  43. data/spec/assets/header.html +0 -7
  44. data/spec/assets/html.css +0 -2
  45. data/spec/assets/htmlcover.html +0 -4
  46. data/spec/assets/htmlintro.html +0 -5
  47. data/spec/assets/i18n.yaml +0 -2
  48. data/spec/assets/iso.adoc +0 -10
  49. data/spec/assets/iso.headless.html +0 -33
  50. data/spec/assets/iso.xml +0 -71
  51. data/spec/assets/rice_image1.png +0 -0
  52. data/spec/assets/scripts.html +0 -3
  53. data/spec/assets/std.css +0 -2
  54. data/spec/assets/word.css +0 -2
  55. data/spec/assets/wordcover.html +0 -3
  56. data/spec/assets/wordintro.html +0 -4
  57. data/spec/examples/103_01_02.html +0 -247
  58. data/spec/examples/english.yaml +0 -69
  59. data/spec/examples/iso_123_.xml +0 -45
  60. data/spec/examples/iso_123_all_parts.xml +0 -45
  61. data/spec/examples/iso_123_no_year_note.xml +0 -46
  62. data/spec/examples/iso_124_.xml +0 -41
  63. data/spec/examples/iso_216_.xml +0 -47
  64. data/spec/examples/iso_iec_12382_.xml +0 -48
  65. data/spec/examples/rice.adoc +0 -714
  66. data/spec/examples/rice.preview.html +0 -1870
  67. data/spec/examples/rice.sh +0 -4
  68. data/spec/examples/rice_img/1000-1_ed2amd3fig1a.png +0 -0
  69. data/spec/examples/rice_img/1000-1_ed2amd3fig1b.png +0 -0
  70. data/spec/examples/rice_img/1000-1_ed2amd3fig2.png +0 -0
  71. data/spec/examples/rice_img/1000-1_ed2amd3fig3.png +0 -0
  72. data/spec/examples/rice_img/1000-1_ed2amd3fig4.png +0 -0
  73. data/spec/examples/rice_img/1000-1_ed2amd3fig5_f.png +0 -0
  74. data/spec/examples/rice_img/1000-1_ed2amd3figA.png +0 -0
  75. data/spec/examples/rice_img/1000-1_ed2amd3figA1.png +0 -0
  76. data/spec/examples/rice_img/1000-1_ed2amd3figA2.png +0 -0
  77. data/spec/examples/rice_img/1000-1_ed2amd3figTab1.png +0 -0
  78. data/spec/examples/rice_img/1000-1_ed2amd3figTab2.png +0 -0
  79. data/spec/examples/rice_img/1001_ed2amd3fig1.png +0 -0
  80. data/spec/examples/rice_img/ISO_1213_1.png +0 -0
  81. data/spec/examples/rice_img/SL1000-1_ed2amd3fig1.png +0 -0
  82. data/spec/examples/rice_img/rice_image1.png +0 -0
  83. data/spec/examples/rice_img/rice_image2.png +0 -0
  84. data/spec/examples/rice_img/rice_image3_1.png +0 -0
  85. data/spec/examples/rice_img/rice_image3_2.png +0 -0
  86. data/spec/examples/rice_img/rice_image3_3.png +0 -0
  87. data/spec/isodoc/amd_spec.rb +0 -986
  88. data/spec/isodoc/blocks_spec.rb +0 -1174
  89. data/spec/isodoc/i18n_spec.rb +0 -1579
  90. data/spec/isodoc/inline_spec.rb +0 -1060
  91. data/spec/isodoc/iso_spec.rb +0 -255
  92. data/spec/isodoc/metadata_spec.rb +0 -701
  93. data/spec/isodoc/postproc_spec.rb +0 -1089
  94. data/spec/isodoc/ref_spec.rb +0 -439
  95. data/spec/isodoc/section_spec.rb +0 -998
  96. data/spec/isodoc/table_spec.rb +0 -420
  97. data/spec/isodoc/terms_spec.rb +0 -314
  98. data/spec/isodoc/word_dis_spec.rb +0 -2064
  99. data/spec/isodoc/xref_spec.rb +0 -1747
  100. data/spec/metanorma/amd_spec.rb +0 -724
  101. data/spec/metanorma/base_spec.rb +0 -1384
  102. data/spec/metanorma/blank_spec.rb +0 -38
  103. data/spec/metanorma/blocks_spec.rb +0 -624
  104. data/spec/metanorma/cleanup_spec.rb +0 -1645
  105. data/spec/metanorma/inline_spec.rb +0 -203
  106. data/spec/metanorma/lists_spec.rb +0 -197
  107. data/spec/metanorma/macros_spec.rb +0 -99
  108. data/spec/metanorma/processor_spec.rb +0 -161
  109. data/spec/metanorma/refs_spec.rb +0 -672
  110. data/spec/metanorma/section_spec.rb +0 -492
  111. data/spec/metanorma/table_spec.rb +0 -329
  112. data/spec/metanorma/validate_spec.rb +0 -2153
  113. data/spec/relaton/render_spec.rb +0 -568
  114. data/spec/requirements/requirement_components_spec.rb +0 -622
  115. data/spec/requirements/requirements_spec.rb +0 -1681
  116. data/spec/requirements/xref_spec.rb +0 -1211
  117. data/spec/spec_helper.rb +0 -313
  118. data/spec/vcr_cassettes/docrels.yml +0 -385
  119. data/spec/vcr_cassettes/withdrawn_iso.yml +0 -295
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 64ff031dbcbae3aeb600c99c3c200b27983e96d865a49c52413245c470885824
4
- data.tar.gz: 81ea3cfa5672feae8e31aff1341224310f15f85d74d85a0ca017e3ceba829421
3
+ metadata.gz: 0b32a11513218480a31ac11794318d2bedf1b4911bbd7e09d23153e0da301152
4
+ data.tar.gz: 5925599f143867243d0f9487814c31827a7cb05a27f49282a15d5d411166edb8
5
5
  SHA512:
6
- metadata.gz: fdb2b2f7a30d439df33decf4e0f97fedf91f7545aa7ee7f1c43e9a4a66b21ef942ddb7e9f77520ebdbb68dcc509332e0651a866f2ec33e98835e70c67f641546
7
- data.tar.gz: 03500425f5f236f69010d688aaa906719f52eac6695d4dbe1ed78d6b63e6d2943a8b2299f8d19a05ae18570deb6f3d22b380a6f1b69da4d386d2d817da42273e
6
+ metadata.gz: 8473b54ca8c49e52f8e11518064ddf3a9e4e7dfb39cc2e63d829cce1dd25a946c02fa279fb130a38741b51ceac0f9baf9175bad1e5f96f0c46cf63601b9d5da2
7
+ data.tar.gz: e6f9e264573be5620e4ccb1ead05a702e25766e4e06f4faf6ba59c26bce260eb1af2362f9689734cf73879ef1ab309ccdde06b68f89ffce5a21a0819b3c681f9
@@ -74,7 +74,7 @@ mso-line-height-rule:exactly'><span lang=EN-GB style='mso-no-proof:yes'><!--[if
74
74
  <v:stroke joinstyle="miter"/>
75
75
  <v:path gradientshapeok="t" o:connecttype="rect"/>
76
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;
77
+ style='position:absolute;margin-left:0;margin-top:0;width:500.05pt;height:16.75pt;
78
78
  z-index:251658240;visibility:visible;mso-wrap-style:square;
79
79
  mso-width-percent:0;mso-height-percent:0;mso-wrap-distance-left:9pt;
80
80
  mso-wrap-distance-top:0;mso-wrap-distance-right:9pt;
@@ -133,15 +133,23 @@ BADzAAAAPwUAAAAA
133
133
 
134
134
  </div>
135
135
 
136
+ <div style='mso-element:header' id=eh1>
137
+ <p class=MsoHeader align=left style='text-align:left;line-height:12.0pt;
138
+ mso-line-height-rule:exactly'><span lang=EN-GB>{{ docnumber_reference }}{{ draftinfo }}</span></p>
139
+ </div>
140
+
136
141
  <div style='mso-element:header' id=h1>
137
142
 
138
143
  <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;
144
+ mso-line-height-rule:exactly'><span lang=EN-GB style='mso-no-proof:yes'><!--[if gte vml 1]><v:shapetype
145
+ id="_x0000_t202" coordsize="21600,21600" o:spt="202" path="m,l,21600r21600,l21600,xe">
146
+ <v:stroke joinstyle="miter"/>
147
+ <v:path gradientshapeok="t" o:connecttype="rect"/>
148
+ </v:shapetype><v:shape id="WordArt_x0020_15" o:spid="_x0000_s1027" type="#_x0000_t202"
149
+ style='position:absolute;left:0;text-align:left;margin-left:0;margin-top:0;
150
+ width:500.05pt;height:16.75pt;z-index:251658240;visibility:visible;
151
+ mso-wrap-style:square;mso-width-percent:0;mso-height-percent:0;
152
+ mso-wrap-distance-left:9pt;mso-wrap-distance-top:0;mso-wrap-distance-right:9pt;
145
153
  mso-wrap-distance-bottom:0;mso-position-horizontal:center;
146
154
  mso-position-horizontal-relative:page;mso-position-vertical:bottom;
147
155
  mso-position-vertical-relative:page;mso-width-percent:0;mso-height-percent:0;
@@ -155,25 +163,25 @@ bHOkkMFqwzAMhu+DvYPRfXGawxijTi+j0GvpHsDYimMaW0Yy2fr2M4PBMnrbUb/Q94l/f/hMi1qR
155
163
  JVI2sOt6UJgd+ZiDgffL8ekFlFSbvV0oo4EbChzGx4f9GRdb25HMsYhqlCwG5lrLq9biZkxWOiqY
156
164
  22YiTra2kYMu1l1tQD30/bPm3wwYN0x18gb45AdQl1tp5j/sFB2T0FQ7R0nTNEV3j6o9feQzro1i
157
165
  OWA14Fm+Q8a1a8+Bvu/d/dMb2JY5uiPbhG/ktn4cqGU/er3pcvwCAAD//wMAUEsDBBQABgAIAAAA
158
- IQA/KXsN3QEAAKQDAAAOAAAAZHJzL2Uyb0RvYy54bWysU9Fu0zAUfUfiHyy/06QZ3VDUdBpMIKTB
159
- Jm1oz45jN4HY1/i6Tfr3XLtJi9jbRB6s6/j65JxzT9bXo+nZXnnswFZ8ucg5U1ZC09ltxX88fX73
160
- gTMMwjaiB6sqflDIrzdv36wHV6oCWugb5RmBWCwHV/E2BFdmGcpWGYELcMrSoQZvRKCt32aNFwOh
161
- mz4r8vwyG8A3zoNUiPT29njINwlfayXDvdaoAusrTtxCWn1a67hmm7Uot164tpMTDfEKFkZ0lj56
162
- groVQbCd715AmU56QNBhIcFkoHUnVdJAapb5P2oeW+FU0kLmoDvZhP8PVn7fP7oHz8L4EUYaYBKB
163
- 7g7kLyRvssFhOfVET7HE2F0P36ChaYpdgHRj1N5E+SSIEQw5fTi5q8bAJL28uMyv3l+sOJN0ViyL
164
- q2IV7c9EOd92HsMXBYbFouKeppfQxf4Ow7F1bpmoRTZHXmGsR9Y1UQJ1RqY1NAfiOtBwK46/d8Ir
165
- zvqvltyLSZgLPxf1XNid+QSUlyVn2oN5poTdeOJzNCcyeBqfhXcTzUACH/o5AIlrSkLDrDDRpOYn
166
- AZmecrUXPVvl9EzCp2ay4Iwa71q4IWd1l0SftUyiKQrJtim2MWt/71PX+efa/AEAAP//AwBQSwME
167
- FAAGAAgAAAAhANp/lKTfAAAACQEAAA8AAABkcnMvZG93bnJldi54bWxMj0FLw0AQhe+C/2EZwZvd
168
- tCW1pNkUaSkexEOrgsdpdswGs7thd5um/97Ri708GB7vzfvK9Wg7MVCIrXcKppMMBLna69Y1Ct7f
169
- dg9LEDGh09h5RwouFGFd3d6UWGh/dnsaDqkRXOJigQpMSn0hZawNWYwT35Nj78sHi4nP0Egd8Mzl
170
- tpOzLFtIi63jDwZ72hiqvw8nq+Bj0+9exk+Dr0Oun7ezx/0l1KNS93fjdsXytAKRaEz/Cfhl4P1Q
171
- 8bCjPzkdRaeAadKfspcvllMQRwXzeQ6yKuU1QfUDAAD//wMAUEsBAi0AFAAGAAgAAAAhALaDOJL+
172
- AAAA4QEAABMAAAAAAAAAAAAAAAAAAAAAAFtDb250ZW50X1R5cGVzXS54bWxQSwECLQAUAAYACAAA
173
- ACEAOP0h/9YAAACUAQAACwAAAAAAAAAAAAAAAAAvAQAAX3JlbHMvLnJlbHNQSwECLQAUAAYACAAA
174
- ACEAPyl7Dd0BAACkAwAADgAAAAAAAAAAAAAAAAAuAgAAZHJzL2Uyb0RvYy54bWxQSwECLQAUAAYA
175
- CAAAACEA2n+UpN8AAAAJAQAADwAAAAAAAAAAAAAAAAA3BAAAZHJzL2Rvd25yZXYueG1sUEsFBgAA
176
- AAAEAAQA8wAAAEMFAAAAAA==
166
+ IQBBrVQU2QEAAJ0DAAAOAAAAZHJzL2Uyb0RvYy54bWysU11v0zAUfUfiP1h+p0kzuqGo6TSYQEiD
167
+ TdrQnh3HbgKxr/F1m/Tfc+0mLWJvE3mw/HF9fM65J+vr0fRsrzx2YCu+XOScKSuh6ey24j+ePr/7
168
+ wBkGYRvRg1UVPyjk15u3b9aDK1UBLfSN8oxALJaDq3gbgiuzDGWrjMAFOGXpUIM3ItDSb7PGi4HQ
169
+ TZ8VeX6ZDeAb50EqRNq9PR7yTcLXWslwrzWqwPqKE7eQRp/GOo7ZZi3KrReu7eREQ7yChRGdpUdP
170
+ ULciCLbz3Qso00kPCDosJJgMtO6kShpIzTL/R81jK5xKWsgcdCeb8P/Byu/7R/fgWRg/wkgNTCLQ
171
+ 3YH8heRNNjgsp5roKZYYq+vhGzTUTbELkG6M2psonwQxgiGnDyd31RiYpM2Ly/zq/cWKM0lnxbK4
172
+ KlbR/kyU823nMXxRYFicVNxT9xK62N9hOJbOJRO1yObIK4z1SCWRYg3NgUgO1NWK4++d8Iqz/qsl
173
+ 22IE5omfJ/U8sTvzCSgoS860B/NM0brxROToSnz6aXwW3k38Ail76OfOJ5IpAg2zwkR3mp8EZHoK
174
+ 1F70bJXTNymeikn7GTXetXBDluouqT1rmdRSBpJfU15jyP5ep6rzX7X5AwAA//8DAFBLAwQUAAYA
175
+ CAAAACEA2n+UpN8AAAAJAQAADwAAAGRycy9kb3ducmV2LnhtbEyPQUvDQBCF74L/YRnBm920JbWk
176
+ 2RRpKR7EQ6uCx2l2zAazu2F3m6b/3tGLvTwYHu/N+8r1aDsxUIitdwqmkwwEudrr1jUK3t92D0sQ
177
+ MaHT2HlHCi4UYV3d3pRYaH92exoOqRFc4mKBCkxKfSFlrA1ZjBPfk2PvyweLic/QSB3wzOW2k7Ms
178
+ W0iLreMPBnvaGKq/Dyer4GPT717GT4OvQ66ft7PH/SXUo1L3d+N2xfK0ApFoTP8J+GXg/VDxsKM/
179
+ OR1Fp4Bp0p+yly+WUxBHBfN5DrIq5TVB9QMAAP//AwBQSwECLQAUAAYACAAAACEAtoM4kv4AAADh
180
+ AQAAEwAAAAAAAAAAAAAAAAAAAAAAW0NvbnRlbnRfVHlwZXNdLnhtbFBLAQItABQABgAIAAAAIQA4
181
+ /SH/1gAAAJQBAAALAAAAAAAAAAAAAAAAAC8BAABfcmVscy8ucmVsc1BLAQItABQABgAIAAAAIQBB
182
+ rVQU2QEAAJ0DAAAOAAAAAAAAAAAAAAAAAC4CAABkcnMvZTJvRG9jLnhtbFBLAQItABQABgAIAAAA
183
+ IQDaf5Sk3wAAAAkBAAAPAAAAAAAAAAAAAAAAADMEAABkcnMvZG93bnJldi54bWxQSwUGAAAAAAQA
184
+ BADzAAAAPwUAAAAA
177
185
  " filled="f" stroked="f">
178
186
  <v:stroke joinstyle="round"/>
179
187
  <v:path arrowok="t"/>
@@ -198,7 +206,7 @@ AAAEAAQA8wAAAEMFAAAAAA==
198
206
  </div>
199
207
 
200
208
 
201
- <div style='mso-element:footer' id=efa>
209
+ <div style='mso-element:footer' id=ef1>
202
210
 
203
211
  <p class=MsoFooter style='line-height:12.0pt;mso-line-height-rule:
204
212
  exactly'><!--[if supportFields]><span
@@ -213,7 +221,7 @@ style='mso-tab-count:1'>                            
213
221
 
214
222
  </div>
215
223
 
216
- <div style='mso-element:footer' id=fa>
224
+ <div style='mso-element:footer' id=f1>
217
225
 
218
226
  <p class=MsoFooter style='line-height:12.0pt;mso-line-height-rule:exactly'><span
219
227
  lang=EN-GB style='font-size:10.0pt'>© {{ agency }}&nbsp;{{ docyear }}&nbsp;– {{ labels["all_rights_reserved"] }}<span
@@ -227,6 +235,18 @@ lang=EN-GB style='font-size:10.0pt'><o:p></o:p></span></p>
227
235
 
228
236
  </div>
229
237
 
238
+ <div style='mso-element:header' id=fh1>
239
+
240
+ <p class=MsoHeader><span lang=EN-GB><o:p>&nbsp;</o:p></span></p>
241
+
242
+ </div>
243
+
244
+ <div style='mso-element:footer' id=ff1>
245
+
246
+ <p class=MsoFooter><span lang=EN-GB><o:p>&nbsp;</o:p></span></p>
247
+
248
+ </div>
249
+
230
250
 
231
251
  <div style='mso-element:header' id=eh2>
232
252
  <p class=MsoHeader align=left style='margin-bottom:36.0pt;text-align:left;line-height:12.0pt;
@@ -239,8 +259,70 @@ mso-line-height-rule:exactly'><span lang=EN-GB>{{ docnumber_reference }}{{ draft
239
259
  </div>
240
260
 
241
261
  <div style='mso-element:header' id=h2>
262
+
242
263
  <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>
264
+ mso-line-height-rule:exactly'><span lang=EN-GB style='mso-no-proof:yes'><!--[if gte vml 1]><v:shapetype
265
+ id="_x0000_t202" coordsize="21600,21600" o:spt="202" path="m,l,21600r21600,l21600,xe">
266
+ <v:stroke joinstyle="miter"/>
267
+ <v:path gradientshapeok="t" o:connecttype="rect"/>
268
+ </v:shapetype><v:shape id="WordArt_x0020_15" o:spid="_x0000_s1027" type="#_x0000_t202"
269
+ style='position:absolute;left:0;text-align:left;margin-left:0;margin-top:0;
270
+ width:500.05pt;height:16.75pt;z-index:251658240;visibility:visible;
271
+ mso-wrap-style:square;mso-width-percent:0;mso-height-percent:0;
272
+ mso-wrap-distance-left:9pt;mso-wrap-distance-top:0;mso-wrap-distance-right:9pt;
273
+ mso-wrap-distance-bottom:0;mso-position-horizontal:center;
274
+ mso-position-horizontal-relative:page;mso-position-vertical:bottom;
275
+ mso-position-vertical-relative:page;mso-width-percent:0;mso-height-percent:0;
276
+ mso-width-relative:page;mso-height-relative:page;v-text-anchor:top' o:gfxdata="UEsDBBQABgAIAAAAIQC2gziS/gAAAOEBAAATAAAAW0NvbnRlbnRfVHlwZXNdLnhtbJSRQU7DMBBF
277
+ 90jcwfIWJU67QAgl6YK0S0CoHGBkTxKLZGx5TGhvj5O2G0SRWNoz/78nu9wcxkFMGNg6quQqL6RA
278
+ 0s5Y6ir5vt9lD1JwBDIwOMJKHpHlpr69KfdHjyxSmriSfYz+USnWPY7AufNIadK6MEJMx9ApD/oD
279
+ OlTrorhX2lFEilmcO2RdNtjC5xDF9pCuTyYBB5bi6bQ4syoJ3g9WQ0ymaiLzg5KdCXlKLjvcW893
280
+ SUOqXwnz5DrgnHtJTxOsQfEKIT7DmDSUCaxw7Rqn8787ZsmRM9e2VmPeBN4uqYvTtW7jvijg9N/y
281
+ JsXecLq0q+WD6m8AAAD//wMAUEsDBBQABgAIAAAAIQA4/SH/1gAAAJQBAAALAAAAX3JlbHMvLnJl
282
+ bHOkkMFqwzAMhu+DvYPRfXGawxijTi+j0GvpHsDYimMaW0Yy2fr2M4PBMnrbUb/Q94l/f/hMi1qR
283
+ JVI2sOt6UJgd+ZiDgffL8ekFlFSbvV0oo4EbChzGx4f9GRdb25HMsYhqlCwG5lrLq9biZkxWOiqY
284
+ 22YiTra2kYMu1l1tQD30/bPm3wwYN0x18gb45AdQl1tp5j/sFB2T0FQ7R0nTNEV3j6o9feQzro1i
285
+ OWA14Fm+Q8a1a8+Bvu/d/dMb2JY5uiPbhG/ktn4cqGU/er3pcvwCAAD//wMAUEsDBBQABgAIAAAA
286
+ IQBBrVQU2QEAAJ0DAAAOAAAAZHJzL2Uyb0RvYy54bWysU11v0zAUfUfiP1h+p0kzuqGo6TSYQEiD
287
+ TdrQnh3HbgKxr/F1m/Tfc+0mLWJvE3mw/HF9fM65J+vr0fRsrzx2YCu+XOScKSuh6ey24j+ePr/7
288
+ wBkGYRvRg1UVPyjk15u3b9aDK1UBLfSN8oxALJaDq3gbgiuzDGWrjMAFOGXpUIM3ItDSb7PGi4HQ
289
+ TZ8VeX6ZDeAb50EqRNq9PR7yTcLXWslwrzWqwPqKE7eQRp/GOo7ZZi3KrReu7eREQ7yChRGdpUdP
290
+ ULciCLbz3Qso00kPCDosJJgMtO6kShpIzTL/R81jK5xKWsgcdCeb8P/Byu/7R/fgWRg/wkgNTCLQ
291
+ 3YH8heRNNjgsp5roKZYYq+vhGzTUTbELkG6M2psonwQxgiGnDyd31RiYpM2Ly/zq/cWKM0lnxbK4
292
+ KlbR/kyU823nMXxRYFicVNxT9xK62N9hOJbOJRO1yObIK4z1SCWRYg3NgUgO1NWK4++d8Iqz/qsl
293
+ 22IE5omfJ/U8sTvzCSgoS860B/NM0brxROToSnz6aXwW3k38Ail76OfOJ5IpAg2zwkR3mp8EZHoK
294
+ 1F70bJXTNymeikn7GTXetXBDluouqT1rmdRSBpJfU15jyP5ep6rzX7X5AwAA//8DAFBLAwQUAAYA
295
+ CAAAACEA2n+UpN8AAAAJAQAADwAAAGRycy9kb3ducmV2LnhtbEyPQUvDQBCF74L/YRnBm920JbWk
296
+ 2RRpKR7EQ6uCx2l2zAazu2F3m6b/3tGLvTwYHu/N+8r1aDsxUIitdwqmkwwEudrr1jUK3t92D0sQ
297
+ MaHT2HlHCi4UYV3d3pRYaH92exoOqRFc4mKBCkxKfSFlrA1ZjBPfk2PvyweLic/QSB3wzOW2k7Ms
298
+ W0iLreMPBnvaGKq/Dyer4GPT717GT4OvQ66ft7PH/SXUo1L3d+N2xfK0ApFoTP8J+GXg/VDxsKM/
299
+ OR1Fp4Bp0p+yly+WUxBHBfN5DrIq5TVB9QMAAP//AwBQSwECLQAUAAYACAAAACEAtoM4kv4AAADh
300
+ AQAAEwAAAAAAAAAAAAAAAAAAAAAAW0NvbnRlbnRfVHlwZXNdLnhtbFBLAQItABQABgAIAAAAIQA4
301
+ /SH/1gAAAJQBAAALAAAAAAAAAAAAAAAAAC8BAABfcmVscy8ucmVsc1BLAQItABQABgAIAAAAIQBB
302
+ rVQU2QEAAJ0DAAAOAAAAAAAAAAAAAAAAAC4CAABkcnMvZTJvRG9jLnhtbFBLAQItABQABgAIAAAA
303
+ IQDaf5Sk3wAAAAkBAAAPAAAAAAAAAAAAAAAAADMEAABkcnMvZG93bnJldi54bWxQSwUGAAAAAAQA
304
+ BADzAAAAPwUAAAAA
305
+ " filled="f" stroked="f">
306
+ <v:stroke joinstyle="round"/>
307
+ <v:path arrowok="t"/>
308
+ <v:textbox inset="0,0,0,0">
309
+ <![if !mso]>
310
+ <table cellpadding=0 cellspacing=0 width="100%">
311
+ <tr>
312
+ <td><![endif]>
313
+ <div>
314
+ <p class=MsoNormal align=center style='text-align:center'><span lang=EN-GB
315
+ style='font-size:24.0pt;color:#C45911;mso-style-textfill-fill-color:#C45911;
316
+ mso-style-textfill-fill-alpha:50.0%'>Edited DIS - MUST BE USED FOR FINAL
317
+ DRAFT<o:p></o:p></span></p>
318
+ </div>
319
+ <![if !mso]></td>
320
+ </tr>
321
+ </table>
322
+ <![endif]></v:textbox>
323
+ <w:wrap anchorx="page" anchory="page"/>
324
+ </v:shape><![endif]--></span><span lang=EN-GB>{{ docnumber_reference }}{{ draftinfo }}</span></p>
325
+
244
326
  </div>
245
327
 
246
328
  <div style='mso-element:header' id=h2l>