asciidoctor-iso 0.8.1 → 0.9.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (39) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +1 -1
  3. data/Gemfile.lock +18 -13
  4. data/README.adoc +28 -8
  5. data/asciidoctor-iso.gemspec +3 -2
  6. data/lib/asciidoctor-iso.rb +4 -0
  7. data/lib/asciidoctor/iso/base.rb +4 -17
  8. data/lib/asciidoctor/iso/cleanup.rb +16 -1
  9. data/lib/asciidoctor/iso/cleanup_ref.rb +2 -2
  10. data/lib/asciidoctor/iso/front.rb +5 -1
  11. data/lib/asciidoctor/iso/isostandard.rng +17 -1
  12. data/lib/asciidoctor/iso/ref.rb +122 -52
  13. data/lib/asciidoctor/iso/section.rb +8 -2
  14. data/lib/asciidoctor/iso/version.rb +1 -1
  15. data/lib/metanorma/iso.rb +7 -0
  16. data/lib/metanorma/iso/processor.rb +38 -0
  17. data/spec/asciidoctor-iso/base_spec.rb +37 -8
  18. data/spec/asciidoctor-iso/blocks_spec.rb +2 -2
  19. data/spec/asciidoctor-iso/cleanup_spec.rb +71 -203
  20. data/spec/asciidoctor-iso/isobib_cache_spec.rb +164 -0
  21. data/spec/asciidoctor-iso/refs_spec.rb +263 -183
  22. data/spec/asciidoctor-iso/validate_spec.rb +30 -28
  23. data/spec/examples/iso_123_.xml +3 -3
  24. data/spec/examples/iso_123_all_parts.xml +3 -3
  25. data/spec/examples/iso_123_no_year_note.xml +3 -3
  26. data/spec/examples/iso_124_.xml +3 -3
  27. data/spec/spec_helper.rb +42 -1
  28. metadata +23 -17
  29. data/lib/asciidoctor/iso/html/header.html +0 -184
  30. data/lib/asciidoctor/iso/html/html_iso_intro.html +0 -34
  31. data/lib/asciidoctor/iso/html/html_iso_titlepage.html +0 -32
  32. data/lib/asciidoctor/iso/html/htmlstyle.scss +0 -46
  33. data/lib/asciidoctor/iso/html/isodoc.scss +0 -679
  34. data/lib/asciidoctor/iso/html/scripts.html +0 -174
  35. data/lib/asciidoctor/iso/html/style-human.scss +0 -1277
  36. data/lib/asciidoctor/iso/html/style-iso.scss +0 -1257
  37. data/lib/asciidoctor/iso/html/word_iso_intro.html +0 -72
  38. data/lib/asciidoctor/iso/html/word_iso_titlepage.html +0 -58
  39. data/lib/asciidoctor/iso/html/wordstyle.scss +0 -1135
@@ -1,5 +1,35 @@
1
1
  require "spec_helper"
2
2
 
3
+ RSpec.describe "warns when year resource fetched through isobib does not match specified year" do
4
+ specify { expect { Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true) }.to output(/There was no match for 1066/).to_stderr }
5
+ #{ISOBIB_BLANK_HDR}
6
+ [bibliography]
7
+ == Normative References
8
+
9
+ * [[[iso123,ISO 123:1066]]] _Standard_
10
+ INPUT
11
+ end
12
+
13
+ RSpec.describe "warns when resource with part number not found on ISO website" do
14
+ specify { expect { Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true) }.to output(/The provided document part may not exist, or the document may no longer be published in parts/).to_stderr }
15
+ #{ISOBIB_BLANK_HDR}
16
+ [bibliography]
17
+ == Normative References
18
+
19
+ * [[[iso123,ISO 00000-001]]] _Standard_
20
+ INPUT
21
+ end
22
+
23
+ RSpec.describe "warns when resource without part number not found on ISO website" do
24
+ specify { expect { Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true) }.to output(/If you wanted to cite all document parts for the reference/).to_stderr }
25
+ #{ISOBIB_BLANK_HDR}
26
+ [bibliography]
27
+ == Normative References
28
+
29
+ * [[[iso123,ISO 00000]]] _Standard_
30
+ INPUT
31
+ end
32
+
3
33
  RSpec.describe "warns when missing a title" do
