metanorma-un 0.3.6 → 0.3.7

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 (17) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/macos.yml +0 -7
  3. data/.github/workflows/ubuntu.yml +2 -9
  4. data/.github/workflows/windows.yml +0 -8
  5. data/lib/asciidoctor/un/biblio.rng +53 -26
  6. data/lib/asciidoctor/un/converter.rb +3 -2
  7. data/lib/asciidoctor/un/isodoc.rng +28 -1
  8. data/lib/asciidoctor/un/un.rng +1 -0
  9. data/lib/isodoc/un/html/scripts.html +4 -20
  10. data/lib/isodoc/un/html/word_unece_plenary_titlepage.html +113 -65
  11. data/lib/isodoc/un/pdf_convert.rb +13 -115
  12. data/lib/isodoc/un/un.plenary.xsl +3520 -0
  13. data/lib/isodoc/un/un.recommendation.xsl +12962 -0
  14. data/lib/isodoc/un/word_convert.rb +1 -0
  15. data/lib/metanorma/un/processor.rb +4 -0
  16. data/lib/metanorma/un/version.rb +1 -1
  17. metadata +4 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: dd4f80384b6c543d056b1205a778b4b6d92d413ff32fb22ab16766a5c8e0ef16
4
- data.tar.gz: 865a4de4708b9a437e94551606df7ad2bf7edeaaa269071ef93cab9bd44455e5
3
+ metadata.gz: 873d4b1e69a95f4b3d315783d6816908c1026dd790a0bbe3d7ce041ae7030dd2
4
+ data.tar.gz: 940f35ff9d38869dac57e8227c646d286e5996ec9b287e623e6f1e892cd1fb88
5
5
  SHA512:
6
- metadata.gz: b3bd067351e32036adbd85dc737707587b33a30d0693d44601add8b49a36c4447c730a704f101d4ed8fadb45dd5e383ebb97f43311aa96834e20b227df3e5ffa
7
- data.tar.gz: 850793c9413a4fa8e7621c459343bf5ccc8d5c16717a0500a6ac369cfe83ba7933b5c3fc58ba85a61cd45494c3a7bae7d9cba0dbe42e895c3dd932127f4c3aaf
6
+ metadata.gz: ce2d0399506090653519eb73550059893bdb505c41dfc2589b7346e4641f3441b3d18af3b47783173cd18ab19fddd1d8aac287f6ae495a6a62120f5f7b09077b
7
+ data.tar.gz: 75a2e3dcaba39ceb1697faf9b5071c3f5f8de513b7b1710b8ffb9c13f7cdf13c038debb540658ba377e74fbb060e78c56de23b7eb7433f30e26cb5b98ea7e0ed
data/.github/workflows/macos.yml CHANGED
@@ -26,13 +26,6 @@ jobs:
26
26
  run: |
27
27
  sudo gem install bundler --force
28
28
  bundle install --jobs 4 --retry 3
29
- - name: Use Node
30
- uses: actions/setup-node@v1
31
- with:
32
- node-version: '8'
33
- - name: Install Puppeteer
34
- run: |
35
- npm install -g puppeteer
36
29
  - name: Run specs
37
30
  run: |
38
31
  bundle exec rake
data/.github/workflows/ubuntu.yml CHANGED
@@ -26,18 +26,11 @@ jobs:
26
26
  run: |
27
27
  gem install bundler
28
28
  bundle install --jobs 4 --retry 3
29
- - name: Use Node
30
- uses: actions/setup-node@v1
31
- with:
32
- node-version: '8'
33
- - name: Install Puppeteer
34
- run: |
35
- npm install -g puppeteer
36
29
  - name: Run specs
37
30
  run: |
38
31
  bundle exec rake
39
32
  - name: Trigger dependent repositories
40
- if: github.ref == 'refs/heads/master'
33
+ if: github.ref == 'refs/heads/master' && matrix.ruby == '2.6'
41
34
  env:
42
35
  GH_USERNAME: ${{ secrets.PAT_USERNAME }}
43
36
  GH_ACCESS_TOKEN: ${{ secrets.PAT_TOKEN }}
@@ -46,5 +39,5 @@ jobs:
46
39
  [[ -f ".github/workflows/dependent_repos.env" ]] && source .github/workflows/dependent_repos.env
47
40
  for repo in $DEPENDENT_REPOS
48
41
  do
