metanorma-un 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd4f80384b6c543d056b1205a778b4b6d92d413ff32fb22ab16766a5c8e0ef16
-  data.tar.gz: 865a4de4708b9a437e94551606df7ad2bf7edeaaa269071ef93cab9bd44455e5
+  metadata.gz: 873d4b1e69a95f4b3d315783d6816908c1026dd790a0bbe3d7ce041ae7030dd2
+  data.tar.gz: 940f35ff9d38869dac57e8227c646d286e5996ec9b287e623e6f1e892cd1fb88
 SHA512:
-  metadata.gz: b3bd067351e32036adbd85dc737707587b33a30d0693d44601add8b49a36c4447c730a704f101d4ed8fadb45dd5e383ebb97f43311aa96834e20b227df3e5ffa
-  data.tar.gz: 850793c9413a4fa8e7621c459343bf5ccc8d5c16717a0500a6ac369cfe83ba7933b5c3fc58ba85a61cd45494c3a7bae7d9cba0dbe42e895c3dd932127f4c3aaf
+  metadata.gz: ce2d0399506090653519eb73550059893bdb505c41dfc2589b7346e4641f3441b3d18af3b47783173cd18ab19fddd1d8aac287f6ae495a6a62120f5f7b09077b
+  data.tar.gz: 75a2e3dcaba39ceb1697faf9b5071c3f5f8de513b7b1710b8ffb9c13f7cdf13c038debb540658ba377e74fbb060e78c56de23b7eb7433f30e26cb5b98ea7e0ed

data/.github/workflows/macos.yml

@@ -26,13 +26,6 @@ jobs:
         run: |
           sudo gem install bundler --force
           bundle install --jobs 4 --retry 3
-      - name: Use Node
-        uses: actions/setup-node@v1
-        with:
-          node-version: '8'
-      - name: Install Puppeteer
-        run: |
-          npm install -g puppeteer
       - name: Run specs
         run: |
           bundle exec rake

data/.github/workflows/ubuntu.yml

@@ -26,18 +26,11 @@ jobs:
         run: |
           gem install bundler
           bundle install --jobs 4 --retry 3
-      - name: Use Node
-        uses: actions/setup-node@v1
-        with:
-          node-version: '8'
-      - name: Install Puppeteer
-        run: |
-          npm install -g puppeteer
       - name: Run specs
         run: |
           bundle exec rake
       - name: Trigger dependent repositories
-        if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/master' && matrix.ruby == '2.6'
         env:
           GH_USERNAME: ${{ secrets.PAT_USERNAME }}
           GH_ACCESS_TOKEN: ${{ secrets.PAT_TOKEN }}
@@ -46,5 +39,5 @@ jobs:
           [[ -f ".github/workflows/dependent_repos.env" ]] && source .github/workflows/dependent_repos.env
           for repo in $DEPENDENT_REPOS
           do
-            sh trigger-gh-actions.sh $ORGANISATION $repo $GH_USERNAME $GH_ACCESS_TOKEN $GITHUB_REPOSITORY
+            sh trigger-gh-actions.sh $ORGANISATION $repo $GH_USERNAME $GH_ACCESS_TOKEN $GITHUB_REPOSITORY "{ \"ref\": \"${GITHUB_REF}\" }"
           done

data/.github/workflows/windows.yml

@@ -27,15 +27,7 @@ jobs:
         run: |
           gem install bundler
           bundle config --local path vendor/bundle
-          bundle update
           bundle install --jobs 4 --retry 3
-      - name: Use Node
-        uses: actions/setup-node@v1
-        with:
-          node-version: '8'
-      - name: Install Puppeteer
-        run: |
-          npm install -g puppeteer
       - name: Run specs
         run: |
           bundle exec rake

data/lib/asciidoctor/un/biblio.rng

@@ -767,6 +767,8 @@
       <value>unchanged</value>
       <value>circulated</value>
       <value>adapted</value>
+      <value>vote-started</value>
+      <value>vote-ended</value>
     </choice>
   </define>
   <define name="bdate">
@@ -1019,38 +1021,63 @@
   </define>
   <define name="DocRelationType">
     <choice>