4
34
  specify { expect { Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true) }.to output(/Table should have title/).to_stderr }
5
35
  #{VALIDATING_BLANK_HDR}
@@ -458,34 +488,6 @@ RSpec.describe "Warning if no normative references" do
458
488
  INPUT
459
489
  end
460
490
 
461
- RSpec.describe "Warning if final section is not Bibliography" do
462
- specify { expect { Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true) }.to output(%r{Final section must be \(references\) Bibliography}).to_stderr }
463
- #{VALIDATING_BLANK_HDR}
464
-
465
- .Foreword
466
- Foreword
467
-
468
- == Scope
469
-
470
- [bibliography]
471
- == Normative References
472
-
473
- == Terms and Definitions
474
-
475
- == Clause
476
-
477
- [appendix]
478
- == Appendix A
479
-
480
- [appendix]
481
- == Appendix B
482
-
483
- [bibliography]
484
- == Appendix C
485
-
486
- INPUT
487
- end
488
-
489
491
  RSpec.describe "Warning if final section is not Bibliography" do
490
492
  specify { expect { Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true) }.to output(%r{There are sections after the final Bibliography}).to_stderr }
491
493
  #{VALIDATING_BLANK_HDR}
@@ -1,6 +1,6 @@
1
1
  <bibitem type="international-standard" id="ISO123">
2
- <title format="text/plain" language="en" script="Latn">Rubber latex -- Sampling -- </title>
3
- <title format="text/plain" language="fr" script="Latn">Latex de caoutchouc -- Échantillonnage -- </title>
2
+ <title format="text/plain" language="en" script="Latn">Rubber latex -- Sampling</title>
3
+ <title format="text/plain" language="fr" script="Latn">Latex de caoutchouc -- Échantillonnage</title>
4
4
  <source type="src">https://www.iso.org/standard/23281.html</source>
5
5
  <source type="obp">https://www.iso.org/obp/ui/#!iso:std:23281:en</source>
6
6
  <source type="rss">https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</source>
@@ -42,4 +42,4 @@
42
42
  <docidentifier>ISO 123:2001</docidentifier>
43
43
  </bibitem>
44
44
  </relation>
45
- </bibitem>
45
+ </bibitem>
@@ -1,6 +1,6 @@
1
1
  <bibitem type="international-standard" id="ISO123">
2
- <title format="text/plain" language="en" script="Latn">Rubber latex -- Sampling -- </title>
3
- <title format="text/plain" language="fr" script="Latn">Latex de caoutchouc -- Échantillonnage -- </title>
2
+ <title format="text/plain" language="en" script="Latn">Rubber latex -- Sampling</title>
3
+ <title format="text/plain" language="fr" script="Latn">Latex de caoutchouc -- Échantillonnage</title>
4
4
  <source type="src">https://www.iso.org/standard/23281.html</source>
5
5
  <source type="obp">https://www.iso.org/obp/ui/#!iso:std:23281:en</source>
6
6
  <source type="rss">https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</source>
@@ -42,4 +42,4 @@
42
42
  <docidentifier>ISO 123:2001</docidentifier>
43
43
  </bibitem>
44
44
  </relation>
45
- </bibitem>
45
+ </bibitem>
@@ -1,6 +1,6 @@
1
1
  <bibitem type="international-standard" id="ISO123">
2
- <title format="text/plain" language="en" script="Latn">Rubber latex -- Sampling -- </title>
3
- <title format="text/plain" language="fr" script="Latn">Latex de caoutchouc -- Échantillonnage -- </title>
2
+ <title format="text/plain" language="en" script="Latn">Rubber latex -- Sampling</title>
3
+ <title format="text/plain" language="fr" script="Latn">Latex de caoutchouc -- Échantillonnage</title>
4
4
  <source type="src">https://www.iso.org/standard/23281.html</source>
5
5
  <source type="obp">https://www.iso.org/obp/ui/#!iso:std:23281:en</source>
6
6
  <source type="rss">https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</source>