49
- sh trigger-gh-actions.sh $ORGANISATION $repo $GH_USERNAME $GH_ACCESS_TOKEN $GITHUB_REPOSITORY
42
+ sh trigger-gh-actions.sh $ORGANISATION $repo $GH_USERNAME $GH_ACCESS_TOKEN $GITHUB_REPOSITORY "{ \"ref\": \"${GITHUB_REF}\" }"
50
43
  done
data/.github/workflows/windows.yml CHANGED
@@ -27,15 +27,7 @@ jobs:
27
27
  run: |
28
28
  gem install bundler
29
29
  bundle config --local path vendor/bundle
30
- bundle update
31
30
  bundle install --jobs 4 --retry 3
32
- - name: Use Node
33
- uses: actions/setup-node@v1
34
- with:
35
- node-version: '8'
36
- - name: Install Puppeteer
37
- run: |
38
- npm install -g puppeteer
39
31
  - name: Run specs
40
32
  run: |
41
33
  bundle exec rake
data/lib/asciidoctor/un/biblio.rng CHANGED
@@ -767,6 +767,8 @@
767
767
  <value>unchanged</value>
768
768
  <value>circulated</value>
769
769
  <value>adapted</value>
770
+ <value>vote-started</value>
771
+ <value>vote-ended</value>
770
772
  </choice>
771
773
  </define>
772
774
  <define name="bdate">
@@ -1019,38 +1021,63 @@
1019
1021
  </define>
1020
1022
  <define name="DocRelationType">
1021
1023
  <choice>
1022
- <value>obsoletes</value>
1023
- <value>obsoletedBy</value>
1024
- <value>supersedes</value>
1025
- <value>supersededBy</value>
1026
- <value>updates</value>
1027
- <value>updatedBy</value>
1028
- <value>complements</value>
1029
- <value>derivedFrom</value>
1030
- <value>translatedFrom</value>
1031
- <value>hasTranslation</value>
1032
- <value>adoptedFrom</value>
1033
- <value>equivalent</value>
1034
- <value>identical</value>
1035
- <value>nonequivalent</value>
1036
- <value>includedIn</value>
1037
1024
  <value>includes</value>
1038
- <value>instance</value>
1039
- <value>instanceOf</value>
1040
- <value>partOf</value>
1025
+ <value>includedIn</value>
1041
1026
  <value>hasPart</value>
1042
- <value>hasDraft</value>
1043
- <value>draftOf</value>
1027
+ <value>partOf</value>
1044
1028
  <value>merges</value>
1029
+ <value>mergedInto</value>
1045
1030
  <value>splits</value>
1046
- <value>amends</value>
1047
- <value>amendedBy</value>
1048
- <value>corrects</value>
1049
- <value>correctedBy</value>
1050
- <value>revises</value>
1051
- <value>revisedBy</value>
1031
+ <value>splitInto</value>
1032
+ <value>instance</value>
1033
+ <value>hasInstance</value>
1034
+ <value>exemplarOf</value>
1035
+ <value>hasExemplar</value>
1036
+ <value>manifestationOf</value>
1037
+ <value>hasManifestation</value>
1038
+ <value>reproductionOf</value>
1039
+ <value>hasReproduction</value>
1040
+ <value>reprintOf</value>
1041
+ <value>hasReprint</value>
1042
+ <value>expressionOf</value>
1043
+ <value>hasExpression</value>
1044
+ <value>translatedFrom</value>
1045
+ <value>hasTranslation</value>
1046
+ <value>arrangementOf</value>
1047
+ <value>hasArrangement</value>
1048
+ <value>abridgementOf</value>
1049
+ <value>hasAbridgement</value>
1050
+ <value>annotationOf</value>
1051
+ <value>hasAnnotation</value>
1052
+ <value>draftOf</value>
1053
+ <value>hasDraft</value>
1054
+ <value>editionOf</value>
1055
+ <value>hasEdition</value>
1056
+ <value>updates</value>
1057
+ <value>updatedBy</value>
1058
+ <value>derivedFrom</value>
1059
+ <value>derives</value>
1052
1060
  <value>describes</value>
1053
1061
  <value>describedBy</value>
1062
+ <value>catalogues</value>
1063
+ <value>cataloguedBy</value>
1064
+ <value>hasSuccessor</value>
1065
+ <value>successorOf</value>
1066
+ <value>adaptedFrom</value>
1067
+ <value>hasAdaptation</value>
1068
+ <value>adoptedFrom</value>
1069
+ <value>adoptedAs</value>
1070
+ <value>reviewOf</value>
1071
+ <value>hasReview</value>
1072
+ <value>commentaryOf</value>
1073
+ <value>hasCommentary</value>
1074
+ <value>related</value>
1075
+ <value>complements</value>
1076
+ <value>complementOf</value>
1077
+ <value>obsoletes</value>
1078
+ <value>obsoletedBy</value>
1079
+ <value>cited</value>
1080
+ <value>isCitedIn</value>
1054
1081
  </choice>