-      <value>obsoletes</value>
-      <value>obsoletedBy</value>
-      <value>supersedes</value>
-      <value>supersededBy</value>
-      <value>updates</value>
-      <value>updatedBy</value>
-      <value>complements</value>
-      <value>derivedFrom</value>
-      <value>translatedFrom</value>
-      <value>hasTranslation</value>
-      <value>adoptedFrom</value>
-      <value>equivalent</value>
-      <value>identical</value>
-      <value>nonequivalent</value>
-      <value>includedIn</value>
       <value>includes</value>
-      <value>instance</value>
-      <value>instanceOf</value>
-      <value>partOf</value>
+      <value>includedIn</value>
       <value>hasPart</value>
-      <value>hasDraft</value>
-      <value>draftOf</value>
+      <value>partOf</value>
       <value>merges</value>
+      <value>mergedInto</value>
       <value>splits</value>
-      <value>amends</value>
-      <value>amendedBy</value>
-      <value>corrects</value>
-      <value>correctedBy</value>
-      <value>revises</value>
-      <value>revisedBy</value>
+      <value>splitInto</value>
+      <value>instance</value>
+      <value>hasInstance</value>
+      <value>exemplarOf</value>
+      <value>hasExemplar</value>
+      <value>manifestationOf</value>
+      <value>hasManifestation</value>
+      <value>reproductionOf</value>
+      <value>hasReproduction</value>
+      <value>reprintOf</value>
+      <value>hasReprint</value>
+      <value>expressionOf</value>
+      <value>hasExpression</value>
+      <value>translatedFrom</value>
+      <value>hasTranslation</value>
+      <value>arrangementOf</value>
+      <value>hasArrangement</value>
+      <value>abridgementOf</value>
+      <value>hasAbridgement</value>
+      <value>annotationOf</value>
+      <value>hasAnnotation</value>
+      <value>draftOf</value>
+      <value>hasDraft</value>
+      <value>editionOf</value>
+      <value>hasEdition</value>
+      <value>updates</value>
+      <value>updatedBy</value>
+      <value>derivedFrom</value>
+      <value>derives</value>
       <value>describes</value>
       <value>describedBy</value>
+      <value>catalogues</value>
+      <value>cataloguedBy</value>
+      <value>hasSuccessor</value>
+      <value>successorOf</value>
+      <value>adaptedFrom</value>
+      <value>hasAdaptation</value>
+      <value>adoptedFrom</value>
+      <value>adoptedAs</value>
+      <value>reviewOf</value>
+      <value>hasReview</value>
+      <value>commentaryOf</value>
+      <value>hasCommentary</value>
+      <value>related</value>
+      <value>complements</value>
+      <value>complementOf</value>
+      <value>obsoletes</value>
+      <value>obsoletedBy</value>
+      <value>cited</value>
+      <value>isCitedIn</value>
     </choice>
   </define>
   <define name="docrelation">

data/lib/asciidoctor/un/converter.rb

@@ -52,7 +52,7 @@ module Asciidoctor
       def title(node, xml)
         ["en"].each do |lang|
           xml.title **{ type: "main", language: lang, format: "text/plain" } do |t|
-            t << Asciidoctor::Standoc::Utils::asciidoc_sub(node.attr("title") || node.title)
+            t << (Asciidoctor::Standoc::Utils::asciidoc_sub(node.attr("title")) || node.title)
           end
           node.attr("subtitle") and
             xml.title **{ type: "subtitle", language: lang, format: "text/plain" } do |t|
@@ -147,7 +147,7 @@ module Asciidoctor
           File.open(filename, "w") { |f| f.write(ret) }
           html_converter(node).convert filename unless node.attr("nodoc")
           word_converter(node).convert filename unless node.attr("nodoc")
-          pdf_converter(node).convert filename unless node.attr("nodoc")
+          pdf_converter(node)&.convert filename unless node.attr("nodoc")
         end
         @log.write(@localdir + @filename + ".err") unless @novalid
         @files_to_delete.each { |f| FileUtils.rm f }
@@ -181,6 +181,7 @@ module Asciidoctor
       end
 
       def pdf_converter(node)