@@ -43,4 +43,4 @@
43
43
  </bibitem>
44
44
  </relation>
45
45
  <note format="text/plain">ISO DATE: The standard is in press</note>
46
- </bibitem>
46
+ </bibitem>
@@ -1,6 +1,6 @@
1
1
  <bibitem type="international-standard" id="ISO124">
2
- <title format="text/plain" language="en" script="Latn">Latex, rubber -- Determination of total solids content -- </title>
3
- <title format="text/plain" language="fr" script="Latn">Latex de caoutchouc -- Détermination des matières solides totales -- </title>
2
+ <title format="text/plain" language="en" script="Latn">Latex, rubber -- Determination of total solids content</title>
3
+ <title format="text/plain" language="fr" script="Latn">Latex de caoutchouc -- Détermination des matières solides total</title>
4
4
  <source type="src">https://www.iso.org/standard/61884.html</source>
5
5
  <source type="obp">https://www.iso.org/obp/ui/#!iso:std:61884:en</source>
6
6
  <source type="rss">https://www.iso.org/contents/data/standard/06/18/61884.detail.rss</source>
@@ -38,4 +38,4 @@
38
38
  <docidentifier>ISO 124:2011</docidentifier>
39
39
  </bibitem>
40
40
  </relation>
41
- </bibitem>
41
+ </bibitem>
data/spec/spec_helper.rb CHANGED
@@ -31,6 +31,46 @@ ASCIIDOC_BLANK_HDR = <<~"HDR"
31
31
  :docfile: test.adoc
32
32
  :nodoc:
33
33
  :novalid:
34
+ :no-isobib:
35
+
36
+ HDR
37
+
38
+ ISOBIB_BLANK_HDR = <<~"HDR"
39
+ = Document title
40
+ Author
41
+ :docfile: test.adoc
42
+ :nodoc:
43
+ :novalid:
44
+ :no-isobib-cache:
45
+
46
+ HDR
47
+
48
+ FLUSH_CACHE_ISOBIB_BLANK_HDR = <<~"HDR"
49
+ = Document title
50
+ Author
51
+ :docfile: test.adoc
52
+ :nodoc:
53
+ :novalid:
54
+ :flush-caches:
55
+
56
+ HDR
57
+
58
+ CACHED_ISOBIB_BLANK_HDR = <<~"HDR"
59
+ = Document title
60
+ Author
61
+ :docfile: test.adoc
62
+ :nodoc:
63
+ :novalid:
64
+
65
+ HDR
66
+
67
+ LOCAL_CACHED_ISOBIB_BLANK_HDR = <<~"HDR"
68
+ = Document title
69
+ Author
70
+ :docfile: test.adoc
71
+ :nodoc:
72
+ :novalid:
73
+ :local-cache:
34
74
 
35
75
  HDR
36
76
 
@@ -39,6 +79,7 @@ VALIDATING_BLANK_HDR = <<~"HDR"
39
79
  Author
40
80
  :docfile: test.adoc
41
81
  :nodoc:
82
+ :no-isobib:
42
83
 
43
84
  HDR
44
85
 
@@ -51,7 +92,7 @@ BLANK_HDR = <<~"HDR"
51
92
  <title>
52
93
  </title>
53
94
  <docidentifier>
54
- <project-number/>
95
+ <project-number>ISO </project-number>
55
96
  </docidentifier>
56
97
  <contributor>
57
98
  <role type="author"/>
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: asciidoctor-iso
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.8.1
4
+ version: 0.9.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-06-03 00:00:00.000000000 Z
11
+ date: 2018-06-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: asciidoctor
@@ -44,28 +44,42 @@ dependencies:
44
44
  requirements:
45
45
  - - ">="
46
46
  - !ruby/object:Gem::Version
47
- version: 0.7.0
47
+ version: '0.8'
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - ">="
53
53
  - !ruby/object:Gem::Version
54
- version: 0.7.0
54
+ version: '0.8'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: isobib
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
59
  - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: 0.1.4
61
+ version: 0.1.6
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
66
  - - "~>"
67
67
  - !ruby/object:Gem::Version
