metanorma-iso 2.0.7 → 2.1.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/asciidoctor/iso/base.rb +0 -1
- data/lib/asciidoctor/iso/cleanup.rb +0 -1
- data/lib/asciidoctor/iso/converter.rb +0 -1
- data/lib/asciidoctor/iso/deprecated.rb +4 -2
- data/lib/asciidoctor/iso/front.rb +0 -1
- data/lib/asciidoctor/iso/front_id.rb +0 -1
- data/lib/asciidoctor/iso/section.rb +0 -1
- data/lib/asciidoctor/iso/validate.rb +0 -1
- data/lib/asciidoctor/iso/validate_image.rb +0 -1
- data/lib/asciidoctor/iso/validate_requirements.rb +0 -1
- data/lib/asciidoctor/iso/validate_section.rb +0 -1
- data/lib/asciidoctor/iso/validate_style.rb +0 -1
- data/lib/asciidoctor/iso/validate_title.rb +0 -1
- data/lib/html2doc/lists.rb +37 -0
- data/lib/isodoc/iso/html/html_iso_titlepage.html +7 -2
- data/lib/isodoc/iso/html/isodoc-dis.css +196 -156
- data/lib/isodoc/iso/html/isodoc-dis.scss +193 -156
- data/lib/isodoc/iso/html/word_iso_intro-dis.html +7 -0
- data/lib/isodoc/iso/html/word_iso_titlepage-dis.html +3 -2
- data/lib/isodoc/iso/html/word_iso_titlepage.html +8 -2
- data/lib/isodoc/iso/html/wordstyle-dis.css +204 -34
- data/lib/isodoc/iso/html/wordstyle-dis.scss +198 -34
- data/lib/isodoc/iso/i18n-en.yaml +2 -1
- data/lib/isodoc/iso/i18n-fr.yaml +1 -0
- data/lib/isodoc/iso/i18n-ru.yaml +1 -0
- data/lib/isodoc/iso/i18n-zh-Hans.yaml +1 -0
- data/lib/isodoc/iso/index.rb +1 -1
- data/lib/isodoc/iso/init.rb +17 -1
- data/lib/isodoc/iso/iso.amendment.xsl +726 -299
- data/lib/isodoc/iso/iso.international-standard.xsl +726 -299
- data/lib/isodoc/iso/metadata.rb +75 -63
- data/lib/isodoc/iso/presentation_inline.rb +90 -0
- data/lib/isodoc/iso/presentation_xml_convert.rb +39 -100
- data/lib/isodoc/iso/presentation_xref.rb +126 -0
- data/lib/isodoc/iso/word_cleanup.rb +16 -2
- data/lib/isodoc/iso/word_convert.rb +27 -10
- data/lib/isodoc/iso/word_dis_convert.rb +174 -0
- data/lib/isodoc/iso/xref.rb +50 -30
- data/lib/metanorma/iso/biblio.rng +62 -10
- data/lib/metanorma/iso/boilerplate-fr.xml +1 -1
- data/lib/metanorma/iso/boilerplate-ru.xml +1 -3
- data/lib/metanorma/iso/boilerplate.xml +1 -3
- data/lib/metanorma/iso/cleanup.rb +7 -6
- data/lib/metanorma/iso/front_id.rb +28 -11
- data/lib/metanorma/iso/isodoc.rng +56 -0
- data/lib/metanorma/iso/version.rb +1 -1
- data/lib/metanorma-iso.rb +1 -0
- data/lib/relaton/render/config.yml +4 -0
- data/lib/relaton/render/general.rb +13 -0
- data/metanorma-iso.gemspec +1 -1
- data/spec/isodoc/amd_spec.rb +15 -14
- data/spec/isodoc/blocks_spec.rb +286 -179
- data/spec/isodoc/i18n_spec.rb +296 -133
- data/spec/isodoc/inline_spec.rb +35 -42
- data/spec/isodoc/iso_spec.rb +43 -27
- data/spec/isodoc/postproc_spec.rb +25 -0
- data/spec/isodoc/ref_spec.rb +66 -69
- data/spec/isodoc/section_spec.rb +78 -76
- data/spec/isodoc/table_spec.rb +2 -2
- data/spec/isodoc/terms_spec.rb +2 -2
- data/spec/isodoc/word_dis_spec.rb +760 -0
- data/spec/isodoc/xref_spec.rb +51 -51
- data/spec/metanorma/amd_spec.rb +39 -16
- data/spec/metanorma/base_spec.rb +17 -9
- data/spec/metanorma/blocks_spec.rb +4 -4
- data/spec/metanorma/cleanup_spec.rb +11 -11
- data/spec/metanorma/section_spec.rb +3 -3
- data/spec/spec_helper.rb +5 -2
- data/spec/vcr_cassettes/withdrawn_iso.yml +26 -26
- metadata +11 -5
- data/spec/vcr_cassettes/docrels.yml +0 -385
@@ -1,6 +1,13 @@
|
|
1
1
|
{% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
|
2
2
|
{% else %}
|
3
3
|
|
4
|
+
<div style='mso-element:para-border-div;border:solid windowtext 1.0pt;
|
5
|
+
border-bottom-alt:solid windowtext .5pt;mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:
|
6
|
+
solid windowtext .5pt;mso-border-right-alt:solid windowtext .5pt;padding:1.0pt 4.0pt 0cm 4.0pt;
|
7
|
+
margin-left:5.1pt;margin-right:5.1pt'>
|
8
|
+
<div id="boilerplate-copyright-destination"/>
|
9
|
+
</div>
|
10
|
+
|
4
11
|
<p class="zzContents" style='margin-top:0cm'><span lang="EN-GB">{{ labels["table_of_contents"] }}</span></p>
|
5
12
|
|
6
13
|
WORDTOC
|
@@ -8,7 +8,7 @@
|
|
8
8
|
<p class="MsoNormal" align="right" style='text-align:right'><span lang="EN-GB">Date: <span style='mso-no-proof:yes'>{{ revdate }}</span></span></p>
|
9
9
|
{% endif %}
|
10
10
|
|
11
|
-
<p class="zzCover"><span lang="EN-GB">Reference number of project: {{
|
11
|
+
<p class="zzCover"><span lang="EN-GB">Reference number of project: {{ docnumber_undated }} {{ draftinfo }}</span></p>
|
12
12
|
|
13
13
|
<p class="zzCover"><span lang="EN-GB">Committee identification: {{agency}}/{{ editorialgroup | join: "/" }}</span></p>
|
14
14
|
|
@@ -42,7 +42,8 @@
|
|
42
42
|
{% if docsubtitlecorrlabel %}
|
43
43
|
<p class="zzCover">{{ docsubtitlecorrlabel }}</p>
|
44
44
|
{% endif %}
|
45
|
-
|
45
|
+
|
46
|
+
<div class="coverpage-warning" id="coverpage-note-destination"/>
|
46
47
|
|
47
48
|
</div>
|
48
49
|
|
@@ -6,12 +6,12 @@ style='mso-bidi-font-weight:normal'><span lang="EN-GB" style='font-size:14.0pt'>
|
|
6
6
|
{% endfor %}
|
7
7
|
{% else %}
|
8
8
|
<p class="MsoNormal" align="right" style='text-align:right'><b style='mso-bidi-font-weight:
|
9
|
-
normal'><span lang="EN-GB" style='font-size:14.0pt;mso-no-proof:yes'>{{
|
9
|
+
normal'><span lang="EN-GB" style='font-size:14.0pt;mso-no-proof:yes'>{{ docnumber_undated }} {{ draftinfo }}</span></b><b
|
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
13
|
{% if tc_docnumber.size > 0 %}
|
14
|
-
<p class="MsoNormal" align="right" style='text-align:right'><span lang="EN-GB" style='mso-no-proof:yes'>{{
|
14
|
+
<p class="MsoNormal" align="right" style='text-align:right'><span lang="EN-GB" style='mso-no-proof:yes'>{{ docnumber_undated }} {{ draftinfo }}</span></p>
|
15
15
|
{% endif %}
|
16
16
|
|
17
17
|
{% if doctitleamdlabel %}
|
@@ -29,6 +29,10 @@ style='mso-no-proof:yes'>{{ agency }} {{ editorialgroup | join: "/" }}</spa
|
|
29
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
30
|
{% endif %}
|
31
31
|
|
32
|
+
{% if edition_display %}
|
33
|
+
<p class="MsoNormal" align="right" style='text-align:right'><span lang="EN-GB">{{ edition_display | capitalize }}</span></p>
|
34
|
+
{% endif %}
|
35
|
+
|
32
36
|
{% if revdate %}
|
33
37
|
<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
38
|
{% endif %}
|
@@ -113,6 +117,8 @@ documentation.</span><span lang="EN-GB" style='font-size:10.0pt;mso-bidi-font-si
|
|
113
117
|
-->
|
114
118
|
{% endif %}
|
115
119
|
|
120
|
+
<div class="coverpage-warning" id="coverpage-note-destination"/>
|
121
|
+
|
116
122
|
<!--</div>-->
|
117
123
|
|
118
124
|
|
@@ -326,6 +326,54 @@ h1.ForewordTitle {
|
|
326
326
|
font-style: normal;
|
327
327
|
font-weight: bold; }
|
328
328
|
|
329
|
+
p.ForewordTitle, li.ForewordTitle, div.ForewordTitle {
|
330
|
+
mso-style-name: "Foreword Title";
|
331
|
+
mso-style-unhide: no;
|
332
|
+
mso-style-parent: Base_Heading;
|
333
|
+
margin-top: 15.5pt;
|
334
|
+
margin-right: 0cm;
|
335
|
+
margin-bottom: 15.5pt;
|
336
|
+
margin-left: 0cm;
|
337
|
+
line-height: 15.5pt;
|
338
|
+
page-break-before: always;
|
339
|
+
mso-pagination: widow-orphan;
|
340
|
+
page-break-after: avoid;
|
341
|
+
mso-outline-level: 1;
|
342
|
+
mso-hyphenate: none;
|
343
|
+
font-size: 14.0pt;
|
344
|
+
mso-bidi-font-size: 11.0pt;
|
345
|
+
font-family: {{headerfont}};
|
346
|
+
mso-fareast-font-family: Calibri;
|
347
|
+
mso-bidi-font-family: "Times New Roman";
|
348
|
+
mso-ansi-language: EN-GB;
|
349
|
+
mso-fareast-language: EN-US;
|
350
|
+
font-weight: bold;
|
351
|
+
mso-bidi-font-weight: normal; }
|
352
|
+
|
353
|
+
p.IntroTitle, li.IntroTitle, div.IntroTitle {
|
354
|
+
mso-style-name: "Intro Title";
|
355
|
+
mso-style-unhide: no;
|
356
|
+
mso-style-parent: "Foreword Title";
|
357
|
+
margin-top: 15.5pt;
|
358
|
+
margin-right: 0cm;
|
359
|
+
margin-bottom: 15.5pt;
|
360
|
+
margin-left: 0cm;
|
361
|
+
line-height: 15.5pt;
|
362
|
+
page-break-before: always;
|
363
|
+
mso-pagination: widow-orphan;
|
364
|
+
page-break-after: avoid;
|
365
|
+
mso-outline-level: 1;
|
366
|
+
mso-hyphenate: none;
|
367
|
+
font-size: 14.0pt;
|
368
|
+
mso-bidi-font-size: 11.0pt;
|
369
|
+
font-family: {{headerfont}};
|
370
|
+
mso-fareast-font-family: Calibri;
|
371
|
+
mso-bidi-font-family: "Times New Roman";
|
372
|
+
mso-ansi-language: EN-GB;
|
373
|
+
mso-fareast-language: EN-US;
|
374
|
+
font-weight: bold;
|
375
|
+
mso-bidi-font-weight: normal; }
|
376
|
+
|
329
377
|
h1.Annex {
|
330
378
|
mso-style-priority: 1;
|
331
379
|
mso-style-unhide: no;
|
@@ -622,6 +670,128 @@ h6 {
|
|
622
670
|
mso-list: l1 level6 lfo6;
|
623
671
|
mso-outline-level: 6; }
|
624
672
|
|
673
|
+
p.a2, li.a2, div.a2 {
|
674
|
+
mso-style-name: a2;
|
675
|
+
mso-style-unhide: no;
|
676
|
+
mso-style-parent: Base_Heading;
|
677
|
+
mso-style-next: Normal;
|
678
|
+
margin-top: 13.5pt;
|
679
|
+
margin-right: 0cm;
|
680
|
+
margin-bottom: 12.0pt;
|
681
|
+
margin-left: 0cm;
|
682
|
+
text-indent: 0cm;
|
683
|
+
line-height: 13.5pt;
|
684
|
+
mso-line-height-rule: exactly;
|
685
|
+
mso-pagination: widow-orphan;
|
686
|
+
mso-outline-level: 1;
|
687
|
+
mso-list: l11 level2 lfo4;
|
688
|
+
tab-stops: list 18.0pt left 25.0pt 36.0pt;
|
689
|
+
font-size: 14.0pt;
|
690
|
+
mso-bidi-font-size: 11.0pt;
|
691
|
+
font-family: {{headerfont}};
|
692
|
+
mso-fareast-font-family: Calibri;
|
693
|
+
mso-bidi-font-family: "Times New Roman";
|
694
|
+
mso-ansi-language: EN-GB;
|
695
|
+
mso-fareast-language: EN-US;
|
696
|
+
font-weight: bold;
|
697
|
+
mso-bidi-font-weight: normal; }
|
698
|
+
|
699
|
+
p.a3, li.a3, div.a3 {
|
700
|
+
mso-style-name: a3;
|
701
|
+
mso-style-unhide: no;
|
702
|
+
mso-style-parent: Base_Heading;
|
703
|
+
mso-style-next: Normal;
|
704
|
+
margin-top: 0cm;
|
705
|
+
margin-right: 0cm;
|
706
|
+
margin-bottom: 12.0pt;
|
707
|
+
margin-left: 0cm;
|
708
|
+
text-indent: 0cm;
|
709
|
+
line-height: 12.5pt;
|
710
|
+
mso-line-height-rule: exactly;
|
711
|
+
mso-pagination: widow-orphan;
|
712
|
+
mso-outline-level: 1;
|
713
|
+
mso-list: l11 level3 lfo4;
|
714
|
+
tab-stops: 32.0pt list 36.0pt;
|
715
|
+
font-size: 11.0pt;
|
716
|
+
font-family: {{headerfont}};
|
717
|
+
mso-fareast-font-family: Calibri;
|
718
|
+
mso-bidi-font-family: "Times New Roman";
|
719
|
+
mso-ansi-language: EN-GB;
|
720
|
+
mso-fareast-language: EN-US;
|
721
|
+
font-weight: bold;
|
722
|
+
mso-bidi-font-weight: normal; }
|
723
|
+
|
724
|
+
p.a4, li.a4, div.a4 {
|
725
|
+
mso-style-name: a4;
|
726
|
+
mso-style-unhide: no;
|
727
|
+
mso-style-parent: Base_Heading;
|
728
|
+
mso-style-next: Normal;
|
729
|
+
margin-top: 0cm;
|
730
|
+
margin-right: 0cm;
|
731
|
+
margin-bottom: 12.0pt;
|
732
|
+
margin-left: 0cm;
|
733
|
+
text-indent: 0cm;
|
734
|
+
line-height: 12.0pt;
|
735
|
+
mso-pagination: widow-orphan;
|
736
|
+
mso-outline-level: 1;
|
737
|
+
mso-list: l11 level4 lfo4;
|
738
|
+
tab-stops: 44.0pt list 54.0pt;
|
739
|
+
font-size: 11.0pt;
|
740
|
+
font-family: {{headerfont}};
|
741
|
+
mso-fareast-font-family: Calibri;
|
742
|
+
mso-bidi-font-family: "Times New Roman";
|
743
|
+
mso-ansi-language: EN-GB;
|
744
|
+
mso-fareast-language: EN-US;
|
745
|
+
font-weight: bold;
|
746
|
+
mso-bidi-font-style: italic; }
|
747
|
+
|
748
|
+
p.a5, li.a5, div.a5 {
|
749
|
+
mso-style-name: a5;
|
750
|
+
mso-style-unhide: no;
|
751
|
+
mso-style-parent: Base_Heading;
|
752
|
+
mso-style-next: Normal;
|
753
|
+
margin-top: 0cm;
|
754
|
+
margin-right: 0cm;
|
755
|
+
margin-bottom: 12.0pt;
|
756
|
+
margin-left: 0cm;
|
757
|
+
text-indent: 0cm;
|
758
|
+
line-height: 12.0pt;
|
759
|
+
mso-pagination: widow-orphan;
|
760
|
+
mso-outline-level: 1;
|
761
|
+
mso-list: l11 level5 lfo4;
|
762
|
+
tab-stops: list 54.0pt left 57.0pt 68.0pt;
|
763
|
+
font-size: 11.0pt;
|
764
|
+
font-family: {{headerfont}};
|
765
|
+
mso-fareast-font-family: Calibri;
|
766
|
+
mso-bidi-font-family: "Times New Roman";
|
767
|
+
mso-ansi-language: EN-GB;
|
768
|
+
mso-fareast-language: EN-US;
|
769
|
+
font-weight: bold;
|
770
|
+
mso-bidi-font-style: italic; }
|
771
|
+
|
772
|
+
p.a6, li.a6, div.a6 {
|
773
|
+
mso-style-name: a6;
|
774
|
+
mso-style-unhide: no;
|
775
|
+
mso-style-parent: Base_Heading;
|
776
|
+
mso-style-next: Normal;
|
777
|
+
margin-top: 0cm;
|
778
|
+
margin-right: 0cm;
|
779
|
+
margin-bottom: 12.0pt;
|
780
|
+
margin-left: 0cm;
|
781
|
+
text-indent: 0cm;
|
782
|
+
line-height: 12.0pt;
|
783
|
+
mso-pagination: widow-orphan;
|
784
|
+
mso-outline-level: 1;
|
785
|
+
mso-list: l11 level6 lfo4;
|
786
|
+
tab-stops: 57.0pt 68.0pt list 72.0pt;
|
787
|
+
font-size: 11.0pt;
|
788
|
+
font-family: {{headerfont}};
|
789
|
+
mso-fareast-font-family: Calibri;
|
790
|
+
mso-bidi-font-family: "Times New Roman";
|
791
|
+
mso-ansi-language: EN-GB;
|
792
|
+
mso-fareast-language: EN-US;
|
793
|
+
font-weight: bold; }
|
794
|
+
|
625
795
|
p.MsoToc1, li.MsoToc1, div.MsoToc1 {
|
626
796
|
mso-style-priority: 39;
|
627
797
|
mso-style-unhide: no;
|
@@ -856,7 +1026,7 @@ p.MsoListContinue, li.MsoListContinue, div.MsoListContinue {
|
|
856
1026
|
mso-pagination: widow-orphan;
|
857
1027
|
font-size: {{normalfontsize}};
|
858
1028
|
mso-bidi-font-size: 10.0pt;
|
859
|
-
font-
|
1029
|
+
font-family: {{bodyfont}};
|
860
1030
|
mso-fareast-font-family: "MS Mincho";
|
861
1031
|
mso-bidi-font-family: "Times New Roman";
|
862
1032
|
mso-ansi-language: EN-GB;
|
@@ -877,7 +1047,7 @@ p.MsoListContinueCxSpFirst, li.MsoListContinueCxSpFirst, div.MsoListContinueCxSp
|
|
877
1047
|
mso-pagination: widow-orphan;
|
878
1048
|
font-size: {{normalfontsize}};
|
879
1049
|
mso-bidi-font-size: 10.0pt;
|
880
|
-
font-
|
1050
|
+
font-family: {{bodyfont}};
|
881
1051
|
mso-fareast-font-family: "MS Mincho";
|
882
1052
|
mso-bidi-font-family: "Times New Roman";
|
883
1053
|
mso-ansi-language: EN-GB;
|
@@ -898,7 +1068,7 @@ p.MsoListContinueCxSpMiddle, li.MsoListContinueCxSpMiddle, div.MsoListContinueCx
|
|
898
1068
|
mso-pagination: widow-orphan;
|
899
1069
|
font-size: {{normalfontsize}};
|
900
1070
|
mso-bidi-font-size: 10.0pt;
|
901
|
-
font-
|
1071
|
+
font-family: {{bodyfont}};
|
902
1072
|
mso-fareast-font-family: "MS Mincho";
|
903
1073
|
mso-bidi-font-family: "Times New Roman";
|
904
1074
|
mso-ansi-language: EN-GB;
|
@@ -919,7 +1089,7 @@ p.MsoListContinueCxSpLast, li.MsoListContinueCxSpLast, div.MsoListContinueCxSpLa
|
|
919
1089
|
mso-pagination: widow-orphan;
|
920
1090
|
font-size: {{normalfontsize}};
|
921
1091
|
mso-bidi-font-size: 10.0pt;
|
922
|
-
font-
|
1092
|
+
font-family: {{bodyfont}};
|
923
1093
|
mso-fareast-font-family: "MS Mincho";
|
924
1094
|
mso-bidi-font-family: "Times New Roman";
|
925
1095
|
mso-ansi-language: EN-GB;
|
@@ -939,7 +1109,7 @@ p.MsoListContinue2, li.MsoListContinue2, div.MsoListContinue2 {
|
|
939
1109
|
mso-pagination: widow-orphan;
|
940
1110
|
tab-stops: 40.0pt;
|
941
1111
|
font-size: {{normalfontsize}};
|
942
|
-
font-
|
1112
|
+
font-family: {{bodyfont}};
|
943
1113
|
mso-fareast-font-family: Calibri;
|
944
1114
|
mso-bidi-font-family: "Times New Roman";
|
945
1115
|
mso-ansi-language: EN-GB;
|
@@ -959,7 +1129,7 @@ p.MsoListContinue3, li.MsoListContinue3, div.MsoListContinue3 {
|
|
959
1129
|
mso-pagination: widow-orphan;
|
960
1130
|
tab-stops: 60.0pt;
|
961
1131
|
font-size: {{normalfontsize}};
|
962
|
-
font-
|
1132
|
+
font-family: {{bodyfont}};
|
963
1133
|
mso-fareast-font-family: Calibri;
|
964
1134
|
mso-bidi-font-family: "Times New Roman";
|
965
1135
|
mso-ansi-language: EN-GB;
|
@@ -979,7 +1149,7 @@ p.MsoListContinue4, li.MsoListContinue4, div.MsoListContinue4 {
|
|
979
1149
|
mso-pagination: widow-orphan;
|
980
1150
|
tab-stops: 80.0pt;
|
981
1151
|
font-size: {{normalfontsize}};
|
982
|
-
font-
|
1152
|
+
font-family: {{bodyfont}};
|
983
1153
|
mso-fareast-font-family: Calibri;
|
984
1154
|
mso-bidi-font-family: "Times New Roman";
|
985
1155
|
mso-ansi-language: EN-GB;
|
@@ -1000,7 +1170,7 @@ p.MsoListContinue5, li.MsoListContinue5, div.MsoListContinue5 {
|
|
1000
1170
|
line-height: 12.0pt;
|
1001
1171
|
mso-pagination: widow-orphan;
|
1002
1172
|
font-size: {{normalfontsize}};
|
1003
|
-
font-
|
1173
|
+
font-family: {{bodyfont}};
|
1004
1174
|
mso-fareast-font-family: Calibri;
|
1005
1175
|
mso-bidi-font-family: "Times New Roman";
|
1006
1176
|
mso-ansi-language: EN-GB;
|
@@ -1022,7 +1192,7 @@ p.MsoListContinue5CxSpFirst, li.MsoListContinue5CxSpFirst, div.MsoListContinue5C
|
|
1022
1192
|
line-height: 12.0pt;
|
1023
1193
|
mso-pagination: widow-orphan;
|
1024
1194
|
font-size: {{normalfontsize}};
|
1025
|
-
font-
|
1195
|
+
font-family: {{bodyfont}};
|
1026
1196
|
mso-fareast-font-family: Calibri;
|
1027
1197
|
mso-bidi-font-family: "Times New Roman";
|
1028
1198
|
mso-ansi-language: EN-GB;
|
@@ -1044,7 +1214,7 @@ p.MsoListContinue5CxSpMiddle, li.MsoListContinue5CxSpMiddle, div.MsoListContinue
|
|
1044
1214
|
line-height: 12.0pt;
|
1045
1215
|
mso-pagination: widow-orphan;
|
1046
1216
|
font-size: {{normalfontsize}};
|
1047
|
-
font-
|
1217
|
+
font-family: {{bodyfont}};
|
1048
1218
|
mso-fareast-font-family: Calibri;
|
1049
1219
|
mso-bidi-font-family: "Times New Roman";
|
1050
1220
|
mso-ansi-language: EN-GB;
|
@@ -1066,7 +1236,7 @@ p.MsoListContinue5CxSpLast, li.MsoListContinue5CxSpLast, div.MsoListContinue5CxS
|
|
1066
1236
|
line-height: 12.0pt;
|
1067
1237
|
mso-pagination: widow-orphan;
|
1068
1238
|
font-size: {{normalfontsize}};
|
1069
|
-
font-
|
1239
|
+
font-family: {{bodyfont}};
|
1070
1240
|
mso-fareast-font-family: Calibri;
|
1071
1241
|
mso-bidi-font-family: "Times New Roman";
|
1072
1242
|
mso-ansi-language: EN-GB;
|
@@ -1740,15 +1910,15 @@ div.colophon {
|
|
1740
1910
|
page: WordSection4; }
|
1741
1911
|
|
1742
1912
|
/* List Definitions */
|
1743
|
-
@list
|
1913
|
+
@list l11 {
|
1744
1914
|
mso-list-id: 145051656;
|
1745
|
-
mso-list-template-ids:
|
1915
|
+
mso-list-template-ids: 2132838916; }
|
1746
1916
|
|
1747
|
-
@list
|
1917
|
+
@list l11:level1 {
|
1748
1918
|
mso-level-number-format: alpha-upper;
|
1749
1919
|
mso-level-style-link: ANNEX;
|
1750
1920
|
mso-level-suffix: none;
|
1751
|
-
mso-level-text: "Annex
|
1921
|
+
mso-level-text: "Annex %1";
|
1752
1922
|
mso-level-tab-stop: none;
|
1753
1923
|
mso-level-number-position: left;
|
1754
1924
|
margin-left: 0cm;
|
@@ -1756,93 +1926,93 @@ div.colophon {
|
|
1756
1926
|
mso-ansi-font-size: 14.0pt;
|
1757
1927
|
mso-bidi-font-size: 14.0pt;
|
1758
1928
|
font-family: {{bodyfont}};
|
1759
|
-
mso-bidi-font-family:
|
1929
|
+
mso-bidi-font-family: "Times New Roman";
|
1760
1930
|
mso-ansi-font-weight: bold;
|
1761
1931
|
mso-ansi-font-style: normal; }
|
1762
1932
|
|
1763
|
-
@list
|
1933
|
+
@list l11:level2 {
|
1764
1934
|
mso-level-style-link: a2;
|
1765
1935
|
mso-level-text: "%1\.%2";
|
1766
1936
|
mso-level-tab-stop: 18.0pt;
|
1767
1937
|
mso-level-number-position: left;
|
1768
1938
|
margin-left: 0cm;
|
1769
1939
|
text-indent: 0cm;
|
1770
|
-
mso-bidi-font-family:
|
1940
|
+
mso-bidi-font-family: "Times New Roman";
|
1771
1941
|
mso-ansi-font-weight: bold;
|
1772
1942
|
mso-ansi-font-style: normal; }
|
1773
1943
|
|
1774
|
-
@list
|
1944
|
+
@list l11:level3 {
|
1775
1945
|
mso-level-style-link: a3;
|
1776
1946
|
mso-level-text: "%1\.%2\.%3";
|
1777
1947
|
mso-level-tab-stop: 36.0pt;
|
1778
1948
|
mso-level-number-position: left;
|
1779
1949
|
margin-left: 0cm;
|
1780
1950
|
text-indent: 0cm;
|
1781
|
-
mso-bidi-font-family:
|
1951
|
+
mso-bidi-font-family: "Times New Roman";
|
1782
1952
|
mso-ansi-font-weight: bold;
|
1783
1953
|
mso-ansi-font-style: normal; }
|
1784
1954
|
|
1785
|
-
@list
|
1955
|
+
@list l11:level4 {
|
1786
1956
|
mso-level-style-link: a4;
|
1787
1957
|
mso-level-text: "%1\.%2\.%3\.%4";
|
1788
1958
|
mso-level-tab-stop: 54.0pt;
|
1789
1959
|
mso-level-number-position: left;
|
1790
1960
|
margin-left: 0cm;
|
1791
1961
|
text-indent: 0cm;
|
1792
|
-
mso-bidi-font-family:
|
1962
|
+
mso-bidi-font-family: "Times New Roman";
|
1793
1963
|
mso-ansi-font-weight: bold;
|
1794
1964
|
mso-ansi-font-style: normal; }
|
1795
1965
|
|
1796
|
-
@list
|
1966
|
+
@list l11:level5 {
|
1797
1967
|
mso-level-style-link: a5;
|
1798
1968
|
mso-level-text: "%1\.%2\.%3\.%4\.%5";
|
1799
1969
|
mso-level-tab-stop: 54.0pt;
|
1800
1970
|
mso-level-number-position: left;
|
1801
1971
|
margin-left: 0cm;
|
1802
1972
|
text-indent: 0cm;
|
1803
|
-
mso-bidi-font-family:
|
1973
|
+
mso-bidi-font-family: "Times New Roman";
|
1804
1974
|
mso-ansi-font-weight: bold;
|
1805
1975
|
mso-ansi-font-style: normal; }
|
1806
1976
|
|
1807
|
-
@list
|
1977
|
+
@list l11:level6 {
|
1808
1978
|
mso-level-style-link: a6;
|
1809
1979
|
mso-level-text: "%1\.%2\.%3\.%4\.%5\.%6";
|
1810
1980
|
mso-level-tab-stop: 72.0pt;
|
1811
1981
|
mso-level-number-position: left;
|
1812
1982
|
margin-left: 0cm;
|
1813
1983
|
text-indent: 0cm;
|
1814
|
-
mso-bidi-font-family:
|
1984
|
+
mso-bidi-font-family: "Times New Roman";
|
1815
1985
|
mso-ansi-font-weight: bold;
|
1816
1986
|
mso-ansi-font-style: normal; }
|
1817
1987
|
|
1818
|
-
@list
|
1988
|
+
@list l11:level7 {
|
1819
1989
|
mso-level-reset-level: level2;
|
1820
1990
|
mso-level-suffix: space;
|
1821
|
-
mso-level-text: "Figure
|
1991
|
+
mso-level-text: "Figure %1\.%7 —";
|
1822
1992
|
mso-level-tab-stop: none;
|
1823
1993
|
mso-level-number-position: left;
|
1824
1994
|
margin-left: 0cm;
|
1825
1995
|
text-indent: 0cm;
|
1826
|
-
mso-bidi-font-family:
|
1996
|
+
mso-bidi-font-family: "Times New Roman"; }
|
1827
1997
|
|
1828
|
-
@list
|
1998
|
+
@list l11:level8 {
|
1829
1999
|
mso-level-reset-level: level2;
|
1830
2000
|
mso-level-suffix: space;
|
1831
|
-
mso-level-text: "Table
|
2001
|
+
mso-level-text: "Table %1\.%8 —";
|
1832
2002
|
mso-level-tab-stop: none;
|
1833
2003
|
mso-level-number-position: left;
|
1834
2004
|
margin-left: 0cm;
|
1835
2005
|
text-indent: 0cm;
|
1836
|
-
mso-bidi-font-family:
|
2006
|
+
mso-bidi-font-family: "Times New Roman"; }
|
1837
2007
|
|
1838
|
-
@list
|
2008
|
+
@list l11:level9 {
|
1839
2009
|
mso-level-number-format: roman-lower;
|
1840
2010
|
mso-level-text: "\(%9\)";
|
1841
2011
|
mso-level-tab-stop: 306.0pt;
|
1842
2012
|
mso-level-number-position: left;
|
1843
2013
|
margin-left: 0cm;
|
1844
2014
|
text-indent: 0cm;
|
1845
|
-
mso-bidi-font-family:
|
2015
|
+
mso-bidi-font-family: "Times New Roman"; }
|
1846
2016
|
|
1847
2017
|
@list l1 {
|
1848
2018
|
mso-list-id: 866942648;
|