+        return nil if node.attr("no-pdf")
         IsoDoc::UN::PdfConvert.new(doc_extract_attributes(node))
       end
 

data/lib/asciidoctor/un/isodoc.rng

@@ -303,8 +303,23 @@
         <ref name="paragraph"/>
       </element>
     </define>
+    <define name="TextElement" combine="choice">
+      <ref name="concept"/>
+    </define>
   </include>
   <!-- end overrides -->
+  <define name="concept">
+    <element name="concept">
+      <optional>
+        <attribute name="term"/>
+      </optional>
+      <choice>
+        <ref name="eref"/>
+        <ref name="xref"/>
+        <ref name="termref"/>
+      </choice>
+    </element>
+  </define>
   <define name="BasicBlock" combine="choice">
     <choice>
       <ref name="requirement"/>
@@ -911,7 +926,10 @@
   </define>
   <define name="origin">
     <element name="origin">
-      <ref name="erefType"/>
+      <choice>
+        <ref name="erefType"/>
+        <ref name="termref"/>
+      </choice>
     </element>
   </define>
   <define name="modification">
@@ -919,6 +937,15 @@
       <ref name="paragraph"/>
     </element>
   </define>
+  <define name="termref">
+    <element name="termref">
+      <attribute name="base"/>
+      <attribute name="target"/>
+      <optional>
+        <text/>
+      </optional>
+    </element>
+  </define>
   <define name="structuredidentifier">
     <element name="structuredidentifier">
       <optional>

data/lib/asciidoctor/un/un.rng

@@ -223,6 +223,7 @@
         <value>general</value>
         <value>limited</value>
         <value>restricted</value>
+        <value>provisional</value>
       </choice>
     </element>
   </define>

data/lib/isodoc/un/html/scripts.html

@@ -1,24 +1,8 @@
   <script>
-    //TOC generation
-      $('#toc').toc({
-          'selectors': toclevel(), //elements to use as headings
-          'container': 'main', //element to find all selectors in
-          'smoothScrolling': true, //enable or disable smooth scrolling on click
-          'prefix': 'toc', //prefix for anchor tags and class names
-          'onHighlight': function(el) {}, //called when a new section is highlighted 
-          'highlightOnScroll': true, //add class to heading that is currently in focus
-          'highlightOffset': 100, //offset to trigger the next headline
-          'anchorName': function(i, heading, prefix) { //custom function for anchor name
-              return prefix+i;
-          },
-          'headerText': function(i, heading, $heading) { //custom function building the header-item text
-              return $heading.text();
-          },
-      'itemClass': function(i, heading, $heading, prefix) { // custom function for item class
-        return $heading[0].tagName.toLowerCase();
-      }
-      });
-      
+    $("#toc").on('click', 'li', function(e) {
+    $(this).parent().find('li.toc-active').removeClass('toc-active');
+    $(this).addClass('toc-active');
+});
   </script>
 
 <script>

data/lib/isodoc/un/html/word_unece_plenary_titlepage.html

@@ -1,125 +1,127 @@
 <div style='mso-element:para-border-div;border:none;border-bottom:solid windowtext 1.0pt;
 mso-border-bottom-alt:solid windowtext .5pt;padding:0cm 0cm 1.0pt 0cm'>
 
-<p class=MsoNormal style='tab-stops:70.9pt right 14.0cm;border:none;mso-border-bottom-alt:
+  <!-- This is a plenary page -->
+
+<p class="MsoNormal" style='tab-stops:70.9pt right 14.0cm;border:none;mso-border-bottom-alt:
 solid windowtext .5pt;padding:0cm;mso-padding-alt:0cm 0cm 1.0pt 0cm'><span
-lang=EN-AU style='font-family:"Times New Roman",serif'><span style='mso-tab-count:
+lang="EN-AU" style='font-family:"Times New Roman",serif'><span style='mso-tab-count:
 1'> </span>United Nations<span style='mso-tab-count:
 1'></span>{{ docnumber }}<o:p></o:p></span></p>
 
 </div>
 