68
- version: 0.1.4
68
+ version: 0.1.6
69
+ - !ruby/object:Gem::Dependency
70
+ name: iso-bib-item
71
+ requirement: !ruby/object:Gem::Requirement
72
+ requirements:
73
+ - - "~>"
74
+ - !ruby/object:Gem::Version
75
+ version: 0.1.6
76
+ type: :runtime
77
+ prerelease: false
78
+ version_requirements: !ruby/object:Gem::Requirement
79
+ requirements:
80
+ - - "~>"
81
+ - !ruby/object:Gem::Version
82
+ version: 0.1.6
69
83
  - !ruby/object:Gem::Dependency
70
84
  name: bundler
71
85
  requirement: !ruby/object:Gem::Requirement
@@ -243,17 +257,6 @@ files:
243
257
  - lib/asciidoctor/iso/cleanup_ref.rb
244
258
  - lib/asciidoctor/iso/converter.rb
245
259
  - lib/asciidoctor/iso/front.rb
246
- - lib/asciidoctor/iso/html/header.html
247
- - lib/asciidoctor/iso/html/html_iso_intro.html
248
- - lib/asciidoctor/iso/html/html_iso_titlepage.html
249
- - lib/asciidoctor/iso/html/htmlstyle.scss
250
- - lib/asciidoctor/iso/html/isodoc.scss
251
- - lib/asciidoctor/iso/html/scripts.html
252
- - lib/asciidoctor/iso/html/style-human.scss
253
- - lib/asciidoctor/iso/html/style-iso.scss
254
- - lib/asciidoctor/iso/html/word_iso_intro.html
255
- - lib/asciidoctor/iso/html/word_iso_titlepage.html
256
- - lib/asciidoctor/iso/html/wordstyle.scss
257
260
  - lib/asciidoctor/iso/inline.rb
258
261
  - lib/asciidoctor/iso/isodoc.rng
259
262
  - lib/asciidoctor/iso/isostandard.rnc
@@ -270,10 +273,13 @@ files:
270
273
  - lib/asciidoctor/iso/validate_section.rb
271
274
  - lib/asciidoctor/iso/validate_style.rb
272
275
  - lib/asciidoctor/iso/version.rb
276
+ - lib/metanorma/iso.rb
277
+ - lib/metanorma/iso/processor.rb
273
278
  - spec/asciidoctor-iso/base_spec.rb
274
279
  - spec/asciidoctor-iso/blocks_spec.rb
275
280
  - spec/asciidoctor-iso/cleanup_spec.rb
276
281
  - spec/asciidoctor-iso/inline_spec.rb
282
+ - spec/asciidoctor-iso/isobib_cache_spec.rb
277
283
  - spec/asciidoctor-iso/lists_spec.rb
278
284
  - spec/asciidoctor-iso/macros_spec.rb
279
285
  - spec/asciidoctor-iso/refs_spec.rb