1055
1082
  </define>
1056
1083
  <define name="docrelation">
data/lib/asciidoctor/un/converter.rb CHANGED
@@ -52,7 +52,7 @@ module Asciidoctor
52
52
  def title(node, xml)
53
53
  ["en"].each do |lang|
54
54
  xml.title **{ type: "main", language: lang, format: "text/plain" } do |t|
55
- t << Asciidoctor::Standoc::Utils::asciidoc_sub(node.attr("title") || node.title)
55
+ t << (Asciidoctor::Standoc::Utils::asciidoc_sub(node.attr("title")) || node.title)
56
56
  end
57
57
  node.attr("subtitle") and
58
58
  xml.title **{ type: "subtitle", language: lang, format: "text/plain" } do |t|
@@ -147,7 +147,7 @@ module Asciidoctor
147
147
  File.open(filename, "w") { |f| f.write(ret) }
148
148
  html_converter(node).convert filename unless node.attr("nodoc")
149
149
  word_converter(node).convert filename unless node.attr("nodoc")
150
- pdf_converter(node).convert filename unless node.attr("nodoc")
150
+ pdf_converter(node)&.convert filename unless node.attr("nodoc")
151
151
  end
152
152
  @log.write(@localdir + @filename + ".err") unless @novalid
153
153
  @files_to_delete.each { |f| FileUtils.rm f }
@@ -181,6 +181,7 @@ module Asciidoctor
181
181
  end
182
182
 
183
183
  def pdf_converter(node)
184
+ return nil if node.attr("no-pdf")
184
185
  IsoDoc::UN::PdfConvert.new(doc_extract_attributes(node))
185
186
  end
186
187
 
data/lib/asciidoctor/un/isodoc.rng CHANGED
@@ -303,8 +303,23 @@
303
303
  <ref name="paragraph"/>
304
304
  </element>
305
305
  </define>
306
+ <define name="TextElement" combine="choice">
307
+ <ref name="concept"/>
308
+ </define>
306
309
  </include>
307
310
  <!-- end overrides -->
311
+ <define name="concept">
312
+ <element name="concept">
313
+ <optional>
314
+ <attribute name="term"/>
315
+ </optional>
316
+ <choice>
317
+ <ref name="eref"/>
318
+ <ref name="xref"/>
319
+ <ref name="termref"/>
320
+ </choice>
321
+ </element>
322
+ </define>
308
323
  <define name="BasicBlock" combine="choice">
309
324
  <choice>
310
325
  <ref name="requirement"/>
@@ -911,7 +926,10 @@
911
926
  </define>
912
927
  <define name="origin">
913
928
  <element name="origin">
914
- <ref name="erefType"/>
929
+ <choice>
930
+ <ref name="erefType"/>
931
+ <ref name="termref"/>
932
+ </choice>
915
933
  </element>
916
934
  </define>
917
935
  <define name="modification">
@@ -919,6 +937,15 @@
919
937
  <ref name="paragraph"/>
920
938
  </element>
921
939
  </define>
940
+ <define name="termref">
941
+ <element name="termref">
942
+ <attribute name="base"/>
943
+ <attribute name="target"/>
944
+ <optional>
945
+ <text/>
946
+ </optional>
947
+ </element>
948
+ </define>
922
949
  <define name="structuredidentifier">
923
950
  <element name="structuredidentifier">
924
951
  <optional>
data/lib/asciidoctor/un/un.rng CHANGED
@@ -223,6 +223,7 @@
223
223
  <value>general</value>
224
224
  <value>limited</value>
225
225
  <value>restricted</value>
226
+ <value>provisional</value>
226
227
  </choice>
227
228
  </element>
228
229
  </define>
data/lib/isodoc/un/html/scripts.html CHANGED
@@ -1,24 +1,8 @@
1
1
  <script>
