metanorma-iso 2.0.8 → 2.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (57) hide show
  1. checksums.yaml +4 -4
  2. data/lib/html2doc/lists.rb +37 -0
  3. data/lib/isodoc/iso/base_convert.rb +1 -1
  4. data/lib/isodoc/iso/html/html_iso_titlepage.html +5 -0
  5. data/lib/isodoc/iso/html/isodoc-dis.css +304 -242
  6. data/lib/isodoc/iso/html/isodoc-dis.scss +379 -260
  7. data/lib/isodoc/iso/html/word_iso_intro-dis.html +7 -0
  8. data/lib/isodoc/iso/html/word_iso_titlepage-dis.html +4 -3
  9. data/lib/isodoc/iso/html/word_iso_titlepage.html +10 -4
  10. data/lib/isodoc/iso/html/wordstyle-dis.css +168 -48
  11. data/lib/isodoc/iso/html/wordstyle-dis.scss +158 -43
  12. data/lib/isodoc/iso/html_convert.rb +2 -2
  13. data/lib/isodoc/iso/i18n-en.yaml +1 -0
  14. data/lib/isodoc/iso/i18n-fr.yaml +1 -0
  15. data/lib/isodoc/iso/i18n-ru.yaml +1 -0
  16. data/lib/isodoc/iso/i18n-zh-Hans.yaml +1 -0
  17. data/lib/isodoc/iso/init.rb +17 -1
  18. data/lib/isodoc/iso/iso.amendment.xsl +1697 -426
  19. data/lib/isodoc/iso/iso.international-standard.xsl +1697 -426
  20. data/lib/isodoc/iso/metadata.rb +13 -19
  21. data/lib/isodoc/iso/presentation_inline.rb +90 -0
  22. data/lib/isodoc/iso/presentation_xml_convert.rb +41 -100
  23. data/lib/isodoc/iso/presentation_xref.rb +126 -0
  24. data/lib/isodoc/iso/sections.rb +2 -2
  25. data/lib/isodoc/iso/word_cleanup.rb +16 -2
  26. data/lib/isodoc/iso/word_convert.rb +29 -12
  27. data/lib/isodoc/iso/word_dis_convert.rb +183 -0
  28. data/lib/isodoc/iso/xref.rb +46 -25
  29. data/lib/metanorma/iso/biblio.rng +37 -8
  30. data/lib/metanorma/iso/boilerplate-fr.xml +1 -1
  31. data/lib/metanorma/iso/boilerplate-ru.xml +1 -3
  32. data/lib/metanorma/iso/boilerplate.xml +1 -3
  33. data/lib/metanorma/iso/cleanup.rb +2 -1
  34. data/lib/metanorma/iso/isodoc.rng +56 -0
  35. data/lib/metanorma/iso/version.rb +1 -1
  36. data/lib/metanorma-iso.rb +1 -0
  37. data/lib/relaton/render/config.yml +4 -0
  38. data/lib/relaton/render/general.rb +13 -0
  39. data/metanorma-iso.gemspec +1 -1
  40. data/spec/isodoc/amd_spec.rb +31 -30
  41. data/spec/isodoc/blocks_spec.rb +286 -179
  42. data/spec/isodoc/i18n_spec.rb +187 -21
  43. data/spec/isodoc/inline_spec.rb +35 -42
  44. data/spec/isodoc/iso_spec.rb +1 -1
  45. data/spec/isodoc/metadata_spec.rb +17 -17
  46. data/spec/isodoc/postproc_spec.rb +28 -3
  47. data/spec/isodoc/ref_spec.rb +66 -69
  48. data/spec/isodoc/section_spec.rb +78 -76
  49. data/spec/isodoc/table_spec.rb +2 -2
  50. data/spec/isodoc/terms_spec.rb +2 -2
  51. data/spec/isodoc/word_dis_spec.rb +760 -0
  52. data/spec/isodoc/xref_spec.rb +51 -51
  53. data/spec/metanorma/base_spec.rb +10 -10
  54. data/spec/spec_helper.rb +11 -1
  55. data/spec/vcr_cassettes/withdrawn_iso.yml +26 -26
  56. metadata +11 -5
  57. data/spec/vcr_cassettes/docrels.yml +0 -385
data/lib/isodoc/iso/html/word_iso_intro-dis.html CHANGED
@@ -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
data/lib/isodoc/iso/html/word_iso_titlepage-dis.html CHANGED
@@ -25,7 +25,7 @@
25
25
  {% endif %}
