metanorma-iso 2.2.3 → 2.3.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +0 -1
- data/lib/isodoc/iso/base_convert.rb +3 -3
- data/lib/isodoc/iso/html/isodoc-dis.css +4 -4
- data/lib/isodoc/iso/html/isodoc-dis.scss +4 -4
- data/lib/isodoc/iso/html/isodoc.css +4 -4
- data/lib/isodoc/iso/html/isodoc.scss +4 -4
- data/lib/isodoc/iso/html/style-human.css +6 -0
- data/lib/isodoc/iso/html/style-iso.css +6 -0
- data/lib/isodoc/iso/html/wordstyle-dis.css +150 -0
- data/lib/isodoc/iso/html/wordstyle-dis.scss +144 -0
- data/lib/isodoc/iso/html/wordstyle.css +150 -0
- data/lib/isodoc/iso/html/wordstyle.scss +144 -0
- data/lib/isodoc/iso/html_convert.rb +1 -1
- data/lib/isodoc/iso/index.rb +2 -2
- data/lib/isodoc/iso/iso.amendment.xsl +1500 -1175
- data/lib/isodoc/iso/iso.international-standard.xsl +1500 -1175
- data/lib/isodoc/iso/isosts_convert.rb +8 -3
- data/lib/isodoc/iso/presentation_xml_convert.rb +5 -5
- data/lib/isodoc/iso/presentation_xref.rb +23 -21
- data/lib/isodoc/iso/word_convert.rb +1 -1
- data/lib/isodoc/iso/word_dis_cleanup.rb +9 -8
- data/lib/isodoc/iso/word_dis_convert.rb +1 -1
- data/lib/isodoc/iso/xref.rb +12 -9
- data/lib/metanorma/iso/basicdoc.rng +3 -0
- data/lib/metanorma/iso/biblio-standoc.rng +1 -1
- data/lib/metanorma/iso/isodoc.rng +2 -1
- data/lib/metanorma/iso/validate.rb +2 -2
- data/lib/metanorma/iso/version.rb +1 -1
- data/lib/metanorma/requirements/modspec.rb +3 -54
- data/metanorma-iso.gemspec +1 -1
- metadata +5 -5
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 100cc8d4acfdb9e4d94e485f58f09928173b43c096ce7c1fdce04633ee0082a7
|
|
4
|
+
data.tar.gz: 9c8870908553dd7103dc094e5b0f9ceebb9f43f31d417d4c8d01e5d3884c3e6e
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 98580eb700d970913763622d7b5325c58a825a98bbe350b9cac0bdcb1f1d5891eac42d9e473deadbe289f90eb1f189c11684b53e1db48e79f94bc210d0c61171
|
|
7
|
+
data.tar.gz: 5c52e15664a2b8edb7590f85c73bc7b13d248c70f039970a7426f654be3f0ba8165bcfbed6ab71d46be075c34db8b9213a2508ae8a48f633ccf32eed409f2c5f
|
data/.gitignore
CHANGED
|
@@ -88,9 +88,9 @@ module IsoDoc
|
|
|
88
88
|
|
|
89
89
|
def formula_where(dlist, out)
|
|
90
90
|
return if dlist.nil?
|
|
91
|
-
return super unless dlist
|
|
92
|
-
dlist
|
|
93
|
-
dlist
|
|
91
|
+
return super unless dlist.xpath(ns("./dt"))&.size == 1 &&
|
|
92
|
+
dlist.at(ns("./dd"))&.elements&.size == 1 &&
|
|
93
|
+
dlist.at(ns("./dd/p"))
|
|
94
94
|
|
|
95
95
|
out.span **{ class: "zzMoveToFollowing" } do |s|
|
|
96
96
|
s << "#{@i18n.where} "
|
|
@@ -222,7 +222,7 @@ p.AnnexTableTitle, li.AnnexTableTitle, div.AnnexTableTitle {
|
|
|
222
222
|
line-height: 12.0pt;
|
|
223
223
|
page-break-before: always;
|
|
224
224
|
mso-pagination: widow-orphan;
|
|
225
|
-
page-break-after:
|
|
225
|
+
/*page-break-after:avoid;*/
|
|
226
226
|
/* mso-list:l4 level1 lfo15; */
|
|
227
227
|
tab-stops: list 0cm left 20.15pt;
|
|
228
228
|
font-size: {{normalfontsize}};
|
|
@@ -248,7 +248,7 @@ p.AnnexTableTitleCxSpFirst, li.AnnexTableTitleCxSpFirst, div.AnnexTableTitleCxSp
|
|
|
248
248
|
line-height: 12.0pt;
|
|
249
249
|
page-break-before: always;
|
|
250
250
|
mso-pagination: widow-orphan;
|
|
251
|
-
page-break-after:
|
|
251
|
+
/*page-break-after:avoid;*/
|
|
252
252
|
/* mso-list:l4 level1 lfo15; */
|
|
253
253
|
tab-stops: list 0cm left 20.15pt;
|
|
254
254
|
font-size: {{normalfontsize}};
|
|
@@ -274,7 +274,7 @@ p.AnnexTableTitleCxSpMiddle, li.AnnexTableTitleCxSpMiddle, div.AnnexTableTitleCx
|
|
|
274
274
|
line-height: 12.0pt;
|
|
275
275
|
page-break-before: always;
|
|
276
276
|
mso-pagination: widow-orphan;
|
|
277
|
-
page-break-after:
|
|
277
|
+
/*page-break-after:avoid;*/
|
|
278
278
|
/* mso-list:l4 level1 lfo15; */
|
|
279
279
|
tab-stops: list 0cm left 20.15pt;
|
|
280
280
|
font-size: {{normalfontsize}};
|
|
@@ -303,7 +303,7 @@ p.AnnexTableTitleCxSpLast, li.AnnexTableTitleCxSpLast, div.AnnexTableTitleCxSpLa
|
|
|
303
303
|
line-height: 12.0pt;
|
|
304
304
|
page-break-before: always;
|
|
305
305
|
mso-pagination: widow-orphan;
|
|
306
|
-
page-break-after:
|
|
306
|
+
/*page-break-after:avoid;*/
|
|
307
307
|
/* mso-list:l4 level1 lfo15; */
|
|
308
308
|
tab-stops: list 0cm left 20.15pt;
|
|
309
309
|
font-size: {{normalfontsize}};
|
|
@@ -211,7 +211,7 @@ p.AnnexTableTitle, li.AnnexTableTitle, div.AnnexTableTitle
|
|
|
211
211
|
line-height:12.0pt;
|
|
212
212
|
page-break-before:always;
|
|
213
213
|
mso-pagination:widow-orphan;
|
|
214
|
-
page-break-after:avoid
|
|
214
|
+
/*page-break-after:avoid;*/
|
|
215
215
|
/* mso-list:l4 level1 lfo15; */
|
|
216
216
|
tab-stops:list 0cm left 20.15pt;
|
|
217
217
|
font-size:$normalfontsize;
|
|
@@ -236,7 +236,7 @@ p.AnnexTableTitleCxSpFirst, li.AnnexTableTitleCxSpFirst, div.AnnexTableTitleCxSp
|
|
|
236
236
|
line-height:12.0pt;
|
|
237
237
|
page-break-before:always;
|
|
238
238
|
mso-pagination:widow-orphan;
|
|
239
|
-
page-break-after:avoid
|
|
239
|
+
/*page-break-after:avoid;*/
|
|
240
240
|
/* mso-list:l4 level1 lfo15; */
|
|
241
241
|
tab-stops:list 0cm left 20.15pt;
|
|
242
242
|
font-size:$normalfontsize;
|
|
@@ -261,7 +261,7 @@ p.AnnexTableTitleCxSpMiddle, li.AnnexTableTitleCxSpMiddle, div.AnnexTableTitleCx
|
|
|
261
261
|
line-height:12.0pt;
|
|
262
262
|
page-break-before:always;
|
|
263
263
|
mso-pagination:widow-orphan;
|
|
264
|
-
page-break-after:avoid
|
|
264
|
+
/*page-break-after:avoid;*/
|
|
265
265
|
/* mso-list:l4 level1 lfo15; */
|
|
266
266
|
tab-stops:list 0cm left 20.15pt;
|
|
267
267
|
font-size:$normalfontsize;
|
|
@@ -289,7 +289,7 @@ p.AnnexTableTitleCxSpLast, li.AnnexTableTitleCxSpLast, div.AnnexTableTitleCxSpLa
|
|
|
289
289
|
line-height:12.0pt;
|
|
290
290
|
page-break-before:always;
|
|
291
291
|
mso-pagination:widow-orphan;
|
|
292
|
-
page-break-after:avoid
|
|
292
|
+
/*page-break-after:avoid;*/
|
|
293
293
|
/* mso-list:l4 level1 lfo15; */
|
|
294
294
|
tab-stops:list 0cm left 20.15pt;
|
|
295
295
|
font-size:$normalfontsize;
|
|
@@ -219,7 +219,7 @@ p.AnnexTableTitle, li.AnnexTableTitle, div.AnnexTableTitle {
|
|
|
219
219
|
line-height: 12.0pt;
|
|
220
220
|
page-break-before: always;
|
|
221
221
|
mso-pagination: widow-orphan;
|
|
222
|
-
page-break-after:
|
|
222
|
+
/*page-break-after:avoid;*/
|
|
223
223
|
/* mso-list:l4 level1 lfo15; */
|
|
224
224
|
tab-stops: list 0cm left 20.15pt;
|
|
225
225
|
font-size: {{normalfontsize}};
|
|
@@ -245,7 +245,7 @@ p.AnnexTableTitleCxSpFirst, li.AnnexTableTitleCxSpFirst, div.AnnexTableTitleCxSp
|
|
|
245
245
|
line-height: 12.0pt;
|
|
246
246
|
page-break-before: always;
|
|
247
247
|
mso-pagination: widow-orphan;
|
|
248
|
-
page-break-after:
|
|
248
|
+
/*page-break-after:avoid;*/
|
|
249
249
|
/* mso-list:l4 level1 lfo15; */
|
|
250
250
|
tab-stops: list 0cm left 20.15pt;
|
|
251
251
|
font-size: {{normalfontsize}};
|
|
@@ -271,7 +271,7 @@ p.AnnexTableTitleCxSpMiddle, li.AnnexTableTitleCxSpMiddle, div.AnnexTableTitleCx
|
|
|
271
271
|
line-height: 12.0pt;
|
|
272
272
|
page-break-before: always;
|
|
273
273
|
mso-pagination: widow-orphan;
|
|
274
|
-
page-break-after:
|
|
274
|
+
/*page-break-after:avoid;*/
|
|
275
275
|
/* mso-list:l4 level1 lfo15; */
|
|
276
276
|
tab-stops: list 0cm left 20.15pt;
|
|
277
277
|
font-size: {{normalfontsize}};
|
|
@@ -300,7 +300,7 @@ p.AnnexTableTitleCxSpLast, li.AnnexTableTitleCxSpLast, div.AnnexTableTitleCxSpLa
|
|
|
300
300
|
line-height: 12.0pt;
|
|
301
301
|
page-break-before: always;
|
|
302
302
|
mso-pagination: widow-orphan;
|
|
303
|
-
page-break-after:
|
|
303
|
+
/*page-break-after:avoid;*/
|
|
304
304
|
/* mso-list:l4 level1 lfo15; */
|
|
305
305
|
tab-stops: list 0cm left 20.15pt;
|
|
306
306
|
font-size: {{normalfontsize}};
|
|
@@ -209,7 +209,7 @@ p.AnnexTableTitle, li.AnnexTableTitle, div.AnnexTableTitle
|
|
|
209
209
|
line-height:12.0pt;
|
|
210
210
|
page-break-before:always;
|
|
211
211
|
mso-pagination:widow-orphan;
|
|
212
|
-
page-break-after:avoid
|
|
212
|
+
/*page-break-after:avoid;*/
|
|
213
213
|
/* mso-list:l4 level1 lfo15; */
|
|
214
214
|
tab-stops:list 0cm left 20.15pt;
|
|
215
215
|
font-size:$normalfontsize;
|
|
@@ -234,7 +234,7 @@ p.AnnexTableTitleCxSpFirst, li.AnnexTableTitleCxSpFirst, div.AnnexTableTitleCxSp
|
|
|
234
234
|
line-height:12.0pt;
|
|
235
235
|
page-break-before:always;
|
|
236
236
|
mso-pagination:widow-orphan;
|
|
237
|
-
page-break-after:avoid
|
|
237
|
+
/*page-break-after:avoid;*/
|
|
238
238
|
/* mso-list:l4 level1 lfo15; */
|
|
239
239
|
tab-stops:list 0cm left 20.15pt;
|
|
240
240
|
font-size:$normalfontsize;
|
|
@@ -259,7 +259,7 @@ p.AnnexTableTitleCxSpMiddle, li.AnnexTableTitleCxSpMiddle, div.AnnexTableTitleCx
|
|
|
259
259
|
line-height:12.0pt;
|
|
260
260
|
page-break-before:always;
|
|
261
261
|
mso-pagination:widow-orphan;
|
|
262
|
-
page-break-after:avoid
|
|
262
|
+
/*page-break-after:avoid;*/
|
|
263
263
|
/* mso-list:l4 level1 lfo15; */
|
|
264
264
|
tab-stops:list 0cm left 20.15pt;
|
|
265
265
|
font-size:$normalfontsize;
|
|
@@ -287,7 +287,7 @@ p.AnnexTableTitleCxSpLast, li.AnnexTableTitleCxSpLast, div.AnnexTableTitleCxSpLa
|
|
|
287
287
|
line-height:12.0pt;
|
|
288
288
|
page-break-before:always;
|
|
289
289
|
mso-pagination:widow-orphan;
|
|
290
|
-
page-break-after:avoid
|
|
290
|
+
/*page-break-after:avoid;*/
|
|
291
291
|
/* mso-list:l4 level1 lfo15; */
|
|
292
292
|
tab-stops:list 0cm left 20.15pt;
|
|
293
293
|
font-size:$normalfontsize;
|
|
@@ -463,6 +463,12 @@ p.Terms {
|
|
|
463
463
|
padding-left: 30px; }
|
|
464
464
|
#toc .h3, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .h3 {
|
|
465
465
|
padding-left: 50px; }
|
|
466
|
+
#toc .h4, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .h4 {
|
|
467
|
+
padding-left: 70px; }
|
|
468
|
+
#toc .h5, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .h5 {
|
|
469
|
+
padding-left: 90px; }
|
|
470
|
+
#toc .h6, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .h6 {
|
|
471
|
+
padding-left: 110px; }
|
|
466
472
|
#toc .toc-active, #toc li:hover, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover {
|
|
467
473
|
background: #1d1d1d;
|
|
468
474
|
box-shadow: inset -5px 0px 10px -5px #1d1d1d !important; }
|
|
@@ -410,6 +410,12 @@ p.Terms {
|
|
|
410
410
|
padding-left: 30px; }
|
|
411
411
|
#toc .h3, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .h3 {
|
|
412
412
|
padding-left: 50px; }
|
|
413
|
+
#toc .h4, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .h4 {
|
|
414
|
+
padding-left: 70px; }
|
|
415
|
+
#toc .h5, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .h5 {
|
|
416
|
+
padding-left: 90px; }
|
|
417
|
+
#toc .h6, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .h6 {
|
|
418
|
+
padding-left: 110px; }
|
|
413
419
|
#toc .toc-active, #toc li:hover, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover {
|
|
414
420
|
background: #f7f7f7;
|
|
415
421
|
box-shadow: inset -5px 0px 10px -5px #f7f7f7 !important; }
|
|
@@ -812,6 +812,156 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3 {
|
|
|
812
812
|
font-weight: bold;
|
|
813
813
|
mso-bidi-font-weight: normal; }
|
|
814
814
|
|
|
815
|
+
p.MsoToc4, li.MsoToc4, div.MsoToc4 {
|
|
816
|
+
mso-style-noshow: yes;
|
|
817
|
+
mso-style-priority: 39;
|
|
818
|
+
mso-style-unhide: no;
|
|
819
|
+
mso-style-name: "TOC 4";
|
|
820
|
+
mso-style-parent: "TOC 3";
|
|
821
|
+
mso-style-next: Normal;
|
|
822
|
+
margin-top: 0cm;
|
|
823
|
+
margin-right: 25.0pt;
|
|
824
|
+
margin-bottom: 0cm;
|
|
825
|
+
margin-left: 36.0pt;
|
|
826
|
+
margin-bottom: .0001pt;
|
|
827
|
+
text-indent: -36.0pt;
|
|
828
|
+
line-height: 12.0pt;
|
|
829
|
+
mso-pagination: widow-orphan;
|
|
830
|
+
mso-hyphenate: none;
|
|
831
|
+
tab-stops: 20.15pt 47.9pt right dotted 487.6pt;
|
|
832
|
+
font-size: 10.5pt;
|
|
833
|
+
font-family: {{bodyfont}};
|
|
834
|
+
mso-fareast-font-family: {{bodyfont}};
|
|
835
|
+
mso-bidi-font-family: {{bodyfont}};
|
|
836
|
+
mso-ansi-language: EN-GB;
|
|
837
|
+
font-weight: bold;
|
|
838
|
+
mso-bidi-font-weight: normal; }
|
|
839
|
+
|
|
840
|
+
p.MsoToc5, li.MsoToc5, div.MsoToc5 {
|
|
841
|
+
mso-style-noshow: yes;
|
|
842
|
+
mso-style-priority: 39;
|
|
843
|
+
mso-style-unhide: no;
|
|
844
|
+
mso-style-name: "TOC 5";
|
|
845
|
+
mso-style-parent: "TOC 4";
|
|
846
|
+
mso-style-next: Normal;
|
|
847
|
+
margin-top: 0cm;
|
|
848
|
+
margin-right: 25.0pt;
|
|
849
|
+
margin-bottom: 0cm;
|
|
850
|
+
margin-left: 36.0pt;
|
|
851
|
+
margin-bottom: .0001pt;
|
|
852
|
+
text-indent: -36.0pt;
|
|
853
|
+
line-height: 12.0pt;
|
|
854
|
+
mso-pagination: widow-orphan;
|
|
855
|
+
mso-hyphenate: none;
|
|
856
|
+
tab-stops: 20.15pt 47.9pt right dotted 487.6pt;
|
|
857
|
+
font-size: 10.5pt;
|
|
858
|
+
font-family: {{bodyfont}};
|
|
859
|
+
mso-fareast-font-family: {{bodyfont}};
|
|
860
|
+
mso-bidi-font-family: {{bodyfont}};
|
|
861
|
+
mso-ansi-language: EN-GB;
|
|
862
|
+
font-weight: bold;
|
|
863
|
+
mso-bidi-font-weight: normal; }
|
|
864
|
+
|
|
865
|
+
p.MsoToc6, li.MsoToc6, div.MsoToc6 {
|
|
866
|
+
mso-style-noshow: yes;
|
|
867
|
+
mso-style-priority: 39;
|
|
868
|
+
mso-style-unhide: no;
|
|
869
|
+
mso-style-name: "TOC 6";
|
|
870
|
+
mso-style-parent: "TOC 5";
|
|
871
|
+
mso-style-next: Normal;
|
|
872
|
+
margin-top: 0cm;
|
|
873
|
+
margin-right: 25.0pt;
|
|
874
|
+
margin-bottom: 0cm;
|
|
875
|
+
margin-left: 36.0pt;
|
|
876
|
+
margin-bottom: .0001pt;
|
|
877
|
+
text-indent: -36.0pt;
|
|
878
|
+
line-height: 12.0pt;
|
|
879
|
+
mso-pagination: widow-orphan;
|
|
880
|
+
mso-hyphenate: none;
|
|
881
|
+
tab-stops: 20.15pt 55.0pt right dotted 487.6pt;
|
|
882
|
+
font-size: 10.5pt;
|
|
883
|
+
font-family: {{bodyfont}};
|
|
884
|
+
mso-fareast-font-family: {{bodyfont}};
|
|
885
|
+
mso-bidi-font-family: {{bodyfont}};
|
|
886
|
+
mso-ansi-language: EN-GB;
|
|
887
|
+
font-weight: bold;
|
|
888
|
+
mso-bidi-font-weight: normal; }
|
|
889
|
+
|
|
890
|
+
p.MsoToc7, li.MsoToc7, div.MsoToc7 {
|
|
891
|
+
mso-style-noshow: yes;
|
|
892
|
+
mso-style-priority: 39;
|
|
893
|
+
mso-style-unhide: no;
|
|
894
|
+
mso-style-name: "TOC 7";
|
|
895
|
+
mso-style-parent: "TOC 6";
|
|
896
|
+
mso-style-next: Normal;
|
|
897
|
+
margin-top: 0cm;
|
|
898
|
+
margin-right: 25.0pt;
|
|
899
|
+
margin-bottom: 0cm;
|
|
900
|
+
margin-left: 36.0pt;
|
|
901
|
+
margin-bottom: .0001pt;
|
|
902
|
+
text-indent: -36.0pt;
|
|
903
|
+
line-height: 12.0pt;
|
|
904
|
+
mso-pagination: widow-orphan;
|
|
905
|
+
mso-hyphenate: none;
|
|
906
|
+
tab-stops: 20.15pt 62.7pt right dotted 487.6pt;
|
|
907
|
+
font-size: 10.5pt;
|
|
908
|
+
font-family: {{bodyfont}};
|
|
909
|
+
mso-fareast-font-family: {{bodyfont}};
|
|
910
|
+
mso-bidi-font-family: {{bodyfont}};
|
|
911
|
+
mso-ansi-language: EN-GB;
|
|
912
|
+
font-weight: bold;
|
|
913
|
+
mso-bidi-font-weight: normal; }
|
|
914
|
+
|
|
915
|
+
p.MsoToc8, li.MsoToc8, div.MsoToc8 {
|
|
916
|
+
mso-style-noshow: yes;
|
|
917
|
+
mso-style-priority: 39;
|
|
918
|
+
mso-style-unhide: no;
|
|
919
|
+
mso-style-name: "TOC 8";
|
|
920
|
+
mso-style-parent: "TOC 7";
|
|
921
|
+
mso-style-next: Normal;
|
|
922
|
+
margin-top: 0cm;
|
|
923
|
+
margin-right: 25.0pt;
|
|
924
|
+
margin-bottom: 0cm;
|
|
925
|
+
margin-left: 36.0pt;
|
|
926
|
+
margin-bottom: .0001pt;
|
|
927
|
+
text-indent: -36.0pt;
|
|
928
|
+
line-height: 12.0pt;
|
|
929
|
+
mso-pagination: widow-orphan;
|
|
930
|
+
mso-hyphenate: none;
|
|
931
|
+
tab-stops: 20.15pt 70.3pt right dotted 487.6pt;
|
|
932
|
+
font-size: 10.5pt;
|
|
933
|
+
font-family: {{bodyfont}};
|
|
934
|
+
mso-fareast-font-family: {{bodyfont}};
|
|
935
|
+
mso-bidi-font-family: {{bodyfont}};
|
|
936
|
+
mso-ansi-language: EN-GB;
|
|
937
|
+
font-weight: bold;
|
|
938
|
+
mso-bidi-font-weight: normal; }
|
|
939
|
+
|
|
940
|
+
p.MsoToc9, li.MsoToc9, div.MsoToc9 {
|
|
941
|
+
mso-style-noshow: yes;
|
|
942
|
+
mso-style-priority: 39;
|
|
943
|
+
mso-style-unhide: no;
|
|
944
|
+
mso-style-name: "TOC 9";
|
|
945
|
+
mso-style-parent: "TOC 8";
|
|
946
|
+
mso-style-next: Normal;
|
|
947
|
+
margin-top: 0cm;
|
|
948
|
+
margin-right: 25.0pt;
|
|
949
|
+
margin-bottom: 0cm;
|
|
950
|
+
margin-left: 36.0pt;
|
|
951
|
+
margin-bottom: .0001pt;
|
|
952
|
+
text-indent: -36.0pt;
|
|
953
|
+
line-height: 12.0pt;
|
|
954
|
+
mso-pagination: widow-orphan;
|
|
955
|
+
mso-hyphenate: none;
|
|
956
|
+
tab-stops: 20.15pt 78.0pt right dotted 487.6pt;
|
|
957
|
+
font-size: 10.5pt;
|
|
958
|
+
font-family: {{bodyfont}};
|
|
959
|
+
mso-fareast-font-family: {{bodyfont}};
|
|
960
|
+
mso-bidi-font-family: {{bodyfont}};
|
|
961
|
+
mso-ansi-language: EN-GB;
|
|
962
|
+
font-weight: bold;
|
|
963
|
+
mso-bidi-font-weight: normal; }
|
|
964
|
+
|
|
815
965
|
p.MsoHeader, li.MsoHeader, div.MsoHeader {
|
|
816
966
|
mso-style-noshow: yes;
|
|
817
967
|
mso-style-priority: 99;
|
|
@@ -769,6 +769,150 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3
|
|
|
769
769
|
mso-ansi-language:EN-GB;
|
|
770
770
|
font-weight:bold;
|
|
771
771
|
mso-bidi-font-weight:normal;}
|
|
772
|
+
p.MsoToc4, li.MsoToc4, div.MsoToc4
|
|
773
|
+
{mso-style-noshow:yes;
|
|
774
|
+
mso-style-priority:39;
|
|
775
|
+
mso-style-unhide:no;
|
|
776
|
+
mso-style-name:"TOC 4";
|
|
777
|
+
mso-style-parent:"TOC 3";
|
|
778
|
+
mso-style-next:Normal;
|
|
779
|
+
margin-top:0cm;
|
|
780
|
+
margin-right:25.0pt;
|
|
781
|
+
margin-bottom:0cm;
|
|
782
|
+
margin-left:36.0pt;
|
|
783
|
+
margin-bottom:.0001pt;
|
|
784
|
+
text-indent:-36.0pt;
|
|
785
|
+
line-height:12.0pt;
|
|
786
|
+
mso-pagination:widow-orphan;
|
|
787
|
+
mso-hyphenate:none;
|
|
788
|
+
tab-stops:20.15pt 47.9pt right dotted 487.6pt;
|
|
789
|
+
font-size:10.5pt;
|
|
790
|
+
font-family:$bodyfont;
|
|
791
|
+
mso-fareast-font-family:$bodyfont;
|
|
792
|
+
mso-bidi-font-family:$bodyfont;
|
|
793
|
+
mso-ansi-language:EN-GB;
|
|
794
|
+
font-weight:bold;
|
|
795
|
+
mso-bidi-font-weight:normal;}
|
|
796
|
+
p.MsoToc5, li.MsoToc5, div.MsoToc5
|
|
797
|
+
{mso-style-noshow:yes;
|
|
798
|
+
mso-style-priority:39;
|
|
799
|
+
mso-style-unhide:no;
|
|
800
|
+
mso-style-name:"TOC 5";
|
|
801
|
+
mso-style-parent:"TOC 4";
|
|
802
|
+
mso-style-next:Normal;
|
|
803
|
+
margin-top:0cm;
|
|
804
|
+
margin-right:25.0pt;
|
|
805
|
+
margin-bottom:0cm;
|
|
806
|
+
margin-left:36.0pt;
|
|
807
|
+
margin-bottom:.0001pt;
|
|
808
|
+
text-indent:-36.0pt;
|
|
809
|
+
line-height:12.0pt;
|
|
810
|
+
mso-pagination:widow-orphan;
|
|
811
|
+
mso-hyphenate:none;
|
|
812
|
+
tab-stops:20.15pt 47.9pt right dotted 487.6pt;
|
|
813
|
+
font-size:10.5pt;
|
|
814
|
+
font-family:$bodyfont;
|
|
815
|
+
mso-fareast-font-family:$bodyfont;
|
|
816
|
+
mso-bidi-font-family:$bodyfont;
|
|
817
|
+
mso-ansi-language:EN-GB;
|
|
818
|
+
font-weight:bold;
|
|
819
|
+
mso-bidi-font-weight:normal;}
|
|
820
|
+
p.MsoToc6, li.MsoToc6, div.MsoToc6
|
|
821
|
+
{mso-style-noshow:yes;
|
|
822
|
+
mso-style-priority:39;
|
|
823
|
+
mso-style-unhide:no;
|
|
824
|
+
mso-style-name:"TOC 6";
|
|
825
|
+
mso-style-parent:"TOC 5";
|
|
826
|
+
mso-style-next:Normal;
|
|
827
|
+
margin-top:0cm;
|
|
828
|
+
margin-right:25.0pt;
|
|
829
|
+
margin-bottom:0cm;
|
|
830
|
+
margin-left:36.0pt;
|
|
831
|
+
margin-bottom:.0001pt;
|
|
832
|
+
text-indent:-36.0pt;
|
|
833
|
+
line-height:12.0pt;
|
|
834
|
+
mso-pagination:widow-orphan;
|
|
835
|
+
mso-hyphenate:none;
|
|
836
|
+
tab-stops:20.15pt 55.0pt right dotted 487.6pt;
|
|
837
|
+
font-size:10.5pt;
|
|
838
|
+
font-family:$bodyfont;
|
|
839
|
+
mso-fareast-font-family:$bodyfont;
|
|
840
|
+
mso-bidi-font-family:$bodyfont;
|
|
841
|
+
mso-ansi-language:EN-GB;
|
|
842
|
+
font-weight:bold;
|
|
843
|
+
mso-bidi-font-weight:normal;}
|
|
844
|
+
p.MsoToc7, li.MsoToc7, div.MsoToc7
|
|
845
|
+
{mso-style-noshow:yes;
|
|
846
|
+
mso-style-priority:39;
|
|
847
|
+
mso-style-unhide:no;
|
|
848
|
+
mso-style-name:"TOC 7";
|
|
849
|
+
mso-style-parent:"TOC 6";
|
|
850
|
+
mso-style-next:Normal;
|
|
851
|
+
margin-top:0cm;
|
|
852
|
+
margin-right:25.0pt;
|
|
853
|
+
margin-bottom:0cm;
|
|
854
|
+
margin-left:36.0pt;
|
|
855
|
+
margin-bottom:.0001pt;
|
|
856
|
+
text-indent:-36.0pt;
|
|
857
|
+
line-height:12.0pt;
|
|
858
|
+
mso-pagination:widow-orphan;
|
|
859
|
+
mso-hyphenate:none;
|
|
860
|
+
tab-stops:20.15pt 62.7pt right dotted 487.6pt;
|
|
861
|
+
font-size:10.5pt;
|
|
862
|
+
font-family:$bodyfont;
|
|
863
|
+
mso-fareast-font-family:$bodyfont;
|
|
864
|
+
mso-bidi-font-family:$bodyfont;
|
|
865
|
+
mso-ansi-language:EN-GB;
|
|
866
|
+
font-weight:bold;
|
|
867
|
+
mso-bidi-font-weight:normal;}
|
|
868
|
+
p.MsoToc8, li.MsoToc8, div.MsoToc8
|
|
869
|
+
{mso-style-noshow:yes;
|
|
870
|
+
mso-style-priority:39;
|
|
871
|
+
mso-style-unhide:no;
|
|
872
|
+
mso-style-name:"TOC 8";
|
|
873
|
+
mso-style-parent:"TOC 7";
|
|
874
|
+
mso-style-next:Normal;
|
|
875
|
+
margin-top:0cm;
|
|
876
|
+
margin-right:25.0pt;
|
|
877
|
+
margin-bottom:0cm;
|
|
878
|
+
margin-left:36.0pt;
|
|
879
|
+
margin-bottom:.0001pt;
|
|
880
|
+
text-indent:-36.0pt;
|
|
881
|
+
line-height:12.0pt;
|
|
882
|
+
mso-pagination:widow-orphan;
|
|
883
|
+
mso-hyphenate:none;
|
|
884
|
+
tab-stops:20.15pt 70.3pt right dotted 487.6pt;
|
|
885
|
+
font-size:10.5pt;
|
|
886
|
+
font-family:$bodyfont;
|
|
887
|
+
mso-fareast-font-family:$bodyfont;
|
|
888
|
+
mso-bidi-font-family:$bodyfont;
|
|
889
|
+
mso-ansi-language:EN-GB;
|
|
890
|
+
font-weight:bold;
|
|
891
|
+
mso-bidi-font-weight:normal;}
|
|
892
|
+
p.MsoToc9, li.MsoToc9, div.MsoToc9
|
|
893
|
+
{mso-style-noshow:yes;
|
|
894
|
+
mso-style-priority:39;
|
|
895
|
+
mso-style-unhide:no;
|
|
896
|
+
mso-style-name:"TOC 9";
|
|
897
|
+
mso-style-parent:"TOC 8";
|
|
898
|
+
mso-style-next:Normal;
|
|
899
|
+
margin-top:0cm;
|
|
900
|
+
margin-right:25.0pt;
|
|
901
|
+
margin-bottom:0cm;
|
|
902
|
+
margin-left:36.0pt;
|
|
903
|
+
margin-bottom:.0001pt;
|
|
904
|
+
text-indent:-36.0pt;
|
|
905
|
+
line-height:12.0pt;
|
|
906
|
+
mso-pagination:widow-orphan;
|
|
907
|
+
mso-hyphenate:none;
|
|
908
|
+
tab-stops:20.15pt 78.0pt right dotted 487.6pt;
|
|
909
|
+
font-size:10.5pt;
|
|
910
|
+
font-family:$bodyfont;
|
|
911
|
+
mso-fareast-font-family:$bodyfont;
|
|
912
|
+
mso-bidi-font-family:$bodyfont;
|
|
913
|
+
mso-ansi-language:EN-GB;
|
|
914
|
+
font-weight:bold;
|
|
915
|
+
mso-bidi-font-weight:normal;}
|
|
772
916
|
p.MsoHeader, li.MsoHeader, div.MsoHeader
|
|
773
917
|
{mso-style-noshow:yes;
|
|
774
918
|
mso-style-priority:99;
|
|
@@ -609,6 +609,156 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3 {
|
|
|
609
609
|
font-weight: bold;
|
|
610
610
|
mso-bidi-font-weight: normal; }
|
|
611
611
|
|
|
612
|
+
.MsoToc4, li.MsoToc4, div.MsoToc4 {
|
|
613
|
+
mso-style-noshow: yes;
|
|
614
|
+
mso-style-priority: 39;
|
|
615
|
+
mso-style-unhide: no;
|
|
616
|
+
mso-style-name: "TOC 4";
|
|
617
|
+
mso-style-parent: "TOC 3";
|
|
618
|
+
mso-style-next: Normal;
|
|
619
|
+
margin-top: 0cm;
|
|
620
|
+
margin-right: 25.0pt;
|
|
621
|
+
margin-bottom: 0cm;
|
|
622
|
+
margin-left: 36.0pt;
|
|
623
|
+
margin-bottom: .0001pt;
|
|
624
|
+
text-indent: -36.0pt;
|
|
625
|
+
line-height: 12.0pt;
|
|
626
|
+
mso-pagination: widow-orphan;
|
|
627
|
+
mso-hyphenate: none;
|
|
628
|
+
tab-stops: 20.15pt 47.9pt right dotted 487.6pt;
|
|
629
|
+
font-size: 10.5pt;
|
|
630
|
+
font-family: {{bodyfont}};
|
|
631
|
+
mso-fareast-font-family: {{bodyfont}};
|
|
632
|
+
mso-bidi-font-family: {{bodyfont}};
|
|
633
|
+
mso-ansi-language: EN-GB;
|
|
634
|
+
font-weight: bold;
|
|
635
|
+
mso-bidi-font-weight: normal; }
|
|
636
|
+
|
|
637
|
+
p.MsoToc5, li.MsoToc5, div.MsoToc5 {
|
|
638
|
+
mso-style-noshow: yes;
|
|
639
|
+
mso-style-priority: 39;
|
|
640
|
+
mso-style-unhide: no;
|
|
641
|
+
mso-style-name: "TOC 5";
|
|
642
|
+
mso-style-parent: "TOC 4";
|
|
643
|
+
mso-style-next: Normal;
|
|
644
|
+
margin-top: 0cm;
|
|
645
|
+
margin-right: 25.0pt;
|
|
646
|
+
margin-bottom: 0cm;
|
|
647
|
+
margin-left: 36.0pt;
|
|
648
|
+
margin-bottom: .0001pt;
|
|
649
|
+
text-indent: -36.0pt;
|
|
650
|
+
line-height: 12.0pt;
|
|
651
|
+
mso-pagination: widow-orphan;
|
|
652
|
+
mso-hyphenate: none;
|
|
653
|
+
tab-stops: 20.15pt 47.9pt right dotted 487.6pt;
|
|
654
|
+
font-size: 10.5pt;
|
|
655
|
+
font-family: {{bodyfont}};
|
|
656
|
+
mso-fareast-font-family: {{bodyfont}};
|
|
657
|
+
mso-bidi-font-family: {{bodyfont}};
|
|
658
|
+
mso-ansi-language: EN-GB;
|
|
659
|
+
font-weight: bold;
|
|
660
|
+
mso-bidi-font-weight: normal; }
|
|
661
|
+
|
|
662
|
+
p.MsoToc6, li.MsoToc6, div.MsoToc6 {
|
|
663
|
+
mso-style-noshow: yes;
|
|
664
|
+
mso-style-priority: 39;
|
|
665
|
+
mso-style-unhide: no;
|
|
666
|
+
mso-style-name: "TOC 6";
|
|
667
|
+
mso-style-parent: "TOC 5";
|
|
668
|
+
mso-style-next: Normal;
|
|
669
|
+
margin-top: 0cm;
|
|
670
|
+
margin-right: 25.0pt;
|
|
671
|
+
margin-bottom: 0cm;
|
|
672
|
+
margin-left: 36.0pt;
|
|
673
|
+
margin-bottom: .0001pt;
|
|
674
|
+
text-indent: -36.0pt;
|
|
675
|
+
line-height: 12.0pt;
|
|
676
|
+
mso-pagination: widow-orphan;
|
|
677
|
+
mso-hyphenate: none;
|
|
678
|
+
tab-stops: 20.15pt 55.0pt right dotted 487.6pt;
|
|
679
|
+
font-size: 10.5pt;
|
|
680
|
+
font-family: {{bodyfont}};
|
|
681
|
+
mso-fareast-font-family: {{bodyfont}};
|
|
682
|
+
mso-bidi-font-family: {{bodyfont}};
|
|
683
|
+
mso-ansi-language: EN-GB;
|
|
684
|
+
font-weight: bold;
|
|
685
|
+
mso-bidi-font-weight: normal; }
|
|
686
|
+
|
|
687
|
+
p.MsoToc7, li.MsoToc7, div.MsoToc7 {
|
|
688
|
+
mso-style-noshow: yes;
|
|
689
|
+
mso-style-priority: 39;
|
|
690
|
+
mso-style-unhide: no;
|
|
691
|
+
mso-style-name: "TOC 7";
|
|
692
|
+
mso-style-parent: "TOC 6";
|
|
693
|
+
mso-style-next: Normal;
|
|
694
|
+
margin-top: 0cm;
|
|
695
|
+
margin-right: 25.0pt;
|
|
696
|
+
margin-bottom: 0cm;
|
|
697
|
+
margin-left: 36.0pt;
|
|
698
|
+
margin-bottom: .0001pt;
|
|
699
|
+
text-indent: -36.0pt;
|
|
700
|
+
line-height: 12.0pt;
|
|
701
|
+
mso-pagination: widow-orphan;
|
|
702
|
+
mso-hyphenate: none;
|
|
703
|
+
tab-stops: 20.15pt 62.7pt right dotted 487.6pt;
|
|
704
|
+
font-size: 10.5pt;
|
|
705
|
+
font-family: {{bodyfont}};
|
|
706
|
+
mso-fareast-font-family: {{bodyfont}};
|
|
707
|
+
mso-bidi-font-family: {{bodyfont}};
|
|
708
|
+
mso-ansi-language: EN-GB;
|
|
709
|
+
font-weight: bold;
|
|
710
|
+
mso-bidi-font-weight: normal; }
|
|
711
|
+
|
|
712
|
+
p.MsoToc8, li.MsoToc8, div.MsoToc8 {
|
|
713
|
+
mso-style-noshow: yes;
|
|
714
|
+
mso-style-priority: 39;
|
|
715
|
+
mso-style-unhide: no;
|
|
716
|
+
mso-style-name: "TOC 8";
|
|
717
|
+
mso-style-parent: "TOC 7";
|
|
718
|
+
mso-style-next: Normal;
|
|
719
|
+
margin-top: 0cm;
|
|
720
|
+
margin-right: 25.0pt;
|
|
721
|
+
margin-bottom: 0cm;
|
|
722
|
+
margin-left: 36.0pt;
|
|
723
|
+
margin-bottom: .0001pt;
|
|
724
|
+
text-indent: -36.0pt;
|
|
725
|
+
line-height: 12.0pt;
|
|
726
|
+
mso-pagination: widow-orphan;
|
|
727
|
+
mso-hyphenate: none;
|
|
728
|
+
tab-stops: 20.15pt 70.3pt right dotted 487.6pt;
|
|
729
|
+
font-size: 10.5pt;
|
|
730
|
+
font-family: {{bodyfont}};
|
|
731
|
+
mso-fareast-font-family: {{bodyfont}};
|
|
732
|
+
mso-bidi-font-family: {{bodyfont}};
|
|
733
|
+
mso-ansi-language: EN-GB;
|
|
734
|
+
font-weight: bold;
|
|
735
|
+
mso-bidi-font-weight: normal; }
|
|
736
|
+
|
|
737
|
+
p.MsoToc9, li.MsoToc9, div.MsoToc9 {
|
|
738
|
+
mso-style-noshow: yes;
|
|
739
|
+
mso-style-priority: 39;
|
|
740
|
+
mso-style-unhide: no;
|
|
741
|
+
mso-style-name: "TOC 9";
|
|
742
|
+
mso-style-parent: "TOC 8";
|
|
743
|
+
mso-style-next: Normal;
|
|
744
|
+
margin-top: 0cm;
|
|
745
|
+
margin-right: 25.0pt;
|
|
746
|
+
margin-bottom: 0cm;
|
|
747
|
+
margin-left: 36.0pt;
|
|
748
|
+
margin-bottom: .0001pt;
|
|
749
|
+
text-indent: -36.0pt;
|
|
750
|
+
line-height: 12.0pt;
|
|
751
|
+
mso-pagination: widow-orphan;
|
|
752
|
+
mso-hyphenate: none;
|
|
753
|
+
tab-stops: 20.15pt 78.0pt right dotted 487.6pt;
|
|
754
|
+
font-size: 10.5pt;
|
|
755
|
+
font-family: {{bodyfont}};
|
|
756
|
+
mso-fareast-font-family: {{bodyfont}};
|
|
757
|
+
mso-bidi-font-family: {{bodyfont}};
|
|
758
|
+
mso-ansi-language: EN-GB;
|
|
759
|
+
font-weight: bold;
|
|
760
|
+
mso-bidi-font-weight: normal; }
|
|
761
|
+
|
|
612
762
|
p.MsoHeader, li.MsoHeader, div.MsoHeader {
|
|
613
763
|
mso-style-noshow: yes;
|
|
614
764
|
mso-style-priority: 99;
|