2
- //TOC generation
3
- $('#toc').toc({
4
- 'selectors': toclevel(), //elements to use as headings
5
- 'container': 'main', //element to find all selectors in
6
- 'smoothScrolling': true, //enable or disable smooth scrolling on click
7
- 'prefix': 'toc', //prefix for anchor tags and class names
8
- 'onHighlight': function(el) {}, //called when a new section is highlighted
9
- 'highlightOnScroll': true, //add class to heading that is currently in focus
10
- 'highlightOffset': 100, //offset to trigger the next headline
11
- 'anchorName': function(i, heading, prefix) { //custom function for anchor name
12
- return prefix+i;
13
- },
14
- 'headerText': function(i, heading, $heading) { //custom function building the header-item text
15
- return $heading.text();
16
- },
17
- 'itemClass': function(i, heading, $heading, prefix) { // custom function for item class
18
- return $heading[0].tagName.toLowerCase();
19
- }
20
- });
21
-
2
+ $("#toc").on('click', 'li', function(e) {
3
+ $(this).parent().find('li.toc-active').removeClass('toc-active');
4
+ $(this).addClass('toc-active');
5
+ });
22
6
  </script>
23
7
 
24
8
  <script>
data/lib/isodoc/un/html/word_unece_plenary_titlepage.html CHANGED
@@ -1,125 +1,127 @@
1
1
  <div style='mso-element:para-border-div;border:none;border-bottom:solid windowtext 1.0pt;
2
2
  mso-border-bottom-alt:solid windowtext .5pt;padding:0cm 0cm 1.0pt 0cm'>
3
3
 
4
- <p class=MsoNormal style='tab-stops:70.9pt right 14.0cm;border:none;mso-border-bottom-alt:
4
+ <!-- This is a plenary page -->
5
+
6
+ <p class="MsoNormal" style='tab-stops:70.9pt right 14.0cm;border:none;mso-border-bottom-alt:
5
7
  solid windowtext .5pt;padding:0cm;mso-padding-alt:0cm 0cm 1.0pt 0cm'><span
6
- lang=EN-AU style='font-family:"Times New Roman",serif'><span style='mso-tab-count:
8
+ lang="EN-AU" style='font-family:"Times New Roman",serif'><span style='mso-tab-count:
7
9
  1'> </span>United Nations<span style='mso-tab-count:
8
10
  1'></span>{{ docnumber }}<o:p></o:p></span></p>
9
11
 
10
12
  </div>
11
13
 
12
- <p class=MsoNormal style='tab-stops:70.9pt 12.0cm'><span lang=EN-AU
14
+ <p class="MsoNormal" style='tab-stops:70.9pt 12.0cm'><span lang="EN-AU"
13
15
  style='font-family:"Times New Roman",serif'><span style='mso-tab-count:1'>                        </span></span><b
14
- style='mso-bidi-font-weight:normal'><span lang=EN-AU style='font-size:18.0pt;
16
+ style='mso-bidi-font-weight:normal'><span lang="EN-AU" style='font-size:18.0pt;
15
17
  mso-bidi-font-size:12.0pt;font-family:"Times New Roman",serif'>Economic and
16
- Social Council</span></b><span lang=EN-AU style='font-family:"Times New Roman",serif'><span
17
- style='mso-tab-count:1'>               </span></span><span lang=EN-AU
18
+ Social Council</span></b><span lang="EN-AU" style='font-family:"Times New Roman",serif'><span
19
+ style='mso-tab-count:1'>               </span></span><span lang="EN-AU"
18
20
  style='font-size:10.0pt;mso-bidi-font-size:12.0pt;font-family:"Times New Roman",serif'>Distr.:
19
- <span class=SpellE>{{ distribution }}</span><o:p></o:p></span></p>
21
+ <span class="SpellE">{{ distribution }}</span><o:p></o:p></span></p>
20
22
 
21
- <p class=MsoNormal style='tab-stops:70.9pt 12.0cm'><span lang=EN-AU
23
+ <p class="MsoNormal" style='tab-stops:70.9pt 12.0cm'><span lang="EN-AU"
22
24
  style='font-family:"Times New Roman",serif'><span style='mso-tab-count:1'>                        </span><span
23
25
  style='mso-tab-count:1'>                                                                                          </span></span><span
24
- lang=EN-AU style='font-size:10.0pt;mso-bidi-font-size:12.0pt;font-family:"Times New Roman",serif'>{{ revdate }}<o:p></o:p></span></p>
26
+ lang="EN-AU" style='font-size:10.0pt;mso-bidi-font-size:12.0pt;font-family:"Times New Roman",serif'>{{ revdate }}<o:p></o:p></span></p>
25
27
 
26
28
  {% if submissionlanguage %}
27
- <p class=MsoNormal style='tab-stops:70.9pt 12.0cm'><span lang=EN-AU
29
+ <p class="MsoNormal" style='tab-stops:70.9pt 12.0cm'><span lang="EN-AU"
28
30
  style='font-family:"Times New Roman",serif'><span style='mso-tab-count:2'>                                                                                                                 </span></span><span