-<p class=MsoNormal style='tab-stops:70.9pt 12.0cm'><span lang=EN-AU
+<p class="MsoNormal" style='tab-stops:70.9pt 12.0cm'><span lang="EN-AU"
 style='font-family:"Times New Roman",serif'><span style='mso-tab-count:1'>                        </span></span><b
-style='mso-bidi-font-weight:normal'><span lang=EN-AU style='font-size:18.0pt;
+style='mso-bidi-font-weight:normal'><span lang="EN-AU" style='font-size:18.0pt;
 mso-bidi-font-size:12.0pt;font-family:"Times New Roman",serif'>Economic and
-Social Council</span></b><span lang=EN-AU style='font-family:"Times New Roman",serif'><span
-style='mso-tab-count:1'>               </span></span><span lang=EN-AU
+Social Council</span></b><span lang="EN-AU" style='font-family:"Times New Roman",serif'><span
+style='mso-tab-count:1'>               </span></span><span lang="EN-AU"
 style='font-size:10.0pt;mso-bidi-font-size:12.0pt;font-family:"Times New Roman",serif'>Distr.:
-<span class=SpellE>{{ distribution }}</span><o:p></o:p></span></p>
+<span class="SpellE">{{ distribution }}</span><o:p></o:p></span></p>
 
-<p class=MsoNormal style='tab-stops:70.9pt 12.0cm'><span lang=EN-AU
+<p class="MsoNormal" style='tab-stops:70.9pt 12.0cm'><span lang="EN-AU"
 style='font-family:"Times New Roman",serif'><span style='mso-tab-count:1'>                        </span><span
 style='mso-tab-count:1'>                                                                                          </span></span><span
-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>
+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>
 
 {% if submissionlanguage %}
-<p class=MsoNormal style='tab-stops:70.9pt 12.0cm'><span lang=EN-AU
+<p class="MsoNormal" style='tab-stops:70.9pt 12.0cm'><span lang="EN-AU"
 style='font-family:"Times New Roman",serif'><span style='mso-tab-count:2'>                                                                                                                 </span></span><span
-lang=EN-AU style='font-size:10.0pt;mso-bidi-font-size:12.0pt;font-family:"Times New Roman",serif'>Original:
+lang="EN-AU" style='font-size:10.0pt;mso-bidi-font-size:12.0pt;font-family:"Times New Roman",serif'>Original:
 {{ submissionlanguage | join: "/" }}<o:p></o:p></span></p>
 {% endif %}
 
 {% if doclanguage %}
-<p class=MsoNormal style='tab-stops:70.9pt 12.0cm'><span lang=EN-AU
+<p class="MsoNormal" style='tab-stops:70.9pt 12.0cm'><span lang="EN-AU"
 style='font-family:"Times New Roman",serif'><span style='mso-tab-count:2'>                                                                                                                 </span></span><span
-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>
+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>
 {% endif %}
 
-<p class=MsoNormal style='tab-stops:70.9pt 12.0cm'><span lang=EN-AU
+<p class="MsoNormal" style='tab-stops:70.9pt 12.0cm'><span lang="EN-AU"
 style='font-size:10.0pt;mso-bidi-font-size:12.0pt;font-family:"Times New Roman",serif'><o:p>&nbsp;</o:p></span></p>
 
 
 <div style='mso-element:para-border-div;border:none;border-top:solid windowtext 2.25pt;
 padding:1.0pt 0cm 0cm 0cm'>
 
-<p class=MsoNormal style='border:none;mso-border-top-alt:solid windowtext 2.25pt;
+<p class="MsoNormal" style='border:none;mso-border-top-alt:solid windowtext 2.25pt;
 padding:0cm;mso-padding-alt:1.0pt 0cm 0cm 0cm'><b style='mso-bidi-font-weight:
-normal'><span lang=EN-AU style='font-family:"Times New Roman",serif'>Economic <span
-class=SpellE>Commision</span> for Europe<o:p></o:p></span></b></p>
+normal'><span lang="EN-AU" style='font-family:"Times New Roman",serif'>Economic <span
+class="SpellE">Commision</span> for Europe<o:p></o:p></span></b></p>
 