26
26
 
27
27
  <p class="zzCover">
28
- <span lang="EN-GB">{{ doctitleintro }}{% if doctitleintro and doctitlemain %} &mdash; {% endif %}{{ doctitlemain }}{% if doctitlemain and doctitlepart %} &mdash; {% endif %}{% if doctitlepart %}{% if doctitlepartlabel %}{{ doctitlepartlabel }}: {% endif %}{{ doctitlepart }}</span>{% endif %}
28
+ <span lang="EN-GB">{{ doctitleintro }}{% if doctitleintro and doctitlemain %} &#x2014; {% endif %}{{ doctitlemain }}{% if doctitlemain and doctitlepart %} &#x2014; {% endif %}{% if doctitlepart %}{% if doctitlepartlabel %}{{ doctitlepartlabel }}: {% endif %}{{ doctitlepart }}</span>{% endif %}
29
29
  </p>
30
30
  {% if doctitleamdlabel %}
31
31
  <p class="zzCover">{{ doctitleamdlabel }}{% if doctitleamd %}: {{ doctitleamd }}{% endif %}</p>
@@ -34,7 +34,7 @@
34
34
  <p class="zzCover">{{ doctitlecorrlabel }}</p>
35
35
  {% endif %}
36
36
 
37
- <p class="zzCover">{{ docsubtitleintro }}{% if docsubtitleintro and docsubtitlemain %} &mdash; {% endif %}{{ docsubtitlemain }}{% if docsubtitlemain and docsubtitlepart %} &mdash; {% endif %}{% if docsubtitlepart %}{% if docsubtitlepartlabel %}{{ docsubtitlepartlabel }}: {% endif %}{{ docsubtitlepart }}{% endif %}
37
+ <p class="zzCover">{{ docsubtitleintro }}{% if docsubtitleintro and docsubtitlemain %} &#x2014; {% endif %}{{ docsubtitlemain }}{% if docsubtitlemain and docsubtitlepart %} &#x2014; {% endif %}{% if docsubtitlepart %}{% if docsubtitlepartlabel %}{{ docsubtitlepartlabel }}: {% endif %}{{ docsubtitlepart }}{% endif %}
38
38
  </p>
39
39
  {% if docsubtitleamdlabel %}
40
40
  <p class="zzCover">{{ docsubtitleamdlabel }}{% if docsubtitleamd %}: {{ docsubtitleamd }}{% endif %}</p>
@@ -42,7 +42,8 @@
42
42
  {% if docsubtitlecorrlabel %}
43
43
  <p class="zzCover">{{ docsubtitlecorrlabel }}</p>
44
44
  {% endif %}
45
- {% endif %}
45
+
46
+ <div class="coverpage-warning" id="coverpage-note-destination"/>
46
47
 
47
48
  </div>
48
49
 
data/lib/isodoc/iso/html/word_iso_titlepage.html CHANGED
@@ -29,12 +29,16 @@ style='mso-no-proof:yes'>{{ agency }}&#xa0;{{ 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 %}
35
39
 
36
40
  <p class="MsoNormal" align="left" style='text-align:left;line-height:18.0pt;margin-top:100.0pt;margin-bottom:0.0pt;font-size:16.0pt'>
37
- <span class="title"><b>{{ doctitleintro }}{% if doctitleintro and doctitlemain %} &mdash; {% endif %}</b></span><b><span class="subtitle">{{ doctitlemain }}{% if doctitlemain and doctitlepart %} &mdash;{% endif %}</b></span>
41
+ <span class="title"><b>{{ doctitleintro }}{% if doctitleintro and doctitlemain %} &#x2014; {% endif %}</b></span><b><span class="subtitle">{{ doctitlemain }}{% if doctitlemain and doctitlepart %} &#x2014;{% endif %}</b></span>
38
42
  {% if doctitlepart %}
39
43
  {% if doctitlepartlabel %}<span class="partlabel">{{ doctitlepartlabel }}: </span><br/>{% endif %}
40
44
  <span class="part"><b>{{ doctitlepart }}</b></span>
@@ -51,7 +55,7 @@ style='mso-no-proof:yes'>{{ agency }}&#xa0;{{ editorialgroup | join: "/" }}</spa
51
55
  {% else %}
52
56
  <br/>
53
57
  <p class="MsoNormal" align="left" style='text-align:left;line-height:18.0pt;margin-bottom:0.0pt;font-size:16.0pt'>
