metanorma-itu 1.2.6 → 1.2.11
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/workflows/rake.yml +29 -8
- data/README.adoc +3 -4
- data/lib/asciidoctor/itu/basicdoc.rng +50 -3
- data/lib/asciidoctor/itu/boilerplate.xml +8 -2
- data/lib/asciidoctor/itu/cleanup.rb +9 -0
- data/lib/asciidoctor/itu/converter.rb +1 -0
- data/lib/asciidoctor/itu/front.rb +42 -8
- data/lib/asciidoctor/itu/isodoc.rng +61 -3
- data/lib/asciidoctor/itu/itu.rng +71 -0
- data/lib/asciidoctor/itu/validate.rb +14 -13
- data/lib/isodoc/itu/base_convert.rb +65 -58
- data/lib/isodoc/itu/cleanup.rb +55 -0
- data/lib/isodoc/itu/html/header.html +12 -16
- data/lib/isodoc/itu/html/html_itu_intro.html +4 -3
- data/lib/isodoc/itu/html/html_itu_titlepage.html +23 -17
- data/lib/isodoc/itu/html/htmlstyle.css +793 -745
- data/lib/isodoc/itu/html/htmlstyle.scss +15 -12
- data/lib/isodoc/itu/html/itu.css +43 -43
- data/lib/isodoc/itu/html/itu.scss +44 -43
- data/lib/isodoc/itu/html/logo-sp.png +0 -0
- data/lib/isodoc/itu/html/word_itu_intro.html +19 -3
- data/lib/isodoc/itu/html/word_itu_titlepage.html +37 -8
- data/lib/isodoc/itu/html/word_itu_titlepage_sp.html +108 -0
- data/lib/isodoc/itu/html/wordstyle.css +40 -37
- data/lib/isodoc/itu/html/wordstyle.scss +40 -37
- data/lib/isodoc/itu/html_convert.rb +4 -1
- data/lib/isodoc/itu/i18n-en.yaml +44 -0
- data/lib/isodoc/itu/itu.recommendation-annex.xsl +720 -154
- data/lib/isodoc/itu/itu.recommendation.xsl +720 -154
- data/lib/isodoc/itu/itu.resolution.xsl +720 -154
- data/lib/isodoc/itu/itu.technical-paper.xsl +5284 -0
- data/lib/isodoc/itu/itu.technical-report.xsl +5284 -0
- data/lib/isodoc/itu/metadata.rb +59 -9
- data/lib/isodoc/itu/pdf_convert.rb +2 -0
- data/lib/isodoc/itu/presentation_xml_convert.rb +104 -2
- data/lib/isodoc/itu/ref.rb +0 -13
- data/lib/isodoc/itu/terms.rb +7 -30
- data/lib/isodoc/itu/word_cleanup.rb +5 -1
- data/lib/isodoc/itu/word_convert.rb +15 -1
- data/lib/isodoc/itu/xref.rb +93 -39
- data/lib/metanorma/itu/processor.rb +10 -8
- data/lib/metanorma/itu/version.rb +1 -1
- data/metanorma-itu.gemspec +2 -2
- metadata +11 -6
Binary file
|
@@ -1,10 +1,11 @@
|
|
1
|
+
{% if doctype != "Resolution" %}
|
1
2
|
<table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0
|
2
3
|
style='border-collapse:collapse;mso-table-layout-alt:fixed;mso-padding-alt:
|
3
4
|
0cm 5.4pt 0cm 5.4pt'>
|
4
5
|
<tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes;mso-yfti-lastrow:yes'>
|
5
6
|
<td width=663 valign=top style='width:497.25pt;padding:0cm 5.4pt 0cm 5.4pt'>
|
6
7
|
<p class=RecNo><span style='mso-bookmark:_Hlk526346232'><a name=irecnoe></a><span
|
7
|
-
lang=FR-CH style='mso-ansi-language:FR-CH;font-size:14pt;font-weight:bold;'>{
|
8
|
+
lang=FR-CH style='mso-ansi-language:FR-CH;font-size:14pt;font-weight:bold;'>{% if doctype != "Service Publication" %}{{ doctype_display }} {% endif %}{{ docnumber }}<o:p></o:p></span></span></p>
|
8
9
|
<p class=Rectitle align="center"><span style='mso-bookmark:_Hlk526346232'><span lang=FR-CH
|
9
10
|
style='mso-ansi-language:FR-CH;font-size:14pt;font-weight:bold;'>{{ doctitle }}<o:p></o:p></span></span></p>
|
10
11
|
{% if annexid %}
|
@@ -42,6 +43,8 @@
|
|
42
43
|
<p class=MsoNormal><span style='mso-bookmark:_Hlk526346232'><span lang=FR-CH
|
43
44
|
style='mso-ansi-language:FR-CH'><o:p> </o:p></span></span></p>
|
44
45
|
|
46
|
+
{% if doctype != "Service Publication" %}
|
47
|
+
|
45
48
|
<p class=MsoNormal><o:wrapblock><v:shapetype id="_x0000_t202"
|
46
49
|
coordsize="21600,21600" o:spt="202" path="m,l,21600r21600,l21600,xe">
|
47
50
|
<v:stroke joinstyle="miter"/>
|
@@ -145,16 +148,26 @@ style='mso-ansi-language:EN-US'><o:p> </o:p></span></span></p>
|
|
145
148
|
</tr>
|
146
149
|
</table>
|
147
150
|
|
151
|
+
<div id="change_logbox"/>
|
152
|
+
|
153
|
+
{% endif %}
|
154
|
+
|
148
155
|
<p class=MsoNormal><span style='mso-bookmark:_Hlk526346232'><span lang=EN-US
|
149
156
|
style='mso-ansi-language:EN-US'><o:p> </o:p></span></span></p>
|
157
|
+
{% endif %}
|
150
158
|
|
159
|
+
{% if doctype == "Service Publication" %}
|
160
|
+
{% else %}
|
161
|
+
{% if doctype != "Resolution" %}
|
151
162
|
<p><br clear=all
|
152
163
|
style='page-break-before:always'></p>
|
164
|
+
{% endif %}
|
153
165
|
|
154
166
|
<div id="boilerplate-legal-destination"/>
|
155
167
|
<div id="boilerplate-license-destination"/>
|
156
168
|
<div id="boilerplate-copyright-destination"/>
|
157
169
|
|
170
|
+
{% if doctype != "Resolution" %}
|
158
171
|
<b style='mso-bidi-font-weight:normal'><span lang=EN-US style='font-size:12.0pt;
|
159
172
|
mso-bidi-font-size:10.0pt;font-family:"Times New Roman",serif;mso-fareast-font-family:
|
160
173
|
"Times New Roman";mso-ansi-language:EN-US;mso-fareast-language:EN-US;
|
@@ -162,8 +175,11 @@ mso-bidi-language:AR-SA'><br clear=all style='page-break-before:always'>
|
|
162
175
|
</span></b>
|
163
176
|
|
164
177
|
<p class=MsoNormal align=center style='text-align:center'>
|
165
|
-
<b>
|
178
|
+
<b>{{ table_of_contents }}</b></p>
|
166
179
|
<p class=MsoNormal style='tab-stops:right 17.0cm'><span style='mso-tab-count:1'/>
|
167
|
-
<b>
|
180
|
+
<b>{{ page }}</b></p>
|
168
181
|
|
169
182
|
WORDTOC
|
183
|
+
|
184
|
+
{% endif %}
|
185
|
+
{% endif %}
|
@@ -1,4 +1,5 @@
|
|
1
|
-
{% if
|
1
|
+
{% if unpublished %}
|
2
|
+
{% if doctype == "Technical Report" or doctype == "Technical Paper" or doctype == "Implementers Guide" %}
|
2
3
|
|
3
4
|
<table class="MsoNormalTable" border="0" cellspacing="0" cellpadding="0" width="662"
|
4
5
|
style='border-collapse:collapse;mso-table-layout-alt:fixed;mso-padding-alt:
|
@@ -111,6 +112,7 @@
|
|
111
112
|
<p><br clear="all" style="page-break-before:always"/></p>
|
112
113
|
|
113
114
|
{% endif %}
|
115
|
+
{% endif %}
|
114
116
|
|
115
117
|
|
116
118
|
|
@@ -204,9 +206,13 @@
|
|
204
206
|
<span style='mso-bookmark:_Hlk526346232'></span>
|
205
207
|
<td width="400" colspan="2" valign="top" style='width:300.0pt;padding:0cm 4.25pt 0cm 4.25pt'>
|
206
208
|
<p class="MsoNormal" align="right" style='margin-top:12.0pt;text-align:right'><span
|
207
|
-
style='mso-bookmark:_Hlk526346232'
|
209
|
+
style='mso-bookmark:_Hlk526346232'>
|
210
|
+
{% if doctype != "Resolution" %}
|
211
|
+
<a name="dnume"><b style='mso-bidi-font-weight:
|
208
212
|
normal'><span lang="EN-US" style='font-size:30.0pt;mso-bidi-font-size:10.0pt;
|
209
|
-
font-family:"Arial",sans-serif;mso-ansi-language:EN-US'>{% if doctype == "Recommendation" %}{{ docnumeric }}{% else %}{{
|
213
|
+
font-family:"Arial",sans-serif;mso-ansi-language:EN-US'>{% if doctype == "Recommendation" %}{{ docnumeric }}{% else %}{% if recommendationnumber %}{{ recommendationnumber }} {% endif %}{{ doctype_display }}{% endif %}<o:p></o:p></span></b></a>
|
214
|
+
{% endif %}
|
215
|
+
</span></p>
|
210
216
|
</td>
|
211
217
|
<span style='mso-bookmark:_Hlk526346232'><span style='mso-bookmark:dnume'></span></span>
|
212
218
|
</tr>
|
@@ -292,14 +298,28 @@
|
|
292
298
|
<td width="569" colspan="4" valign="bottom" style='width:426.5pt;border:none;
|
293
299
|
border-bottom:solid windowtext 1.5pt;padding:0cm 5.4pt 0cm 5.4pt;height:6.0cm;
|
294
300
|
mso-height-rule:exactly'>
|
301
|
+
{% if series %}
|
295
302
|
<p class="MsoNormal" align="left" style='text-align:left;tab-stops:39.7pt 59.55pt 79.4pt 99.25pt right 17.0cm'><span
|
296
303
|
style='mso-bookmark:_Hlk526346232'><a name="dsece"><span lang="EN-US"
|
297
304
|
style='font-size:16.0pt;mso-bidi-font-size:10.0pt;font-family:"Arial",sans-serif;
|
298
|
-
mso-ansi-language:EN-US'>
|
305
|
+
mso-ansi-language:EN-US'>SERIES {{ series | upcase }}<o:p></o:p></span></a></span></p>
|
306
|
+
{% endif %}
|
307
|
+
{% if series1 %}
|
299
308
|
<p class="MsoNormal" align="left" style='text-align:left;tab-stops:39.7pt 59.55pt 79.4pt 99.25pt right 17.0cm'><span
|
300
309
|
style='mso-bookmark:_Hlk526346232'><span style='mso-bookmark:dsece'><span
|
301
310
|
lang="EN-US" style='font-size:16.0pt;mso-bidi-font-size:10.0pt;font-family:
|
302
311
|
"Arial",sans-serif;mso-ansi-language:EN-US'>{{ series1 }} {% if series2 %}—{% endif %}{{ series2 }}<o:p></o:p></span></span></span></p>
|
312
|
+
{% endif %}
|
313
|
+
{% if meeting %}
|
314
|
+
<p class="MsoNormal" align="left" style='text-align:left;tab-stops:39.7pt 59.55pt 79.4pt 99.25pt right 17.0cm'><span
|
315
|
+
style='mso-bookmark:_Hlk526346232'><a name="dsece"><span lang="EN-US"
|
316
|
+
style='font-size:16.0pt;mso-bidi-font-size:10.0pt;font-family:"Arial",sans-serif;
|
317
|
+
mso-ansi-language:EN-US'>{{ meeting | upcase }}<o:p></o:p></span></a></span></p>
|
318
|
+
{% endif %}
|
319
|
+
{% if meeting_place or meeting_date %}
|
320
|
+
<p class="MsoNormal" align="left" style='text-align:left;tab-stops:39.7pt 59.55pt 79.4pt 99.25pt right 17.0cm'><span
|
321
|
+
lang="EN-US" style='font-size:16.0pt;mso-bidi-font-size:10.0pt;font-family:"Arial",sans-serif;mso-ansi-language:EN-US'>{{ meeting_place }}{% if meeting_place and meeting_date %}, {% endif %}{{ meeting_date }}</span></p>
|
322
|
+
{% endif %}
|
303
323
|
<span style='mso-bookmark:_Hlk526346232'><span style='mso-bookmark:dsece'></span></span>
|
304
324
|
<p class="MsoNormal" align="left" style='text-align:left;tab-stops:39.7pt 59.55pt 79.4pt 99.25pt right 17.0cm'><span
|
305
325
|
style='mso-bookmark:_Hlk526346232'><span style='mso-bookmark:dsece'><span
|
@@ -325,10 +345,15 @@
|
|
325
345
|
<span lang="EN-GB"
|
326
346
|
style='font-size:18.0pt;mso-bidi-font-size:10.0pt;font-family:"Arial",sans-serif;
|
327
347
|
mso-bidi-font-family:"Times New Roman"'>{% if annexid or amendmentid or corrigendumid %}{% if doctype != "Recommendation" %}{{ docnumeric }}<br/>{% endif %}{{ doctitle }}
|
348
|
+
{% if positiontitle %}<br/>{{ positiontitle | upcase }}{% endif %}
|
328
349
|
{% if annexid %}<br/><b>{{ annexid }}{% if annextitle %}: {{ annextitle }}{% endif %}</b>{% endif %}
|
329
350
|
{% if amendmentid %}<br/><b>{{ amendmentid }}{% if amendmenttitle %}: {{ amendmenttitle }}{% endif %}</b>{% endif %}
|
330
351
|
{% if corrigendumid %}<br/><b>{{ corrigendumid }}{% if corrigendumtitle %}: {{ corrigendumtitle }}{% endif %}</b>{% endif %}
|
331
|
-
{% else %}
|
352
|
+
{% else %}
|
353
|
+
<b>{% if doctype != "Recommendation" and doctype != "Resolution" %}{{ docnumeric }}
|
354
|
+
<br/>{% endif %}{% if doctype == "Resolution" %}{{ doctype_display }} {% endif %}{{ doctitle }}</b>
|
355
|
+
{% if positiontitle %}<br/><br/>{{ positiontitle | upcase }}{% endif %}
|
356
|
+
{% endif %}</span>
|
332
357
|
</a></span><span
|
333
358
|
style='mso-bookmark:_Hlk526346232'><span style='mso-bookmark:c1tite'><b><span
|
334
359
|
lang="EN-US" style='font-size:18.0pt;mso-bidi-font-size:10.0pt;font-family:
|
@@ -377,10 +402,14 @@
|
|
377
402
|
height:70.9pt;mso-height-rule:exactly'>
|
378
403
|
<p class="MsoNormal" align="left" style='margin-top:3.0pt;margin-right:0cm;
|
379
404
|
margin-bottom:12.0pt;margin-left:0cm;text-align:left;tab-stops:39.7pt 59.55pt 79.4pt 99.25pt right 17.0cm'><span
|
380
|
-
style='mso-bookmark:_Hlk526346232'><a name="dnum2e"></a
|
405
|
+
style='mso-bookmark:_Hlk526346232'><a name="dnum2e"></a>
|
406
|
+
{% if doctype != "Resolution" %}
|
407
|
+
<span lang="EN-US"
|
381
408
|
style='font-size:16.0pt;mso-bidi-font-size:10.0pt;font-family:"Arial",sans-serif;
|
382
|
-
mso-ansi-language:EN-US'>{% if stage == "Draft" %}Draft {% endif %}{{
|
383
|
-
</span>ITU‑{{ bureau }}<span style='mso-spacerun:yes'> </span>{{ docnumeric }}<o:p></o:p></span
|
409
|
+
mso-ansi-language:EN-US'>{% if stage == "Draft" %}Draft {% endif %}{% if recommendationnumber %}{{ recommendationnumber }} {% endif %}{{ doctype_display }}<span style='mso-spacerun:yes'>
|
410
|
+
</span>ITU‑{{ bureau }}<span style='mso-spacerun:yes'> </span>{{ docnumeric }}<o:p></o:p></span>
|
411
|
+
{% endif %}
|
412
|
+
</span></p>
|
384
413
|
<span style='mso-bookmark:_Hlk526346232'></span>
|
385
414
|
<p class="MsoNormal" align="left" style='margin-top:3.0pt;text-align:left;
|
386
415
|
tab-stops:39.7pt 59.55pt 79.4pt 99.25pt right 17.0cm'><span style='mso-bookmark:
|
@@ -0,0 +1,108 @@
|
|
1
|
+
|
2
|
+
<p class="MsoNormal" align="center" dir="RTL" style='margin-top:0cm;text-align:center;
|
3
|
+
direction:rtl;unicode-bidi:embed'><i><span lang="EN-GB" dir="LTR" style='font-size:
|
4
|
+
10.0pt'><o:p> </o:p></span></i></p>
|
5
|
+
|
6
|
+
{% if lang == "zh" %}
|
7
|
+
<p class="MsoNormal" align="center" style='margin-top:0cm;text-align:center'><i><span
|
8
|
+
lang="EN-GB" style='font-size:10.0pt'>国际电联{{ pubdate_ddMMMyyyy }}第{{ docnumeric }}期</span></i></p>
|
9
|
+
|
10
|
+
<p class="MsoNormal" align="center" style='margin-top:0cm;text-align:center'><i><span
|
11
|
+
lang="EN-GB" style='font-size:10.0pt'>《操作公报》附件</span></i></p>
|
12
|
+
{% else %}
|
13
|
+
<p class="MsoNormal" align="center" style='margin-top:0cm;text-align:center'><i><span
|
14
|
+
lang="EN-GB" style='font-size:10.0pt'>{{ annex_to_itu_ob }}</span></i></p>
|
15
|
+
|
16
|
+
<p class="MsoNormal" align="center" style='margin-top:0cm;text-align:center'><i><span
|
17
|
+
lang="EN-GB" style='font-size:10.0pt'>{{ number_abbrev }} {{ docnumeric }} – {{ pubdate_ddMMMyyyy }}</span></i></p>
|
18
|
+
{% endif %}
|
19
|
+
|
20
|
+
<p class="MEP"><span lang="EN-GB" style='font-size:10.0pt'><o:p> </o:p></span></p>
|
21
|
+
|
22
|
+
<table class="MsoNormalTable" border="0" cellspacing="0" cellpadding="0" width="643" style='border-collapse:collapse;mso-table-layout-alt:fixed;mso-padding-alt:
|
23
|
+
0cm 0cm 0cm 0cm'>
|
24
|
+
<tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes;page-break-inside:avoid;
|
25
|
+
height:3.0cm;mso-height-rule:exactly'>
|
26
|
+
<td width="85" valign="top" style='width:63.95pt;padding:0cm 5.4pt 0cm 5.4pt'>
|
27
|
+
<p class="MsoNormal" style='margin-top:0cm;margin-right:0cm;margin-bottom:0cm;
|
28
|
+
margin-left:0pt;margin-bottom:.0001pt'><span lang="EN-GB" style='font-family:FrugalSans;mso-fareast-language:ZH-CN;mso-no-proof:yes'><v:shape
|
29
|
+
id="Picture_x0020_1" o:spid="_x0000_i1033" type="#_x0000_t75" alt="logo_E"
|
30
|
+
style='width:46pt;height:52pt;visibility:visible;
|
31
|
+
mso-wrap-style:square'>
|
32
|
+
<v:imagedata src="{{ logo_sp }}" o:title="logo_E"/>
|
33
|
+
</v:shape>
|
34
|
+
</span></p>
|
35
|
+
</td>
|
36
|
+
<td width="548" style='width:411.1pt;padding:0cm 0cm 0cm 0cm;height:3.0cm;mso-height-rule:exactly'>
|
37
|
+
<p class="MsoNormal" style='margin-top:0cm'><b style='mso-bidi-font-weight:
|
38
|
+
normal'><span lang="EN-GB" style='font-size:14.0pt;mso-bidi-font-size:10.0pt'>{{ international_telecommunication_union | upcase }}</span></b></p>
|
39
|
+
</td>
|
40
|
+
</tr>
|
41
|
+
<tr style='mso-yfti-irow:1;page-break-inside:avoid;height:4.0cm;mso-height-rule:
|
42
|
+
exactly'>
|
43
|
+
<td width="95" style='width:70.9pt;padding:0cm 0cm 0cm 0cm;height:4.0cm;
|
44
|
+
mso-height-rule:exactly'>
|
45
|
+
<p class="MsoNormal" style='margin-top:0cm'><span lang="EN-GB" style='font-size:
|
46
|
+
14.0pt;mso-bidi-font-size:10.0pt'><o:p> </o:p></span></p>
|
47
|
+
</td>
|
48
|
+
<td width="548" style='width:411.1pt;padding:0cm 0cm 0cm 0cm;height:4.0cm;
|
49
|
+
mso-height-rule:exactly'>
|
50
|
+
<p class="MsoNormal" style='margin-top:0cm;text-align:left;'><b style='mso-bidi-font-weight:
|
51
|
+
normal'><span lang="EN-GB" style='font-size:18.0pt;mso-bidi-font-size:10.0pt'>{% if bureau == "R" %}{{ br }}{% endif %}{% if bureau == "T" %}{{ tsb }}{% endif %}{% if bureau == "D" %}{{ bdt }}{% endif %}<br/>
|
52
|
+
</span></b><b style='mso-bidi-font-weight:normal'><span lang="EN-GB" style='font-size:14.0pt;mso-bidi-font-size:10.0pt'>{% if bureau == "R" %}{{ br_full }}{% endif %}{% if bureau == "T" %}{{ tsb_full }}{% endif %}{% if bureau == "D" %}{{ bdt_full }}{% endif %}</span></b><span lang="EN-GB" style='font-size:14.0pt;mso-bidi-font-size:10.0pt'><o:p></o:p></span></p>
|
53
|
+
</td>
|
54
|
+
</tr>
|
55
|
+
<tr style='mso-yfti-irow:2;mso-yfti-lastrow:yes;page-break-inside:avoid;
|
56
|
+
height:42.55pt;mso-height-rule:exactly'>
|
57
|
+
<td width="95" style='width:70.9pt;padding:0cm 0cm 0cm 0cm;height:42.55pt;
|
58
|
+
mso-height-rule:exactly'>
|
59
|
+
<p class="MsoNormal" style='margin-top:5.0pt;margin-right:0cm;margin-bottom:
|
60
|
+
5.0pt;margin-left:0cm'><span lang="EN-GB" style='font-size:14.0pt;mso-bidi-font-size:
|
61
|
+
10.0pt'><o:p> </o:p></span></p>
|
62
|
+
</td>
|
63
|
+
<td width="548" style='width:411.1pt;border:none;border-bottom:solid windowtext 2.25pt;
|
64
|
+
padding:0cm 0cm 0cm 0cm;height:42.55pt;mso-height-rule:exactly'>
|
65
|
+
<p class="MsoNormal" style='margin-top:5.0pt;margin-right:0cm;margin-bottom:
|
66
|
+
5.0pt;margin-left:0cm'><b style='mso-bidi-font-weight:normal'><span
|
67
|
+
lang="EN-GB" style='font-size:18.0pt;mso-bidi-font-size:10.0pt'><o:p> </o:p></span></b></p>
|
68
|
+
</td>
|
69
|
+
</tr>
|
70
|
+
</table>
|
71
|
+
<p class="MsoNormal"><span lang="EN-GB"><o:p> </o:p></span></p>
|
72
|
+
|
73
|
+
<table class="MsoNormalTable" border="0" cellspacing="0" cellpadding="0" width="643" style='border-collapse:collapse;mso-table-layout-alt:fixed;mso-padding-alt:0cm 0cm 0cm 0cm'>
|
74
|
+
<tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes;page-break-inside:avoid;height:2.0cm;mso-height-rule:exactly'>
|
75
|
+
<td width="95" style='width:70.9pt;padding:0cm 0cm 0cm 0cm;height:2.0cm;mso-height-rule:exactly'>
|
76
|
+
<p class="MsoNormal" style='margin-top:5.0pt;margin-right:0cm;margin-bottom:5.0pt;margin-left:0cm'><span lang="EN-GB" style='font-size:14.0pt;mso-bidi-font-size:10.0pt'><o:p> </o:p></span></p>
|
77
|
+
</td>
|
78
|
+
<td width="548" style='width:411.1pt;padding:0cm 0cm 0cm 0cm;height:2.0cm;mso-height-rule:exactly'>
|
79
|
+
<p class="MsoNormal" style='margin-top:5.0pt;margin-right:0cm;margin-bottom:5.0pt;margin-left:0cm'><b style='mso-bidi-font-weight:normal'><span
|
80
|
+
lang="EN-GB" style='font-size:18.0pt;mso-bidi-font-size:10.0pt'><o:p> </o:p></span></b></p>
|
81
|
+
</td>
|
82
|
+
</tr>
|
83
|
+
<tr style='mso-yfti-irow:1;page-break-inside:avoid'>
|
84
|
+
<td width="95" style='width:70.9pt;padding:0cm 0cm 0cm 0cm'>
|
85
|
+
<p class="MsoNormal"><span lang="EN-GB" style='font-size:14.0pt;mso-bidi-font-size:10.0pt'><o:p> </o:p></span></p>
|
86
|
+
</td>
|
87
|
+
<td width="548" style='width:411.1pt;padding:0cm 0cm 0cm 0cm'>
|
88
|
+
<p class="MsoNormal"><b style='mso-bidi-font-weight:normal'><span lang="EN-GB" style='font-size:14.0pt;mso-bidi-font-size:10.0pt'>{{ doctitle }}</span></b></p>
|
89
|
+
{% if positiontitle %}<p class="MsoNormal"/>
|
90
|
+
<p class="MsoNormal" style='font-size:14.0pt'>{{ positiontitle | upcase }}</p>{% endif %}
|
91
|
+
</td>
|
92
|
+
</tr>
|
93
|
+
<tr style='mso-yfti-irow:2;mso-yfti-lastrow:yes;page-break-inside:avoid;height:2.0cm;mso-height-rule:exactly'>
|
94
|
+
<td width="95" style='width:70.9pt;padding:0cm 0cm 0cm 0cm;height:2.0cm;mso-height-rule:exactly'>
|
95
|
+
<p class="MsoNormal"><span lang="EN-GB" style='font-size:14.0pt;mso-bidi-font-size:10.0pt'><o:p> </o:p></span></p>
|
96
|
+
</td>
|
97
|
+
<td width="548" style='width:411.1pt;border:none;border-bottom:solid windowtext 2.25pt;padding:0cm 0cm 0cm 0cm;height:2.0cm;mso-height-rule:exactly'>
|
98
|
+
<p class="MsoNormal"><b style='mso-bidi-font-weight:normal'><span lang="EN-GB" style='font-size:14.0pt;mso-bidi-font-size:10.0pt'><o:p> </o:p></span></b></p>
|
99
|
+
</td>
|
100
|
+
</tr>
|
101
|
+
</table>
|
102
|
+
|
103
|
+
<p class="MEP"> </p>
|
104
|
+
|
105
|
+
<p class="MEP"> </p>
|
106
|
+
|
107
|
+
<p class="MsoNormal" style='margin-left:2.0cm;text-indent:-2.0cm'><b
|
108
|
+
style='mso-bidi-font-weight:normal'><span lang="EN-GB" style='font-size:12.0pt;mso-bidi-font-size:10.0pt'>{{ placedate_year }}</span></b></p>
|
@@ -90,7 +90,7 @@ p.MsoNormal, li.MsoNormal, div.MsoNormal {
|
|
90
90
|
mso-layout-grid-align: none;
|
91
91
|
punctuation-wrap: simple;
|
92
92
|
text-autospace: none;
|
93
|
-
font-size:
|
93
|
+
font-size: {{normalfontsize}};
|
94
94
|
font-family: {{bodyfont}};
|
95
95
|
mso-fareast-font-family: "Times New Roman";
|
96
96
|
mso-ansi-language: EN-US;
|
@@ -108,7 +108,7 @@ p.MsoListParagraph, li.MsoListParagraph, div.MsoListParagraph {
|
|
108
108
|
/* do not put in margin-left, it is specific to list level */
|
109
109
|
mso-add-space: auto;
|
110
110
|
mso-pagination: widow-orphan;
|
111
|
-
font-size:
|
111
|
+
font-size: {{normalfontsize}};
|
112
112
|
font-family: {{bodyfont}};
|
113
113
|
mso-ansi-language: EN-AU;
|
114
114
|
mso-fareast-language: EN-US; }
|
@@ -126,7 +126,7 @@ p.MsoListParagraphCxSpFirst, li.MsoListParagraphCxSpFirst, div.MsoListParagraphC
|
|
126
126
|
/* do not put in margin-left, it is specific to list level */
|
127
127
|
mso-add-space: auto;
|
128
128
|
mso-pagination: widow-orphan;
|
129
|
-
font-size:
|
129
|
+
font-size: {{normalfontsize}};
|
130
130
|
font-family: {{bodyfont}};
|
131
131
|
mso-ansi-language: EN-AU;
|
132
132
|
mso-fareast-language: EN-US; }
|
@@ -144,7 +144,7 @@ p.MsoListParagraphCxSpMiddle, li.MsoListParagraphCxSpMiddle, div.MsoListParagrap
|
|
144
144
|
/* do not put in margin-left, it is specific to list level */
|
145
145
|
mso-add-space: auto;
|
146
146
|
mso-pagination: widow-orphan;
|
147
|
-
font-size:
|
147
|
+
font-size: {{normalfontsize}};
|
148
148
|
font-family: {{bodyfont}};
|
149
149
|
mso-ansi-language: EN-AU;
|
150
150
|
mso-fareast-language: EN-US; }
|
@@ -162,7 +162,7 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
|
|
162
162
|
/* do not put in margin-left, it is specific to list level */
|
163
163
|
mso-add-space: auto;
|
164
164
|
mso-pagination: widow-orphan;
|
165
|
-
font-size:
|
165
|
+
font-size: {{normalfontsize}};
|
166
166
|
font-family: {{bodyfont}};
|
167
167
|
mso-ansi-language: EN-AU;
|
168
168
|
mso-fareast-language: EN-US; }
|
@@ -263,7 +263,7 @@ p.MsoBodyText, li.MsoBodyText, div.MsoBodyText {
|
|
263
263
|
margin-left: 0cm;
|
264
264
|
margin-bottom: .0001pt;
|
265
265
|
mso-pagination: widow-orphan;
|
266
|
-
font-size:
|
266
|
+
font-size: {{normalfontsize}};
|
267
267
|
font-family: {{bodyfont}};
|
268
268
|
mso-fareast-font-family: "Times New Roman";
|
269
269
|
mso-bidi-font-family: "Times New Roman";
|
@@ -380,7 +380,7 @@ p.MsoCommentSubject, li.MsoCommentSubject, div.MsoCommentSubject {
|
|
380
380
|
mso-layout-grid-align: none;
|
381
381
|
punctuation-wrap: simple;
|
382
382
|
text-autospace: none;
|
383
|
-
font-size:
|
383
|
+
font-size: {{normalfontsize}};
|
384
384
|
mso-bidi-font-size: 10.0pt;
|
385
385
|
font-family: {{bodyfont}};
|
386
386
|
mso-fareast-font-family: "Times New Roman";
|
@@ -437,7 +437,7 @@ p.MsoRMPane, li.MsoRMPane, div.MsoRMPane {
|
|
437
437
|
margin: 0cm;
|
438
438
|
margin-bottom: .0001pt;
|
439
439
|
mso-pagination: widow-orphan;
|
440
|
-
font-size:
|
440
|
+
font-size: {{normalfontsize}};
|
441
441
|
mso-bidi-font-size: 10.0pt;
|
442
442
|
font-family: {{bodyfont}};
|
443
443
|
mso-fareast-font-family: SimSun;
|
@@ -479,12 +479,15 @@ h1 {
|
|
479
479
|
mso-layout-grid-align: none;
|
480
480
|
punctuation-wrap: simple;
|
481
481
|
text-autospace: none;
|
482
|
-
font-size:
|
482
|
+
font-size: {{normalfontsize}};
|
483
483
|
mso-bidi-font-size: 10.0pt;
|
484
484
|
mso-list: l1 level1 lfo6;
|
485
485
|
mso-hyphenate: none;
|
486
486
|
font-family: {{headerfont}};
|
487
487
|
mso-fareast-font-family: {{headerfont}};
|
488
|
+
{% if doctype == "Resolution" %}
|
489
|
+
text-align: center;
|
490
|
+
{% endif %}
|
488
491
|
color: black;
|
489
492
|
font-weight: bold;
|
490
493
|
mso-font-kerning: 0pt;
|
@@ -534,7 +537,7 @@ p.h1Preface {
|
|
534
537
|
mso-layout-grid-align: none;
|
535
538
|
punctuation-wrap: simple;
|
536
539
|
text-autospace: none;
|
537
|
-
font-size:
|
540
|
+
font-size: {{normalfontsize}};
|
538
541
|
mso-bidi-font-size: 10.0pt;
|
539
542
|
font-family: {{headerfont}};
|
540
543
|
mso-fareast-font-family: {{headerfont}};
|
@@ -587,7 +590,7 @@ h1.Annex {
|
|
587
590
|
mso-style-parent: "Heading 1";
|
588
591
|
mso-style-link: "Heading 2 Char";
|
589
592
|
mso-style-next: Normal;
|
590
|
-
margin-top:
|
593
|
+
margin-top: {{normalfontsize}};
|
591
594
|
margin-right: 0cm;
|
592
595
|
margin-bottom: 6pt;
|
593
596
|
margin-left: 39.7pt;
|
@@ -600,7 +603,7 @@ h1.Annex {
|
|
600
603
|
tab-stops: 39.7pt 59.55pt 79.4pt 99.25pt;
|
601
604
|
punctuation-wrap: simple;
|
602
605
|
text-autospace: none;
|
603
|
-
font-size:
|
606
|
+
font-size: {{normalfontsize}};
|
604
607
|
font-weight: bold;
|
605
608
|
mso-bidi-font-size: 10.0pt;
|
606
609
|
font-family: {{headerfont}};
|
@@ -618,7 +621,7 @@ h2 {
|
|
618
621
|
mso-style-parent: "Heading 1";
|
619
622
|
mso-style-link: "Heading 2 Char";
|
620
623
|
mso-style-next: Normal;
|
621
|
-
margin-top:
|
624
|
+
margin-top: {{normalfontsize}};
|
622
625
|
margin-right: 0cm;
|
623
626
|
margin-bottom: 6pt;
|
624
627
|
margin-left: 39.7pt;
|
@@ -632,7 +635,7 @@ h2 {
|
|
632
635
|
tab-stops: 39.7pt 59.55pt 79.4pt 99.25pt;
|
633
636
|
punctuation-wrap: simple;
|
634
637
|
text-autospace: none;
|
635
|
-
font-size:
|
638
|
+
font-size: {{normalfontsize}};
|
636
639
|
mso-bidi-font-size: 10.0pt;
|
637
640
|
font-family: {{headerfont}};
|
638
641
|
mso-fareast-font-family: {{headerfont}};
|
@@ -661,7 +664,7 @@ h3 {
|
|
661
664
|
mso-list: l1 level3 lfo6;
|
662
665
|
mso-hyphenate: none;
|
663
666
|
tab-stops: 39.7pt 59.55pt 79.4pt 99.25pt;
|
664
|
-
font-size:
|
667
|
+
font-size: {{normalfontsize}};
|
665
668
|
mso-bidi-font-size: 10.0pt;
|
666
669
|
font-family: {{headerfont}};
|
667
670
|
color: black;
|
@@ -693,7 +696,7 @@ h4 {
|
|
693
696
|
mso-layout-grid-align: none;
|
694
697
|
punctuation-wrap: simple;
|
695
698
|
text-autospace: none;
|
696
|
-
font-size:
|
699
|
+
font-size: {{normalfontsize}};
|
697
700
|
mso-bidi-font-size: 10.0pt;
|
698
701
|
font-family: {{headerfont}};
|
699
702
|
color: black;
|
@@ -725,7 +728,7 @@ h5 {
|
|
725
728
|
mso-layout-grid-align: none;
|
726
729
|
punctuation-wrap: simple;
|
727
730
|
text-autospace: none;
|
728
|
-
font-size:
|
731
|
+
font-size: {{normalfontsize}};
|
729
732
|
mso-bidi-font-size: 10.0pt;
|
730
733
|
font-weight: bold;
|
731
734
|
font-family: {{headerfont}};
|
@@ -755,7 +758,7 @@ h6 {
|
|
755
758
|
mso-layout-grid-align: none;
|
756
759
|
punctuation-wrap: simple;
|
757
760
|
text-autospace: none;
|
758
|
-
font-size:
|
761
|
+
font-size: {{normalfontsize}};
|
759
762
|
mso-bidi-font-size: 10.0pt;
|
760
763
|
mso-list: l1 level6 lfo6;
|
761
764
|
mso-hyphenate: none;
|
@@ -785,7 +788,7 @@ p.MsoHeading7, li.MsoHeading7, div.MsoHeading7 {
|
|
785
788
|
mso-layout-grid-align: none;
|
786
789
|
punctuation-wrap: simple;
|
787
790
|
text-autospace: none;
|
788
|
-
font-size:
|
791
|
+
font-size: {{normalfontsize}};
|
789
792
|
mso-bidi-font-size: 10.0pt;
|
790
793
|
font-family: {{headerfont}};
|
791
794
|
mso-fareast-font-family: "Times New Roman";
|
@@ -812,7 +815,7 @@ p.MsoHeading8, li.MsoHeading8, div.MsoHeading8 {
|
|
812
815
|
mso-layout-grid-align: none;
|
813
816
|
punctuation-wrap: simple;
|
814
817
|
text-autospace: none;
|
815
|
-
font-size:
|
818
|
+
font-size: {{normalfontsize}};
|
816
819
|
mso-bidi-font-size: 10.0pt;
|
817
820
|
font-family: {{headerfont}};
|
818
821
|
mso-fareast-font-family: "Times New Roman";
|
@@ -839,7 +842,7 @@ p.MsoHeading9, li.MsoHeading9, div.MsoHeading9 {
|
|
839
842
|
mso-layout-grid-align: none;
|
840
843
|
punctuation-wrap: simple;
|
841
844
|
text-autospace: none;
|
842
|
-
font-size:
|
845
|
+
font-size: {{normalfontsize}};
|
843
846
|
mso-bidi-font-size: 10.0pt;
|
844
847
|
font-family: {{headerfont}};
|
845
848
|
mso-fareast-font-family: "Times New Roman";
|
@@ -862,7 +865,7 @@ p.MsoIndex1, li.MsoIndex1, div.MsoIndex1 {
|
|
862
865
|
mso-layout-grid-align: none;
|
863
866
|
punctuation-wrap: simple;
|
864
867
|
text-autospace: none;
|
865
|
-
font-size:
|
868
|
+
font-size: {{normalfontsize}};
|
866
869
|
mso-bidi-font-size: 10.0pt;
|
867
870
|
font-family: {{bodyfont}};
|
868
871
|
mso-fareast-font-family: "Times New Roman";
|
@@ -883,7 +886,7 @@ p.MsoIndex2, li.MsoIndex2, div.MsoIndex2 {
|
|
883
886
|
mso-layout-grid-align: none;
|
884
887
|
punctuation-wrap: simple;
|
885
888
|
text-autospace: none;
|
886
|
-
font-size:
|
889
|
+
font-size: {{normalfontsize}};
|
887
890
|
mso-bidi-font-size: 10.0pt;
|
888
891
|
font-family: {{bodyfont}};
|
889
892
|
mso-fareast-font-family: "Times New Roman";
|
@@ -904,7 +907,7 @@ p.MsoIndex3, li.MsoIndex3, div.MsoIndex3 {
|
|
904
907
|
mso-layout-grid-align: none;
|
905
908
|
punctuation-wrap: simple;
|
906
909
|
text-autospace: none;
|
907
|
-
font-size:
|
910
|
+
font-size: {{normalfontsize}};
|
908
911
|
mso-bidi-font-size: 10.0pt;
|
909
912
|
font-family: {{bodyfont}};
|
910
913
|
mso-fareast-font-family: "Times New Roman";
|
@@ -926,7 +929,7 @@ p.MsoToc1, li.MsoToc1, div.MsoToc1 {
|
|
926
929
|
mso-layout-grid-align: none;
|
927
930
|
punctuation-wrap: simple;
|
928
931
|
text-autospace: none;
|
929
|
-
font-size:
|
932
|
+
font-size: {{normalfontsize}};
|
930
933
|
mso-bidi-font-size: 10.0pt;
|
931
934
|
font-family: {{bodyfont}};
|
932
935
|
mso-fareast-font-family: {{bodyfont}};
|
@@ -952,7 +955,7 @@ p.MsoToc2, li.MsoToc2, div.MsoToc2 {
|
|
952
955
|
mso-layout-grid-align: none;
|
953
956
|
punctuation-wrap: simple;
|
954
957
|
text-autospace: none;
|
955
|
-
font-size:
|
958
|
+
font-size: {{normalfontsize}};
|
956
959
|
mso-bidi-font-size: 10.0pt;
|
957
960
|
font-family: {{bodyfont}};
|
958
961
|
mso-fareast-font-family: {{bodyfont}};
|
@@ -978,7 +981,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3 {
|
|
978
981
|
mso-layout-grid-align: none;
|
979
982
|
punctuation-wrap: simple;
|
980
983
|
text-autospace: none;
|
981
|
-
font-size:
|
984
|
+
font-size: {{normalfontsize}};
|
982
985
|
mso-bidi-font-size: 10.0pt;
|
983
986
|
font-family: {{bodyfont}};
|
984
987
|
mso-fareast-font-family: {{bodyfont}};
|
@@ -1002,7 +1005,7 @@ p.MsoToc4, li.MsoToc4, div.MsoToc4 {
|
|
1002
1005
|
mso-layout-grid-align: none;
|
1003
1006
|
punctuation-wrap: simple;
|
1004
1007
|
text-autospace: none;
|
1005
|
-
font-size:
|
1008
|
+
font-size: {{normalfontsize}};
|
1006
1009
|
mso-bidi-font-size: 10.0pt;
|
1007
1010
|
font-family: {{bodyfont}};
|
1008
1011
|
mso-fareast-font-family: {{bodyfont}};
|
@@ -1026,7 +1029,7 @@ p.MsoToc5, li.MsoToc5, div.MsoToc5 {
|
|
1026
1029
|
mso-layout-grid-align: none;
|
1027
1030
|
punctuation-wrap: simple;
|
1028
1031
|
text-autospace: none;
|
1029
|
-
font-size:
|
1032
|
+
font-size: {{normalfontsize}};
|
1030
1033
|
mso-bidi-font-size: 10.0pt;
|
1031
1034
|
font-family: {{bodyfont}};
|
1032
1035
|
mso-fareast-font-family: {{bodyfont}};
|
@@ -1050,7 +1053,7 @@ p.MsoToc6, li.MsoToc6, div.MsoToc6 {
|
|
1050
1053
|
mso-layout-grid-align: none;
|
1051
1054
|
punctuation-wrap: simple;
|
1052
1055
|
text-autospace: none;
|
1053
|
-
font-size:
|
1056
|
+
font-size: {{normalfontsize}};
|
1054
1057
|
mso-bidi-font-size: 10.0pt;
|
1055
1058
|
font-family: {{bodyfont}};
|
1056
1059
|
mso-fareast-font-family: {{bodyfont}};
|
@@ -1074,7 +1077,7 @@ p.MsoToc7, li.MsoToc7, div.MsoToc7 {
|
|
1074
1077
|
mso-layout-grid-align: none;
|
1075
1078
|
punctuation-wrap: simple;
|
1076
1079
|
text-autospace: none;
|
1077
|
-
font-size:
|
1080
|
+
font-size: {{normalfontsize}};
|
1078
1081
|
mso-bidi-font-size: 10.0pt;
|
1079
1082
|
font-family: {{bodyfont}};
|
1080
1083
|
mso-fareast-font-family: {{bodyfont}};
|
@@ -1098,7 +1101,7 @@ p.MsoToc8, li.MsoToc8, div.MsoToc8 {
|
|
1098
1101
|
mso-layout-grid-align: none;
|
1099
1102
|
punctuation-wrap: simple;
|
1100
1103
|
text-autospace: none;
|
1101
|
-
font-size:
|
1104
|
+
font-size: {{normalfontsize}};
|
1102
1105
|
mso-bidi-font-size: 10.0pt;
|
1103
1106
|
font-family: {{bodyfont}};
|
1104
1107
|
mso-fareast-font-family: {{bodyfont}};
|
@@ -1122,7 +1125,7 @@ p.MsoToc9, li.MsoToc9, div.MsoToc9 {
|
|
1122
1125
|
mso-layout-grid-align: none;
|
1123
1126
|
punctuation-wrap: simple;
|
1124
1127
|
text-autospace: none;
|
1125
|
-
font-size:
|
1128
|
+
font-size: {{normalfontsize}};
|
1126
1129
|
mso-bidi-font-size: 10.0pt;
|
1127
1130
|
font-family: {{bodyfont}};
|
1128
1131
|
mso-fareast-font-family: {{bodyfont}};
|
@@ -1156,7 +1159,7 @@ p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText {
|
|
1156
1159
|
mso-layout-grid-align: none;
|
1157
1160
|
punctuation-wrap: simple;
|
1158
1161
|
text-autospace: none;
|
1159
|
-
font-size:
|
1162
|
+
font-size: {{footnotefontsize}};
|
1160
1163
|
mso-bidi-font-size: 10.0pt;
|
1161
1164
|
font-family: {{bodyfont}};
|
1162
1165
|
mso-fareast-font-family: {{bodyfont}};
|
@@ -1174,9 +1177,9 @@ p.MsoBodyText, li.MsoBodyText, div.MsoBodyText {
|
|
1174
1177
|
margin-bottom: 6.0pt;
|
1175
1178
|
margin-left: 0cm;
|
1176
1179
|
text-align: justify;
|
1177
|
-
line-height:
|
1180
|
+
line-height: {{normalfontsize}};
|
1178
1181
|
mso-pagination: widow-orphan;
|
1179
|
-
font-size:
|
1182
|
+
font-size: {{normalfontsize}};
|
1180
1183
|
font-family: {{bodyfont}};
|
1181
1184
|
mso-fareast-font-family: {{bodyfont}};
|
1182
1185
|
mso-bidi-font-family: {{bodyfont}};
|
@@ -1206,7 +1209,7 @@ span.Heading2Char {
|
|
1206
1209
|
mso-style-locked: yes;
|
1207
1210
|
mso-style-parent: "";
|
1208
1211
|
mso-style-link: "Heading 2";
|
1209
|
-
mso-ansi-font-size:
|
1212
|
+
mso-ansi-font-size: {{normalfontsize}};
|
1210
1213
|
font-family: {{headerfont}};
|
1211
1214
|
mso-ascii-font-family: Cambria;
|
1212
1215
|
mso-fareast-font-family: {{headerfont}};
|