-<p class=MsoNormal style='border:none;mso-border-top-alt:solid windowtext 2.25pt;
+<p class="MsoNormal" style='border:none;mso-border-top-alt:solid windowtext 2.25pt;
 padding:0cm;mso-padding-alt:1.0pt 0cm 0cm 0cm'><b style='mso-bidi-font-weight:
-normal'><span lang=EN-AU style='font-family:"Times New Roman",serif'>UNECE
+normal'><span lang="EN-AU" style='font-family:"Times New Roman",serif'>UNECE
 Executive Committee<o:p></o:p></span></b></p>
 
-<p class=MsoNormal style='border:none;mso-border-top-alt:solid windowtext 2.25pt;
+<p class="MsoNormal" style='border:none;mso-border-top-alt:solid windowtext 2.25pt;
 padding:0cm;mso-padding-alt:1.0pt 0cm 0cm 0cm'><b style='mso-bidi-font-weight:
-normal'><span lang=EN-AU style='font-family:"Times New Roman",serif'>{{ tc | join: "/" }}<o:p></o:p></span></b></p>
+normal'><span lang="EN-AU" style='font-family:"Times New Roman",serif'>{{ tc | join: "/" }}<o:p></o:p></span></b></p>
 
-<p class=MsoNormal style='border:none;mso-border-top-alt:solid windowtext 2.25pt;
-padding:0cm;mso-padding-alt:1.0pt 0cm 0cm 0cm'><span lang=EN-AU
+<p class="MsoNormal" style='border:none;mso-border-top-alt:solid windowtext 2.25pt;
+padding:0cm;mso-padding-alt:1.0pt 0cm 0cm 0cm'><span lang="EN-AU"
 style='font-family:"Times New Roman",serif'><o:p>&nbsp;</o:p></span></p>
 
-<p class=MsoNormal style='border:none;mso-border-top-alt:solid windowtext 2.25pt;
+<p class="MsoNormal" style='border:none;mso-border-top-alt:solid windowtext 2.25pt;
 padding:0cm;mso-padding-alt:1.0pt 0cm 0cm 0cm'><b style='mso-bidi-font-weight:
-normal'><span lang=EN-AU style='font-size:10.5pt;mso-bidi-font-size:12.0pt;
+normal'><span lang="EN-AU" style='font-size:10.5pt;mso-bidi-font-size:12.0pt;
 font-family:"Times New Roman",serif'>{{ session_number }} session<o:p></o:p></span></b></p>
 
-<p class=MsoNormal style='border:none;mso-border-top-alt:solid windowtext 2.25pt;
-padding:0cm;mso-padding-alt:1.0pt 0cm 0cm 0cm'><span lang=EN-AU
+<p class="MsoNormal" style='border:none;mso-border-top-alt:solid windowtext 2.25pt;
+padding:0cm;mso-padding-alt:1.0pt 0cm 0cm 0cm'><span lang="EN-AU"
 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>
 
 {% if session_itemnumber.size == 1 %}
-<p class=MsoNormal style='border:none;mso-border-top-alt:solid windowtext 2.25pt;
-padding:0cm;mso-padding-alt:1.0pt 0cm 0cm 0cm'><span lang=EN-AU
+<p class="MsoNormal" style='border:none;mso-border-top-alt:solid windowtext 2.25pt;
+padding:0cm;mso-padding-alt:1.0pt 0cm 0cm 0cm'><span lang="EN-AU"
 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>
 {% endif %}
 
 {% if session_itemnumber.size > 1 %}
-<p class=MsoNormal style='border:none;mso-border-top-alt:solid windowtext 2.25pt;
-padding:0cm;mso-padding-alt:1.0pt 0cm 0cm 0cm'><span lang=EN-AU
+<p class="MsoNormal" style='border:none;mso-border-top-alt:solid windowtext 2.25pt;
+padding:0cm;mso-padding-alt:1.0pt 0cm 0cm 0cm'><span lang="EN-AU"
 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>
 {% endif %}
 