29
- lang=EN-AU style='font-size:10.0pt;mso-bidi-font-size:12.0pt;font-family:"Times New Roman",serif'>Original:
31
+ lang="EN-AU" style='font-size:10.0pt;mso-bidi-font-size:12.0pt;font-family:"Times New Roman",serif'>Original:
30
32
  {{ submissionlanguage | join: "/" }}<o:p></o:p></span></p>
31
33
  {% endif %}
32
34
 
33
35
  {% if doclanguage %}
34
- <p class=MsoNormal style='tab-stops:70.9pt 12.0cm'><span lang=EN-AU
36
+ <p class="MsoNormal" style='tab-stops:70.9pt 12.0cm'><span lang="EN-AU"
35
37
  style='font-family:"Times New Roman",serif'><span style='mso-tab-count:2'>                                                                                                                 </span></span><span
36
- lang=EN-AU style='font-size:10.0pt;mso-bidi-font-size:12.0pt;font-family:"Times New Roman",serif'>{{ doclanguage | join: ", " }} only<o:p></o:p></span></p>
38
+ lang="EN-AU" style='font-size:10.0pt;mso-bidi-font-size:12.0pt;font-family:"Times New Roman",serif'>{{ doclanguage | join: ", " }} only<o:p></o:p></span></p>
37
39
  {% endif %}
38
40
 
39
- <p class=MsoNormal style='tab-stops:70.9pt 12.0cm'><span lang=EN-AU
41
+ <p class="MsoNormal" style='tab-stops:70.9pt 12.0cm'><span lang="EN-AU"
40
42
  style='font-size:10.0pt;mso-bidi-font-size:12.0pt;font-family:"Times New Roman",serif'><o:p>&nbsp;</o:p></span></p>
41
43
 
42
44
 
43
45
  <div style='mso-element:para-border-div;border:none;border-top:solid windowtext 2.25pt;
44
46
  padding:1.0pt 0cm 0cm 0cm'>
45
47
 
46
- <p class=MsoNormal style='border:none;mso-border-top-alt:solid windowtext 2.25pt;
48
+ <p class="MsoNormal" style='border:none;mso-border-top-alt:solid windowtext 2.25pt;
47
49
  padding:0cm;mso-padding-alt:1.0pt 0cm 0cm 0cm'><b style='mso-bidi-font-weight:
48
- normal'><span lang=EN-AU style='font-family:"Times New Roman",serif'>Economic <span
49
- class=SpellE>Commision</span> for Europe<o:p></o:p></span></b></p>
50
+ normal'><span lang="EN-AU" style='font-family:"Times New Roman",serif'>Economic <span
51
+ class="SpellE">Commision</span> for Europe<o:p></o:p></span></b></p>
50
52
 
51
- <p class=MsoNormal style='border:none;mso-border-top-alt:solid windowtext 2.25pt;
53
+ <p class="MsoNormal" style='border:none;mso-border-top-alt:solid windowtext 2.25pt;
52
54
  padding:0cm;mso-padding-alt:1.0pt 0cm 0cm 0cm'><b style='mso-bidi-font-weight:
53
- normal'><span lang=EN-AU style='font-family:"Times New Roman",serif'>UNECE
55
+ normal'><span lang="EN-AU" style='font-family:"Times New Roman",serif'>UNECE
54
56
  Executive Committee<o:p></o:p></span></b></p>
55
57
 
56
- <p class=MsoNormal style='border:none;mso-border-top-alt:solid windowtext 2.25pt;
58
+ <p class="MsoNormal" style='border:none;mso-border-top-alt:solid windowtext 2.25pt;
57
59
  padding:0cm;mso-padding-alt:1.0pt 0cm 0cm 0cm'><b style='mso-bidi-font-weight:
58
- normal'><span lang=EN-AU style='font-family:"Times New Roman",serif'>{{ tc | join: "/" }}<o:p></o:p></span></b></p>
60
+ normal'><span lang="EN-AU" style='font-family:"Times New Roman",serif'>{{ tc | join: "/" }}<o:p></o:p></span></b></p>
59
61
 
60
- <p class=MsoNormal style='border:none;mso-border-top-alt:solid windowtext 2.25pt;
61
- padding:0cm;mso-padding-alt:1.0pt 0cm 0cm 0cm'><span lang=EN-AU
62
+ <p class="MsoNormal" style='border:none;mso-border-top-alt:solid windowtext 2.25pt;
63
+ padding:0cm;mso-padding-alt:1.0pt 0cm 0cm 0cm'><span lang="EN-AU"
62
64
  style='font-family:"Times New Roman",serif'><o:p>&nbsp;</o:p></span></p>