@@ -1,184 +0,0 @@
1
- <html xmlns:v="urn:schemas-microsoft-com:vml"
2
- xmlns:o="urn:schemas-microsoft-com:office:office"
3
- xmlns:w="urn:schemas-microsoft-com:office:word"
4
- xmlns:m="http://schemas.microsoft.com/office/2004/12/omml"
5
- xmlns:mv="http://macVmlSchemaUri" xmlns="http://www.w3.org/TR/REC-html40">
6
-
7
- <head>
8
- <meta name=Title content="">
9
- <meta name=Keywords content="">
10
- <meta http-equiv=Content-Type content="text/html; charset=utf-8">
11
- <meta name=ProgId content=Word.Document>
12
- <meta name=Generator content="Microsoft Word 15">
13
- <meta name=Originator content="Microsoft Word 15">
14
- <link id=Main-File rel=Main-File href="../{{ filename }}.html">
15
- <!--[if gte mso 9]><xml>
16
- <o:shapedefaults v:ext="edit" spidmax="2049"/>
17
- </xml><![endif]-->
18
- </head>
19
-
20
- <body lang=EN link=blue vlink="#954F72">
21
-
22
- <div style='mso-element:footnote-separator' id=fs>
23
-
24
- <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
25
- normal'><span lang=EN-GB><span style='mso-special-character:footnote-separator'><![if !supportFootnotes]>
26
-
27
- <hr align=left size=1 width="33%">
28
-
29
- <![endif]></span></span></p>
30
-
31
- </div>
32
-
33
- <div style='mso-element:footnote-continuation-separator' id=fcs>
34
-
35
- <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
36
- normal'><span lang=EN-GB><span style='mso-special-character:footnote-continuation-separator'><![if !supportFootnotes]>
37
-
38
- <hr align=left size=1>
39
-
40
- <![endif]></span></span></p>
41
-
42
- </div>
43
-
44
- <div style='mso-element:endnote-separator' id=es>
45
-
46
- <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
47
- normal'><span lang=EN-GB><span style='mso-special-character:footnote-separator'><![if !supportFootnotes]>
48
-
49
- <hr align=left size=1 width="33%">
50
-
51
- <![endif]></span></span></p>
52
-
53
- </div>
54
-
55
- <div style='mso-element:endnote-continuation-separator' id=ecs>
56
-
57
- <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
58
- normal'><span lang=EN-GB><span style='mso-special-character:footnote-continuation-separator'><![if !supportFootnotes]>
59
-
60
- <hr align=left size=1>
61
-
62
- <![endif]></span></span></p>
63
-
64
- </div>
65
-
66
- <div style='mso-element:header' id=eha>
67
-
68
- <p class=MsoHeader align=left style='text-align:left;line-height:12.0pt;
69
- mso-line-height-rule:exactly'><span lang=EN-GB>{{ agency }}&nbsp;{{ docnumber }}:{{ docyear }}(E){{ draftinfo }}</span></p>
70
-
71
- </div>
72
-
73
- <div style='mso-element:header' id=ha>
74
-
75
- <p class=MsoHeader style='margin-bottom:18.0pt'><span lang=EN-GB
76
- style='font-size:10.0pt;mso-bidi-font-size:11.0pt;font-weight:normal'>©
77
- {{ agency }}&nbsp;{{ docyear }}&nbsp;– All rights reserved</span><span lang=EN-GB
78
- style='font-weight:normal'><o:p></o:p></span></p>
79
-
80
- </div>
81
-
82
- <div style='mso-element:footer' id=efa>
83
-
84
- <p class=MsoFooter style='margin-top:12.0pt;line-height:12.0pt;mso-line-height-rule:
85
- exactly'><!--[if supportFields]><b style='mso-bidi-font-weight:normal'><span
86
- lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
87
- style='mso-element:field-begin'></span><span
88
- style='mso-spacerun:yes'> </span>PAGE<span style='mso-spacerun:yes'>  
89
- </span>\* MERGEFORMAT <span style='mso-element:field-separator'></span></span></b><![endif]--><b
90
- style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
91
- mso-bidi-font-size:11.0pt'><span style='mso-no-proof:yes'>2</span></span></b><!--[if supportFields]><b
92
- style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
93
- mso-bidi-font-size:11.0pt'><span style='mso-element:field-end'></span></span></b><![endif]--><span
94
- lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
95
- style='mso-tab-count:1'>                                                                                                                                                                           </span>©
96
- {{ agency }}&nbsp;{{ docyear }}&nbsp;– All rights reserved<o:p></o:p></span></p>
97
-
98
- </div>
99
-
100
- <div style='mso-element:header' id=eh2>
101
-
102
- <p class=MsoHeader align=left style='text-align:left;line-height:12.0pt;
103
- mso-line-height-rule:exactly'><span lang=EN-GB>{{ agency }}&nbsp;{{ docnumber }}:{{ docyear }}(E){{ draftinfo }}</span></p>
104
-
105
- </div>
106
-
107
- <div style='mso-element:header' id=h2>
108
-
109
- <p class=MsoHeader align=right style='text-align:right;line-height:12.0pt;
110
- mso-line-height-rule:exactly'><span lang=EN-GB>{{ agency }}&nbsp;{{ docnumber }}:{{ docyear }}(E){{ draftinfo }}</span></p>
111
-
112
- </div>
113
-
114
- <div style='mso-element:footer' id=ef2>
115
-
116
- <p class=MsoFooter style='line-height:12.0pt;mso-line-height-rule:exactly'><!--[if supportFields]><span
117
- lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
118
- style='mso-element:field-begin'></span><span
119
- style='mso-spacerun:yes'> </span>PAGE<span style='mso-spacerun:yes'>  
120
- </span>\* MERGEFORMAT <span style='mso-element:field-separator'></span></span><![endif]--><span
121
- lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
122
- style='mso-no-proof:yes'>ii</span></span><!--[if supportFields]><span
123
- lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
124
- style='mso-element:field-end'></span></span><![endif]--><span lang=EN-GB
125
- style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span style='mso-tab-count:
126
- 1'>                                                                                                                                                                           </span>©
127
- {{ agency }}&nbsp;{{ docyear }}&nbsp;– All rights reserved<o:p></o:p></span></p>
128
-
129
- </div>
130
-
131
- <div style='mso-element:footer' id=f2>
132
-
133
- <p class=MsoFooter style='line-height:12.0pt'><span lang=EN-GB
134
- style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© {{ agency }}&nbsp;{{ docyear }}&nbsp;– All
135
- rights reserved<span style='mso-tab-count:1'>                                                                                                                                                                          </span></span><!--[if supportFields]><span
136
- lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
137
- style='mso-element:field-begin'></span> PAGE<span style='mso-spacerun:yes'>  
138
- </span>\* MERGEFORMAT <span style='mso-element:field-separator'></span></span><![endif]--><span
139
- lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
140
- style='mso-no-proof:yes'>iii</span></span><!--[if supportFields]><span
141
- lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
142
- style='mso-element:field-end'></span></span><![endif]--><span lang=EN-GB
143
- style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><o:p></o:p></span></p>
144
-
145
- </div>
146
-
147
- <div style='mso-element:footer' id=ef3>
148
-
149
- <p class=MsoFooter style='margin-top:12.0pt;line-height:12.0pt;mso-line-height-rule:
150
- exactly'><!--[if supportFields]><b style='mso-bidi-font-weight:normal'><span
151
- lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
152
- style='mso-element:field-begin'></span><span
153
- style='mso-spacerun:yes'> </span>PAGE<span style='mso-spacerun:yes'>  
154
- </span>\* MERGEFORMAT <span style='mso-element:field-separator'></span></span></b><![endif]--><b
155
- style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
156
- mso-bidi-font-size:11.0pt'><span style='mso-no-proof:yes'>2</span></span></b><!--[if supportFields]><b
157
- style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
158
- mso-bidi-font-size:11.0pt'><span style='mso-element:field-end'></span></span></b><![endif]--><span
159
- lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
160
- style='mso-tab-count:1'>                                                                                                                                                                           </span>©
161
- {{ agency }}&nbsp;{{ docyear }}&nbsp;– All rights reserved<o:p></o:p></span></p>
162
-
163
- </div>
164
-
165
- <div style='mso-element:footer' id=f3>
166
-
167
- <p class=MsoFooter style='line-height:12.0pt'><span lang=EN-GB
168
- style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© {{ agency }}&nbsp;{{ docyear }}&nbsp;– All
169
- rights reserved<span style='mso-tab-count:1'>                                                                                                                                                                           </span></span><!--[if supportFields]><b
170
- style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
171
- mso-bidi-font-size:11.0pt'><span style='mso-element:field-begin'></span>
172
- PAGE<span style='mso-spacerun:yes'>   </span>\* MERGEFORMAT <span
173
- style='mso-element:field-separator'></span></span></b><![endif]--><b
174
- style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
175
- mso-bidi-font-size:11.0pt'><span style='mso-no-proof:yes'>3</span></span></b><!--[if supportFields]><b
176
- style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
177
- mso-bidi-font-size:11.0pt'><span style='mso-element:field-end'></span></span></b><![endif]--><span
178
- lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><o:p></o:p></span></p>
179
-
180
- </div>
181
-
182
- </body>
183
-
184
- </html>