-<p class=MsoNormal style='border:none;mso-border-top-alt:solid windowtext 2.25pt;
-padding:0cm;mso-padding-alt:1.0pt 0cm 0cm 0cm'><span lang=EN-AU
+<p class="MsoNormal" style='border:none;mso-border-top-alt:solid windowtext 2.25pt;
+padding:0cm;mso-padding-alt:1.0pt 0cm 0cm 0cm'><span lang="EN-AU"
   style='font-size:10.5pt;mso-bidi-font-size:12.0pt;font-family:"Times New Roman",serif'>{{ docnumber }}{% if item_footnote %}<a
 style='mso-footnote-id:ftnitem' href="#ftnitem" name="_ftnrefitem" class="footnote" title=""><span
-                                                           class=MsoFootnoteReference><span style='mso-special-character:footnote'></span></span></a>{% endif %}<o:p></o:p></span></p>
+                                                           class="MsoFootnoteReference"><span style='mso-special-character:footnote'></span></span></a>{% endif %}<o:p></o:p></span></p>
 
 {% if session_itemname.size > 0 %}
-<p class=MsoNormal style='border:none;mso-border-top-alt:solid windowtext 2.25pt;
+<p class="MsoNormal" style='border:none;mso-border-top-alt:solid windowtext 2.25pt;
 padding:0cm;mso-padding-alt:1.0pt 0cm 0cm 0cm'><b style='mso-bidi-font-weight:
-normal'><span lang=EN-AU style='font-size:10.5pt;mso-bidi-font-size:12.0pt;
+normal'><span lang="EN-AU" style='font-size:10.5pt;mso-bidi-font-size:12.0pt;
 font-family:"Times New Roman",serif'>{{ session_itemname | join: "<br/>" }}<o:p></o:p></span></b></p>
 {% endif %}
 
 {% if session_subitemname.size > 0 %}
-<p class=MsoNormal style='border:none;mso-border-top-alt:solid windowtext 2.25pt;
+<p class="MsoNormal" style='border:none;mso-border-top-alt:solid windowtext 2.25pt;
 padding:0cm;mso-padding-alt:1.0pt 0cm 0cm 0cm'><b style='mso-bidi-font-weight:
-normal'><span lang=EN-AU style='font-size:10.5pt;mso-bidi-font-size:12.0pt;
+normal'><span lang="EN-AU" style='font-size:10.5pt;mso-bidi-font-size:12.0pt;
 font-family:"Times New Roman",serif'>{{ session_subitemname | join: "<br/>" }}<o:p></o:p></span></b></p>
 {% endif %}
 
-<p class=MsoNormal style='border:none;mso-border-top-alt:solid windowtext 2.25pt;
-padding:0cm;mso-padding-alt:1.0pt 0cm 0cm 0cm'><span lang=EN-AU
+<p class="MsoNormal" style='border:none;mso-border-top-alt:solid windowtext 2.25pt;
+padding:0cm;mso-padding-alt:1.0pt 0cm 0cm 0cm'><span lang="EN-AU"
 style='font-family:"Times New Roman",serif'><o:p>&nbsp;</o:p></span></p>
 
 </div>
 
-<p class=MsoNormal style='margin-left:70.9pt'><b style='mso-bidi-font-weight:
-normal'><span lang=EN-AU style='font-size:16.0pt;mso-bidi-font-size:12.0pt;
+<p class="MsoNormal" style='margin-left:70.9pt'><b style='mso-bidi-font-weight:
+normal'><span lang="EN-AU" style='font-size:16.0pt;mso-bidi-font-size:12.0pt;
 font-family:"Times New Roman",serif'>{{ doctitle }}<o:p></o:p></span></b></p>
 
-<p class=MsoNormal style='margin-left:70.9pt'><b style='mso-bidi-font-weight:
-normal'><span lang=EN-AU style='font-family:"Times New Roman",serif'>{{ docsubtitle }}<o:p></o:p></span></b></p>
+<p class="MsoNormal" style='margin-left:70.9pt'><b style='mso-bidi-font-weight:
+normal'><span lang="EN-AU" style='font-family:"Times New Roman",serif'>{{ docsubtitle }}<o:p></o:p></span></b></p>
 
 
-<p class=MsoNormal style='margin-left:70.9pt'>
+<p class="MsoNormal" style='margin-left:70.9pt'>
 {% if session_collaborator %}
 <b style='mso-bidi-font-weight:
-normal'><span lang=EN-AU style='font-family:"Times New Roman",serif'>Developed
+normal'><span lang="EN-AU" style='font-family:"Times New Roman",serif'>Developed
 in Collaboration with {{ session_collaborator }}<o:p></o:p></span></b>
 {% endif %}
 </p>
@@ -127,9 +129,9 @@ in Collaboration with {{ session_collaborator }}<o:p></o:p></span></b>
 
     <div style="border:solid windowtext 1.0pt;
 mso-border-alt:solid windowtext .5pt;">
-    <p class=MsoNormal><i style='mso-bidi-font-style:normal'>Summary</span></i></p>
-    <p class=MsoNormal></p>
-    <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;
+    <p class="MsoNormal"><i style='mso-bidi-font-style:normal'>Summary</span></i></p>
+    <p class="MsoNormal"></p>
+    <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;
     mso-style-textoutline-type:none;mso-style-textoutline-outlinestyle-dpiwidth:
     .75pt;mso-style-textoutline-outlinestyle-linecap:round;mso-style-textoutline-outlinestyle-join:
     bevel;mso-style-textoutline-outlinestyle-pctmiterlimit:0%;mso-style-textoutline-outlinestyle-dash:
@@ -137,24 +139,70 @@ mso-border-alt:solid windowtext .5pt;">
     simple'></div>
     </div>
 
+<p class="MsoNormal"><span xml:lang="EN-AU"><!--[if gte vml 1]><v:shapetype id="_x0000_t202"
+ coordsize="21600,21600" o:spt="202" path="m,l,21600r21600,l21600,xe">
+ <v:stroke joinstyle="miter"/>
+ <v:path gradientshapeok="t" o:connecttype="rect"/>
+</v:shapetype><v:shape id="Text_x0020_Box_x0020_2" o:spid="_x0000_s1027"
+ type="#_x0000_t202" 
+  style='position:absolute;margin-left:-6.0pt;margin-top:-28.35pt;
+ width:190.15pt;height:31.8pt;z-index:251664896;visibility:visible;
+ mso-wrap-style:none;mso-width-percent:0;mso-height-percent:0;
+ mso-wrap-distance-left:0;mso-wrap-distance-top:0;mso-wrap-distance-right:9pt;
+ mso-wrap-distance-bottom:0;mso-position-horizontal:absolute;
+ mso-position-horizontal-relative:margin;mso-position-vertical:absolute;
+ mso-position-vertical-relative:bottom-margin-area;mso-width-percent:0;
+ mso-height-percent:0;mso-width-relative:page;mso-height-relative:page;
+ v-text-anchor:top'
+ o:gfxdata="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
+BADzAAAAsQUAAAAA
+" filled="f" stroked="f" strokeweight=".5pt">
+ <v:fill o:detectmouseclick="t"/>
+ <v:textbox style='mso-fit-shape-to-text:t'>
+  <![if !mso]>
+  <table cellpadding=0 cellspacing=0 width="100%">
+   <tr>
+    <td><![endif]>
+    <div>
+   <p class="MsoNormal" style='margin-left:1.0cm;text-indent:-1.0cm'>{{ session_id }}</p>
 
-<p class=MsoNormal style='margin-left:1.0cm;text-indent:-1.0cm'><i
-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>
-
-<p class=MsoNormal style='margin-left:1.0cm;text-indent:-1.0cm'><i
-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>
-
-<p class=MsoNormal style='margin-left:1.0cm;text-indent:-1.0cm'><i
-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>
-
-<p class=MsoNormal style='margin-left:1.0cm;text-indent:-1.0cm'><i
-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>
-
-<p class=MsoNormal style='margin-left:1.0cm;text-indent:-1.0cm'><i
-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>
+    </div>
+    <![if !mso]></td>
+   </tr>
+  </table>
+  <![endif]></v:textbox>
+ <w:wrap type="square"/>
+ </v:shape><![endif]--></p>
 
-<p class=MsoNormal style='margin-left:1.0cm;text-indent:-1.0cm'><span
-lang=EN-AU style='font-family:"Times New Roman",serif'>{{ session_id }}<o:p></o:p></span></p>
 
 </div>