63
65
 
64
- <p class=MsoNormal style='border:none;mso-border-top-alt:solid windowtext 2.25pt;
66
+ <p class="MsoNormal" style='border:none;mso-border-top-alt:solid windowtext 2.25pt;
65
67
  padding:0cm;mso-padding-alt:1.0pt 0cm 0cm 0cm'><b style='mso-bidi-font-weight:
66
- normal'><span lang=EN-AU style='font-size:10.5pt;mso-bidi-font-size:12.0pt;
68
+ normal'><span lang="EN-AU" style='font-size:10.5pt;mso-bidi-font-size:12.0pt;
67
69
  font-family:"Times New Roman",serif'>{{ session_number }} session<o:p></o:p></span></b></p>
68
70
 
69
- <p class=MsoNormal style='border:none;mso-border-top-alt:solid windowtext 2.25pt;
70
- padding:0cm;mso-padding-alt:1.0pt 0cm 0cm 0cm'><span lang=EN-AU
71
+ <p class="MsoNormal" style='border:none;mso-border-top-alt:solid windowtext 2.25pt;
72
+ padding:0cm;mso-padding-alt:1.0pt 0cm 0cm 0cm'><span lang="EN-AU"
71
73
  style='font-size:10.5pt;mso-bidi-font-size:12.0pt;font-family:"Times New Roman",serif'>{{ session_date }}<o:p></o:p></span></p>
72
74
 
73
75
  {% if session_itemnumber.size == 1 %}
74
- <p class=MsoNormal style='border:none;mso-border-top-alt:solid windowtext 2.25pt;
75
- padding:0cm;mso-padding-alt:1.0pt 0cm 0cm 0cm'><span lang=EN-AU
76
+ <p class="MsoNormal" style='border:none;mso-border-top-alt:solid windowtext 2.25pt;
77
+ padding:0cm;mso-padding-alt:1.0pt 0cm 0cm 0cm'><span lang="EN-AU"
76
78
  style='font-size:10.5pt;mso-bidi-font-size:12.0pt;font-family:"Times New Roman",serif'>Agenda item {{ session_itemnumber[0] }}<o:p></o:p></span></p>
77
79
  {% endif %}
78
80
 
79
81
  {% if session_itemnumber.size > 1 %}
80
- <p class=MsoNormal style='border:none;mso-border-top-alt:solid windowtext 2.25pt;
81
- padding:0cm;mso-padding-alt:1.0pt 0cm 0cm 0cm'><span lang=EN-AU
82
+ <p class="MsoNormal" style='border:none;mso-border-top-alt:solid windowtext 2.25pt;
83
+ padding:0cm;mso-padding-alt:1.0pt 0cm 0cm 0cm'><span lang="EN-AU"
82
84
  style='font-size:10.5pt;mso-bidi-font-size:12.0pt;font-family:"Times New Roman",serif'>Agenda items {{ session_itemnumber | join: ", " }}<o:p></o:p></span></p>
83
85
  {% endif %}
84
86
 
85
- <p class=MsoNormal style='border:none;mso-border-top-alt:solid windowtext 2.25pt;
86
- padding:0cm;mso-padding-alt:1.0pt 0cm 0cm 0cm'><span lang=EN-AU
87
+ <p class="MsoNormal" style='border:none;mso-border-top-alt:solid windowtext 2.25pt;
88
+ padding:0cm;mso-padding-alt:1.0pt 0cm 0cm 0cm'><span lang="EN-AU"
87
89
  style='font-size:10.5pt;mso-bidi-font-size:12.0pt;font-family:"Times New Roman",serif'>{{ docnumber }}{% if item_footnote %}<a
88
90
  style='mso-footnote-id:ftnitem' href="#ftnitem" name="_ftnrefitem" class="footnote" title=""><span
89
- class=MsoFootnoteReference><span style='mso-special-character:footnote'></span></span></a>{% endif %}<o:p></o:p></span></p>
91
+ class="MsoFootnoteReference"><span style='mso-special-character:footnote'></span></span></a>{% endif %}<o:p></o:p></span></p>
90
92
 
91
93
  {% if session_itemname.size > 0 %}
92
- <p class=MsoNormal style='border:none;mso-border-top-alt:solid windowtext 2.25pt;
94
+ <p class="MsoNormal" style='border:none;mso-border-top-alt:solid windowtext 2.25pt;
93
95
  padding:0cm;mso-padding-alt:1.0pt 0cm 0cm 0cm'><b style='mso-bidi-font-weight:
94
- normal'><span lang=EN-AU style='font-size:10.5pt;mso-bidi-font-size:12.0pt;
96
+ normal'><span lang="EN-AU" style='font-size:10.5pt;mso-bidi-font-size:12.0pt;
95
97
  font-family:"Times New Roman",serif'>{{ session_itemname | join: "<br/>" }}<o:p></o:p></span></b></p>
96
98
  {% endif %}
97
99
 
98
100
  {% if session_subitemname.size > 0 %}
99
- <p class=MsoNormal style='border:none;mso-border-top-alt:solid windowtext 2.25pt;
101
+ <p class="MsoNormal" style='border:none;mso-border-top-alt:solid windowtext 2.25pt;
100
102
  padding:0cm;mso-padding-alt:1.0pt 0cm 0cm 0cm'><b style='mso-bidi-font-weight:
101
- normal'><span lang=EN-AU style='font-size:10.5pt;mso-bidi-font-size:12.0pt;
103
+ normal'><span lang="EN-AU" style='font-size:10.5pt;mso-bidi-font-size:12.0pt;
102
104
  font-family:"Times New Roman",serif'>{{ session_subitemname | join: "<br/>" }}<o:p></o:p></span></b></p>
103
105
  {% endif %}
104
106
 
105
- <p class=MsoNormal style='border:none;mso-border-top-alt:solid windowtext 2.25pt;
106
- padding:0cm;mso-padding-alt:1.0pt 0cm 0cm 0cm'><span lang=EN-AU
107
+ <p class="MsoNormal" style='border:none;mso-border-top-alt:solid windowtext 2.25pt;
108
+ padding:0cm;mso-padding-alt:1.0pt 0cm 0cm 0cm'><span lang="EN-AU"
107
109
  style='font-family:"Times New Roman",serif'><o:p>&nbsp;</o:p></span></p>
108
110
 
109
111
  </div>
110
112
 
111
- <p class=MsoNormal style='margin-left:70.9pt'><b style='mso-bidi-font-weight:
112
- normal'><span lang=EN-AU style='font-size:16.0pt;mso-bidi-font-size:12.0pt;
113
+ <p class="MsoNormal" style='margin-left:70.9pt'><b style='mso-bidi-font-weight:
114
+ normal'><span lang="EN-AU" style='font-size:16.0pt;mso-bidi-font-size:12.0pt;
113
115
  font-family:"Times New Roman",serif'>{{ doctitle }}<o:p></o:p></span></b></p>
114
116
 
115
- <p class=MsoNormal style='margin-left:70.9pt'><b style='mso-bidi-font-weight:
116
- normal'><span lang=EN-AU style='font-family:"Times New Roman",serif'>{{ docsubtitle }}<o:p></o:p></span></b></p>
117
+ <p class="MsoNormal" style='margin-left:70.9pt'><b style='mso-bidi-font-weight:
118
+ normal'><span lang="EN-AU" style='font-family:"Times New Roman",serif'>{{ docsubtitle }}<o:p></o:p></span></b></p>
117
119
 
118
120
 
119
- <p class=MsoNormal style='margin-left:70.9pt'>
121
+ <p class="MsoNormal" style='margin-left:70.9pt'>
120
122
  {% if session_collaborator %}
121
123
  <b style='mso-bidi-font-weight:
122
- normal'><span lang=EN-AU style='font-family:"Times New Roman",serif'>Developed
124
+ normal'><span lang="EN-AU" style='font-family:"Times New Roman",serif'>Developed
123
125
  in Collaboration with {{ session_collaborator }}<o:p></o:p></span></b>
124
126
  {% endif %}
125
127
  </p>
@@ -127,9 +129,9 @@ in Collaboration with {{ session_collaborator }}<o:p></o:p></span></b>
127
129
 
128
130
  <div style="border:solid windowtext 1.0pt;
129
131
  mso-border-alt:solid windowtext .5pt;">
130
- <p class=MsoNormal><i style='mso-bidi-font-style:normal'>Summary</span></i></p>
131
- <p class=MsoNormal></p>
132
- <div class=MsoNormal id='abstractbox' style='margin-left:70.9pt;font-size:10.0pt;mso-bidi-font-size:12.0pt;font-family:"Times New Roman",serif;
132
+ <p class="MsoNormal"><i style='mso-bidi-font-style:normal'>Summary</span></i></p>
133
+ <p class="MsoNormal"></p>
134
+ <div class="MsoNormal" id='abstractbox' style='margin-left:70.9pt;font-size:10.0pt;mso-bidi-font-size:12.0pt;font-family:"Times New Roman",serif;
133
135
  mso-style-textoutline-type:none;mso-style-textoutline-outlinestyle-dpiwidth:
134
136
  .75pt;mso-style-textoutline-outlinestyle-linecap:round;mso-style-textoutline-outlinestyle-join:
135
137
  bevel;mso-style-textoutline-outlinestyle-pctmiterlimit:0%;mso-style-textoutline-outlinestyle-dash:
@@ -137,24 +139,70 @@ mso-border-alt:solid windowtext .5pt;">
137
139
  simple'></div>
138
140
  </div>
139
141
 
142
+ <p class="MsoNormal"><span xml:lang="EN-AU"><!--[if gte vml 1]><v:shapetype id="_x0000_t202"
143
+ coordsize="21600,21600" o:spt="202" path="m,l,21600r21600,l21600,xe">
144
+ <v:stroke joinstyle="miter"/>
145
+ <v:path gradientshapeok="t" o:connecttype="rect"/>
146
+ </v:shapetype><v:shape id="Text_x0020_Box_x0020_2" o:spid="_x0000_s1027"
147
+ type="#_x0000_t202"
148
+ style='position:absolute;margin-left:-6.0pt;margin-top:-28.35pt;
149
+ width:190.15pt;height:31.8pt;z-index:251664896;visibility:visible;
150
+ mso-wrap-style:none;mso-width-percent:0;mso-height-percent:0;
151
+ mso-wrap-distance-left:0;mso-wrap-distance-top:0;mso-wrap-distance-right:9pt;
152
+ mso-wrap-distance-bottom:0;mso-position-horizontal:absolute;
153
+ mso-position-horizontal-relative:margin;mso-position-vertical:absolute;
154
+ mso-position-vertical-relative:bottom-margin-area;mso-width-percent:0;
155
+ mso-height-percent:0;mso-width-relative:page;mso-height-relative:page;
156
+ v-text-anchor:top'
157
+ o:gfxdata="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
187
+ BADzAAAAsQUAAAAA
188
+ " filled="f" stroked="f" strokeweight=".5pt">
189
+ <v:fill o:detectmouseclick="t"/>
190
+ <v:textbox style='mso-fit-shape-to-text:t'>
191
+ <![if !mso]>
192
+ <table cellpadding=0 cellspacing=0 width="100%">
193
+ <tr>
194
+ <td><![endif]>
195
+ <div>
196
+ <p class="MsoNormal" style='margin-left:1.0cm;text-indent:-1.0cm'>{{ session_id }}</p>
140
197
 
141
- <p class=MsoNormal style='margin-left:1.0cm;text-indent:-1.0cm'><i
142
- style='mso-bidi-font-style:normal'><span lang=EN-AU style='font-family:"Times New Roman",serif'><o:p>&nbsp;</o:p></span></i></p>
143
-
144
- <p class=MsoNormal style='margin-left:1.0cm;text-indent:-1.0cm'><i
145
- style='mso-bidi-font-style:normal'><span lang=EN-AU style='font-family:"Times New Roman",serif'><o:p>&nbsp;</o:p></span></i></p>
146
-
147
- <p class=MsoNormal style='margin-left:1.0cm;text-indent:-1.0cm'><i
148
- style='mso-bidi-font-style:normal'><span lang=EN-AU style='font-family:"Times New Roman",serif'><o:p>&nbsp;</o:p></span></i></p>
149
-
150
- <p class=MsoNormal style='margin-left:1.0cm;text-indent:-1.0cm'><i
151
- style='mso-bidi-font-style:normal'><span lang=EN-AU style='font-family:"Times New Roman",serif'><o:p>&nbsp;</o:p></span></i></p>
152
-
153
- <p class=MsoNormal style='margin-left:1.0cm;text-indent:-1.0cm'><i
154
- style='mso-bidi-font-style:normal'><span lang=EN-AU style='font-family:"Times New Roman",serif'><o:p>&nbsp;</o:p></span></i></p>
198
+ </div>
199
+ <![if !mso]></td>
200
+ </tr>
201
+ </table>
202
+ <![endif]></v:textbox>
203
+ <w:wrap type="square"/>
204
+ </v:shape><![endif]--></p>
155
205
 
156
- <p class=MsoNormal style='margin-left:1.0cm;text-indent:-1.0cm'><span
157
- lang=EN-AU style='font-family:"Times New Roman",serif'>{{ session_id }}<o:p></o:p></span></p>
158
206
 
159
207
  </div>
160
208