54
- <span class="title">{{ docsubtitleintro }}{% if docsubtitleintro and docsubtitlemain %} &mdash; {% endif %}</span><span class="subtitle">{{ docsubtitlemain }}{% if docsubtitlemain and docsubtitlepart %} &mdash;{% endif %}</span>
58
+ <span class="title">{{ docsubtitleintro }}{% if docsubtitleintro and docsubtitlemain %} &#x2014; {% endif %}</span><span class="subtitle">{{ docsubtitlemain }}{% if docsubtitlemain and docsubtitlepart %} &#x2014;{% endif %}</span>
55
59
  {% if docsubtitlepart %}
56
60
  {% if docsubtitlepartlabel %}<span class="partlabel">{{ docsubtitlepartlabel }}: </span><br/>{% endif %}
57
61
  <span class="part">{{ docsubtitlepart }}</span>
@@ -67,7 +71,7 @@ style='mso-no-proof:yes'>{{ agency }}&#xa0;{{ editorialgroup | join: "/" }}</spa
67
71
 
68
72
 
69
73
 
70
- <p class="MsoNormal" style='margin-top:100.0pt'><span lang="EN-GB"><o:p>&nbsp;</o:p></span></p>
74
+ <p class="MsoNormal" style='margin-top:100.0pt'><span lang="EN-GB"><o:p>&#xa0;</o:p></span></p>
71
75
 
72
76
  <div style='mso-element:para-border-div;border:solid windowtext 1.0pt;
73
77
  mso-border-alt:solid windowtext .5pt;padding:1.0pt 4.0pt 1.0pt 4.0pt;
@@ -79,7 +83,7 @@ lang="EN-GB" style='font-size:40.0pt'>{% if unpublished %}{{ stageabbr }} stage{
79
83
 
80
84
  </div>
81
85
 
82
- <p class="MsoNormal" style='margin-bottom:6.0pt'><span lang="EN-GB"><o:p>&nbsp;</o:p></span></p>
86
+ <p class="MsoNormal" style='margin-bottom:6.0pt'><span lang="EN-GB"><o:p>&#xa0;</o:p></span></p>
83
87
 
84
88
  {% if unpublished %}
85
89
  <!--
@@ -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
 
data/lib/isodoc/iso/html/wordstyle-dis.css CHANGED
@@ -296,6 +296,7 @@ h1, .h1 {
296
296
  mso-style-name: "Heading 1";
297
297
  mso-style-link: "Heading 1 Char";
298
298
  mso-style-next: Normal;
299
+ mso-outline-level: 1;
299
300
  margin-top: 13.5pt;
300
301
  margin-right: 0cm;
301
302
  margin-bottom: 12.0pt;
@@ -318,7 +319,6 @@ h1, .h1 {
318
319
  mso-bidi-font-weight: normal; }
319
320
 
320
321
  h1 {
321
- mso-outline-level: 1;
322
322
  mso-list: l1 level1 lfo6; }
323
323
 
324
324
  h1.ForewordTitle {
@@ -342,7 +342,6 @@ h1.Annex {
342
342
  mso-pagination: widow-orphan;
343
343
  page-break-after: avoid;
344
344
  font-weight: normal;
345
- mso-outline-level: 1;
346
345
  mso-list: l1 level1 lfo6;
347
346
  mso-hyphenate: none;
348
347
  tab-stops: 20.0pt list 21.6pt left 28.0pt;
@@ -391,6 +390,7 @@ h2, .h2 {
391
390
  mso-style-parent: "Heading 1";
392
391
  mso-style-link: "Heading 2 Char";
393
392
  mso-style-next: Normal;
393
+ mso-outline-level: 2;
394
394
  margin-top: 3.0pt;
395
395
  margin-right: 0cm;
396
396
  margin-bottom: 12.0pt;
@@ -412,8 +412,7 @@ h2, .h2 {
412
412
  mso-bidi-font-weight: normal; }
413
413
 
414
414
  h2 {
415
- mso-list: l1 level2 lfo6;
416
- mso-outline-level: 2; }
415
+ mso-list: l1 level2 lfo6; }
417
416
 
418
417
  .h3Annex {
419
418
  mso-style-priority: 3;
@@ -472,8 +471,7 @@ h3, .h3 {
472
471
  mso-bidi-font-weight: normal; }
473
472
 
474
473
  h3 {
475
- mso-list: l1 level3 lfo6;
476
- mso-outline-level: 3; }
474
+ mso-list: l1 level3 lfo6; }
477
475
 
478
476
  .h4Annex {
479
477
  mso-style-priority: 4;
@@ -510,6 +508,7 @@ h4, .h4 {
510
508
  mso-style-parent: "Heading 3";
511
509
  mso-style-link: "Heading 4 Char";
512
510
  mso-style-next: Normal;
511
+ mso-outline-level: 4;
513
512
  margin-top: 3.0pt;
514
513
  margin-right: 0cm;
515
514
  margin-bottom: 12.0pt;
@@ -530,8 +529,7 @@ h4, .h4 {
530
529
  mso-bidi-font-weight: normal; }
531
530
 
532
531
  h4 {
533
- mso-list: l1 level4 lfo6;
534
- mso-outline-level: 4; }
532
+ mso-list: l1 level4 lfo6; }
535
533
 
536
534
  .h5Annex {
537
535
  mso-style-priority: 5;
@@ -568,6 +566,7 @@ h5, .h5 {
568
566
  mso-style-parent: "Heading 4";
569
567
  mso-style-link: "Heading 5 Char";
570
568
  mso-style-next: Normal;
569
+ mso-outline-level: 5;
571
570
  margin-top: 3.0pt;
572
571
  margin-right: 0cm;
573
572
  margin-bottom: 6.0pt;
@@ -588,8 +587,7 @@ h5, .h5 {
588
587
  mso-bidi-font-weight: normal; }
589
588
 
590
589
  h5 {
591
- mso-list: l1 level5 lfo6;
592
- mso-outline-level: 5; }
590
+ mso-list: l1 level5 lfo6; }
593
591
 
594
592
  h6, .h6 {
595
593
  mso-style-priority: 6;
@@ -599,6 +597,7 @@ h6, .h6 {
599
597
  mso-style-parent: "Heading 5";
600
598
  mso-style-link: "Heading 6 Char";
601
599
  mso-style-next: Normal;
600
+ mso-outline-level: 6;
602
601
  margin-top: 3.0pt;
603
602
  margin-right: 0cm;
604
603
  margin-bottom: 12.0pt;
@@ -619,8 +618,129 @@ h6, .h6 {
619
618
  mso-bidi-font-weight: normal; }
620
619
 
621
620
  h6 {
622
- mso-list: l1 level6 lfo6;
623
- mso-outline-level: 6; }
621
+ mso-list: l1 level6 lfo6; }
622
+
623
+ p.a2, li.a2, div.a2 {
624
+ mso-style-name: a2;
625
+ mso-style-unhide: no;
626
+ mso-style-parent: Base_Heading;
627
+ mso-style-next: Normal;
628
+ margin-top: 13.5pt;
629
+ margin-right: 0cm;
630
+ margin-bottom: 12.0pt;
631
+ margin-left: 0cm;
632
+ text-indent: 0cm;
633
+ line-height: 13.5pt;
634
+ mso-line-height-rule: exactly;
635
+ mso-pagination: widow-orphan;
636
+ mso-outline-level: 1;
637
+ mso-list: l11 level2 lfo4;
638
+ tab-stops: list 18.0pt left 25.0pt 36.0pt;
639
+ font-size: 14.0pt;
640
+ mso-bidi-font-size: 11.0pt;
641
+ font-family: {{headerfont}};
642
+ mso-fareast-font-family: Calibri;
643
+ mso-bidi-font-family: "Times New Roman";
644
+ mso-ansi-language: EN-GB;
645
+ mso-fareast-language: EN-US;
646
+ font-weight: bold;
647
+ mso-bidi-font-weight: normal; }
648
+
649
+ p.a3, li.a3, div.a3 {
650
+ mso-style-name: a3;
651
+ mso-style-unhide: no;
652
+ mso-style-parent: Base_Heading;
653
+ mso-style-next: Normal;
654
+ margin-top: 0cm;
655
+ margin-right: 0cm;
656
+ margin-bottom: 12.0pt;
657
+ margin-left: 0cm;
658
+ text-indent: 0cm;
659
+ line-height: 12.5pt;
660
+ mso-line-height-rule: exactly;
661
+ mso-pagination: widow-orphan;
662
+ mso-outline-level: 1;
663
+ mso-list: l11 level3 lfo4;
664
+ tab-stops: 32.0pt list 36.0pt;
665
+ font-size: 11.0pt;
666
+ font-family: {{headerfont}};
667
+ mso-fareast-font-family: Calibri;
668
+ mso-bidi-font-family: "Times New Roman";
669
+ mso-ansi-language: EN-GB;
670
+ mso-fareast-language: EN-US;
671
+ font-weight: bold;
672
+ mso-bidi-font-weight: normal; }
673
+
674
+ p.a4, li.a4, div.a4 {
675
+ mso-style-name: a4;
676
+ mso-style-unhide: no;
677
+ mso-style-parent: Base_Heading;
678
+ mso-style-next: Normal;
679
+ margin-top: 0cm;
680
+ margin-right: 0cm;
681
+ margin-bottom: 12.0pt;
682
+ margin-left: 0cm;
683
+ text-indent: 0cm;
684
+ line-height: 12.0pt;
685
+ mso-pagination: widow-orphan;
686
+ mso-outline-level: 1;
687
+ mso-list: l11 level4 lfo4;
688
+ tab-stops: 44.0pt list 54.0pt;
689
+ font-size: 11.0pt;
690
+ font-family: {{headerfont}};
691
+ mso-fareast-font-family: Calibri;
692
+ mso-bidi-font-family: "Times New Roman";
693
+ mso-ansi-language: EN-GB;
694
+ mso-fareast-language: EN-US;
695
+ font-weight: bold;
696
+ mso-bidi-font-style: italic; }
697
+
698
+ p.a5, li.a5, div.a5 {
699
+ mso-style-name: a5;
700
+ mso-style-unhide: no;
701
+ mso-style-parent: Base_Heading;
702
+ mso-style-next: Normal;
703
+ margin-top: 0cm;
704
+ margin-right: 0cm;
705
+ margin-bottom: 12.0pt;
706
+ margin-left: 0cm;
707
+ text-indent: 0cm;
708
+ line-height: 12.0pt;
709
+ mso-pagination: widow-orphan;
710
+ mso-outline-level: 1;
711
+ mso-list: l11 level5 lfo4;
712
+ tab-stops: list 54.0pt left 57.0pt 68.0pt;
713
+ font-size: 11.0pt;
714
+ font-family: {{headerfont}};
715
+ mso-fareast-font-family: Calibri;
716
+ mso-bidi-font-family: "Times New Roman";
717
+ mso-ansi-language: EN-GB;
718
+ mso-fareast-language: EN-US;
719
+ font-weight: bold;
720
+ mso-bidi-font-style: italic; }
721
+
722
+ p.a6, li.a6, div.a6 {
723
+ mso-style-name: a6;
724
+ mso-style-unhide: no;
725
+ mso-style-parent: Base_Heading;
726
+ mso-style-next: Normal;
727
+ margin-top: 0cm;
728
+ margin-right: 0cm;
729
+ margin-bottom: 12.0pt;
730
+ margin-left: 0cm;
731
+ text-indent: 0cm;
732
+ line-height: 12.0pt;
733
+ mso-pagination: widow-orphan;
734
+ mso-outline-level: 1;
735
+ mso-list: l11 level6 lfo4;
736
+ tab-stops: 57.0pt 68.0pt list 72.0pt;
737
+ font-size: 11.0pt;
738
+ font-family: {{headerfont}};
739
+ mso-fareast-font-family: Calibri;
740
+ mso-bidi-font-family: "Times New Roman";
741
+ mso-ansi-language: EN-GB;
742
+ mso-fareast-language: EN-US;
743
+ font-weight: bold; }
624
744
 
625
745
  p.MsoToc1, li.MsoToc1, div.MsoToc1 {
626
746
  mso-style-priority: 39;
@@ -714,7 +834,7 @@ p.MsoHeader, li.MsoHeader, div.MsoHeader {
714
834
  font-weight: bold;
715
835
  mso-bidi-font-weight: normal; }
716
836
 
717
- p.MsoHeaderLandscape, li.MsoHeaderLandscape, div.MsoHeaderLandscape, p.msoheaderlandscape, li.msoheaderlandscape, div.msoheaderlandscape {
837
+ p.MsoHeaderLandscape, li.MsoHeaderLandscape, div.MsoHeaderLandscape {
718
838
  mso-style-name: msoheaderlandscape;
719
839
  mso-style-noshow: yes;
720
840
  mso-style-priority: 99;
@@ -757,7 +877,7 @@ p.MsoFooter, li.MsoFooter, div.MsoFooter {
757
877
  mso-bidi-font-family: {{headerfont}};
758
878
  mso-ansi-language: EN-GB; }
759
879
 
760
- p.MsoFooterLandscape, li.MsoFooterLandscape, div.MsoFooterLandscape, p.msofooterlandscape, li.msofooterlandscape, div.msofooterlandscape {
880
+ p.MsoFooterLandscape, li.MsoFooterLandscape, div.MsoFooterLandscape {
761
881
  mso-style-name: msofooterlandscape;
762
882
  mso-style-noshow: yes;
763
883
  mso-style-priority: 99;
@@ -856,7 +976,7 @@ p.MsoListContinue, li.MsoListContinue, div.MsoListContinue {
856
976
  mso-pagination: widow-orphan;
857
977
  font-size: {{normalfontsize}};
858
978
  mso-bidi-font-size: 10.0pt;
859
- font-size: {{bodyfont}};
979
+ font-family: {{bodyfont}};
860
980
  mso-fareast-font-family: "MS Mincho";
861
981
  mso-bidi-font-family: "Times New Roman";
862
982
  mso-ansi-language: EN-GB;
@@ -877,7 +997,7 @@ p.MsoListContinueCxSpFirst, li.MsoListContinueCxSpFirst, div.MsoListContinueCxSp
877
997
  mso-pagination: widow-orphan;
878
998
  font-size: {{normalfontsize}};
879
999
  mso-bidi-font-size: 10.0pt;
880
- font-size: {{bodyfont}};
1000
+ font-family: {{bodyfont}};
881
1001
  mso-fareast-font-family: "MS Mincho";
882
1002
  mso-bidi-font-family: "Times New Roman";
883
1003
  mso-ansi-language: EN-GB;
@@ -898,7 +1018,7 @@ p.MsoListContinueCxSpMiddle, li.MsoListContinueCxSpMiddle, div.MsoListContinueCx
898
1018
  mso-pagination: widow-orphan;
899
1019
  font-size: {{normalfontsize}};
900
1020
  mso-bidi-font-size: 10.0pt;
901
- font-size: {{bodyfont}};
1021
+ font-family: {{bodyfont}};
902
1022
  mso-fareast-font-family: "MS Mincho";
903
1023
  mso-bidi-font-family: "Times New Roman";
904
1024
  mso-ansi-language: EN-GB;
@@ -919,7 +1039,7 @@ p.MsoListContinueCxSpLast, li.MsoListContinueCxSpLast, div.MsoListContinueCxSpLa
919
1039
  mso-pagination: widow-orphan;
920
1040
  font-size: {{normalfontsize}};
921
1041
  mso-bidi-font-size: 10.0pt;
922
- font-size: {{bodyfont}};
1042
+ font-family: {{bodyfont}};
923
1043
  mso-fareast-font-family: "MS Mincho";
924
1044
  mso-bidi-font-family: "Times New Roman";
925
1045
  mso-ansi-language: EN-GB;
@@ -939,7 +1059,7 @@ p.MsoListContinue2, li.MsoListContinue2, div.MsoListContinue2 {
939
1059
  mso-pagination: widow-orphan;
940
1060
  tab-stops: 40.0pt;
941
1061
  font-size: {{normalfontsize}};
942
- font-size: {{bodyfont}};
1062
+ font-family: {{bodyfont}};
943
1063
  mso-fareast-font-family: Calibri;
944
1064
  mso-bidi-font-family: "Times New Roman";
945
1065
  mso-ansi-language: EN-GB;
@@ -959,7 +1079,7 @@ p.MsoListContinue3, li.MsoListContinue3, div.MsoListContinue3 {
959
1079
  mso-pagination: widow-orphan;
960
1080
  tab-stops: 60.0pt;
961
1081
  font-size: {{normalfontsize}};
962
- font-size: {{bodyfont}};
1082
+ font-family: {{bodyfont}};
963
1083
  mso-fareast-font-family: Calibri;
964
1084
  mso-bidi-font-family: "Times New Roman";
965
1085
  mso-ansi-language: EN-GB;
@@ -979,7 +1099,7 @@ p.MsoListContinue4, li.MsoListContinue4, div.MsoListContinue4 {
979
1099
  mso-pagination: widow-orphan;
980
1100
  tab-stops: 80.0pt;
981
1101
  font-size: {{normalfontsize}};
982
- font-size: {{bodyfont}};
1102
+ font-family: {{bodyfont}};
983
1103
  mso-fareast-font-family: Calibri;
984
1104
  mso-bidi-font-family: "Times New Roman";
985
1105
  mso-ansi-language: EN-GB;
@@ -1000,7 +1120,7 @@ p.MsoListContinue5, li.MsoListContinue5, div.MsoListContinue5 {
1000
1120
  line-height: 12.0pt;
1001
1121
  mso-pagination: widow-orphan;
1002
1122
  font-size: {{normalfontsize}};
1003
- font-size: {{bodyfont}};
1123
+ font-family: {{bodyfont}};
1004
1124
  mso-fareast-font-family: Calibri;
1005
1125
  mso-bidi-font-family: "Times New Roman";
1006
1126
  mso-ansi-language: EN-GB;
@@ -1022,7 +1142,7 @@ p.MsoListContinue5CxSpFirst, li.MsoListContinue5CxSpFirst, div.MsoListContinue5C
1022
1142
  line-height: 12.0pt;
1023
1143
  mso-pagination: widow-orphan;
1024
1144
  font-size: {{normalfontsize}};
1025
- font-size: {{bodyfont}};
1145
+ font-family: {{bodyfont}};
1026
1146
  mso-fareast-font-family: Calibri;
1027
1147
  mso-bidi-font-family: "Times New Roman";
1028
1148
  mso-ansi-language: EN-GB;
@@ -1044,7 +1164,7 @@ p.MsoListContinue5CxSpMiddle, li.MsoListContinue5CxSpMiddle, div.MsoListContinue
1044
1164
  line-height: 12.0pt;
1045
1165
  mso-pagination: widow-orphan;
1046
1166
  font-size: {{normalfontsize}};
1047
- font-size: {{bodyfont}};
1167
+ font-family: {{bodyfont}};
1048
1168
  mso-fareast-font-family: Calibri;
1049
1169
  mso-bidi-font-family: "Times New Roman";
1050
1170
  mso-ansi-language: EN-GB;
@@ -1066,7 +1186,7 @@ p.MsoListContinue5CxSpLast, li.MsoListContinue5CxSpLast, div.MsoListContinue5CxS
1066
1186
  line-height: 12.0pt;
1067
1187
  mso-pagination: widow-orphan;
1068
1188
  font-size: {{normalfontsize}};
1069
- font-size: {{bodyfont}};
1189
+ font-family: {{bodyfont}};
1070
1190
  mso-fareast-font-family: Calibri;
1071
1191
  mso-bidi-font-family: "Times New Roman";
1072
1192
  mso-ansi-language: EN-GB;
@@ -1740,15 +1860,15 @@ div.colophon {
1740
1860
  page: WordSection4; }
1741
1861
 
1742
1862
  /* List Definitions */
1743
- @list l0 {
1863
+ @list l11 {
1744
1864
  mso-list-id: 145051656;
1745
- mso-list-template-ids: 2112159680; }
1865
+ mso-list-template-ids: 2132838916; }
1746
1866
 
1747
- @list l0:level1 {
1867
+ @list l11:level1 {
1748
1868
  mso-level-number-format: alpha-upper;
1749
1869
  mso-level-style-link: ANNEX;
1750
1870
  mso-level-suffix: none;
1751
- mso-level-text: "Annex\00A0%1";
1871
+ mso-level-text: "Annex %1";
1752
1872
  mso-level-tab-stop: none;
1753
1873
  mso-level-number-position: left;
1754
1874
  margin-left: 0cm;
@@ -1756,93 +1876,93 @@ div.colophon {
1756
1876
  mso-ansi-font-size: 14.0pt;
1757
1877
  mso-bidi-font-size: 14.0pt;
1758
1878
  font-family: {{bodyfont}};
1759
- mso-bidi-font-family: {{bodyfont}};
1879
+ mso-bidi-font-family: "Times New Roman";
1760
1880
  mso-ansi-font-weight: bold;
1761
1881
  mso-ansi-font-style: normal; }
1762
1882
 
1763
- @list l0:level2 {
1883
+ @list l11:level2 {
1764
1884
  mso-level-style-link: a2;
1765
1885
  mso-level-text: "%1\.%2";
1766
1886
  mso-level-tab-stop: 18.0pt;
1767
1887
  mso-level-number-position: left;
1768
1888
  margin-left: 0cm;
1769
1889
  text-indent: 0cm;
1770
- mso-bidi-font-family: {{bodyfont}};
1890
+ mso-bidi-font-family: "Times New Roman";
1771
1891
  mso-ansi-font-weight: bold;
1772
1892
  mso-ansi-font-style: normal; }
1773
1893
 
1774
- @list l0:level3 {
1894
+ @list l11:level3 {
1775
1895
  mso-level-style-link: a3;
1776
1896
  mso-level-text: "%1\.%2\.%3";
1777
1897
  mso-level-tab-stop: 36.0pt;
1778
1898
  mso-level-number-position: left;
1779
1899
  margin-left: 0cm;
1780
1900
  text-indent: 0cm;
1781
- mso-bidi-font-family: {{bodyfont}};
1901
+ mso-bidi-font-family: "Times New Roman";
1782
1902
  mso-ansi-font-weight: bold;
1783
1903
  mso-ansi-font-style: normal; }
1784
1904
 
1785
- @list l0:level4 {
1905
+ @list l11:level4 {
1786
1906
  mso-level-style-link: a4;
1787
1907
  mso-level-text: "%1\.%2\.%3\.%4";
1788
1908
  mso-level-tab-stop: 54.0pt;
1789
1909
  mso-level-number-position: left;
1790
1910
  margin-left: 0cm;
1791
1911
  text-indent: 0cm;
1792
- mso-bidi-font-family: {{bodyfont}};
1912
+ mso-bidi-font-family: "Times New Roman";
1793
1913
  mso-ansi-font-weight: bold;
1794
1914
  mso-ansi-font-style: normal; }
1795
1915
 
1796
- @list l0:level5 {
1916
+ @list l11:level5 {
1797
1917
  mso-level-style-link: a5;
1798
1918
  mso-level-text: "%1\.%2\.%3\.%4\.%5";
1799
1919
  mso-level-tab-stop: 54.0pt;
1800
1920
  mso-level-number-position: left;
1801
1921
  margin-left: 0cm;
1802
1922
  text-indent: 0cm;
1803
- mso-bidi-font-family: {{bodyfont}};
1923
+ mso-bidi-font-family: "Times New Roman";
1804
1924
  mso-ansi-font-weight: bold;
1805
1925
  mso-ansi-font-style: normal; }
1806
1926
 
1807
- @list l0:level6 {
1927
+ @list l11:level6 {
1808
1928
  mso-level-style-link: a6;
1809
1929
  mso-level-text: "%1\.%2\.%3\.%4\.%5\.%6";
1810
1930
  mso-level-tab-stop: 72.0pt;
1811
1931
  mso-level-number-position: left;
1812
1932
  margin-left: 0cm;
1813
1933
  text-indent: 0cm;
1814
- mso-bidi-font-family: {{bodyfont}};
1934
+ mso-bidi-font-family: "Times New Roman";
1815
1935
  mso-ansi-font-weight: bold;
1816
1936
  mso-ansi-font-style: normal; }
1817
1937
 
1818
- @list l0:level7 {
1938
+ @list l11:level7 {
1819
1939
  mso-level-reset-level: level2;
1820
1940
  mso-level-suffix: space;
1821
- mso-level-text: "Figure\00A0%1\.%7\00A0—";
1941
+ mso-level-text: "Figure %1\.%7 —";
1822
1942
  mso-level-tab-stop: none;
1823
1943
  mso-level-number-position: left;
1824
1944
  margin-left: 0cm;
1825
1945
  text-indent: 0cm;
1826
- mso-bidi-font-family: {{bodyfont}}; }
1946
+ mso-bidi-font-family: "Times New Roman"; }
1827
1947
 
1828
- @list l0:level8 {
1948
+ @list l11:level8 {
1829
1949
  mso-level-reset-level: level2;
1830
1950
  mso-level-suffix: space;
1831
- mso-level-text: "Table\00A0%1\.%8\00A0—";
1951
+ mso-level-text: "Table %1\.%8 —";
1832
1952
  mso-level-tab-stop: none;
1833
1953
  mso-level-number-position: left;
1834
1954
  margin-left: 0cm;
1835
1955
  text-indent: 0cm;
1836
- mso-bidi-font-family: {{bodyfont}}; }
1956
+ mso-bidi-font-family: "Times New Roman"; }
1837
1957
 
1838
- @list l0:level9 {
1958
+ @list l11:level9 {
1839
1959
  mso-level-number-format: roman-lower;
1840
1960
  mso-level-text: "\(%9\)";
1841
1961
  mso-level-tab-stop: 306.0pt;
1842
1962
  mso-level-number-position: left;
1843
1963
  margin-left: 0cm;
1844
1964
  text-indent: 0cm;
1845
- mso-bidi-font-family: {{bodyfont}}; }
1965
+ mso-bidi-font-family: "Times New Roman"; }
1846
1966
 
1847
1967
  @list l1 {
1848
1968
  mso-list-id: 866942648;