metanorma-rsd 1.4.2 → 1.4.7

data/lib/isodoc/rsd/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>
@@ -58,13 +42,16 @@ $('#toggle').on('click', function(){
     </script>
 
   <script>
-/**
- * AnchorJS - v4.1.0 - 2017-09-20
- * https://github.com/bryanbraun/anchorjs
- * Copyright (c) 2017 Bryan Braun; Licensed MIT
- */
-!function(A,e){"use strict";"function"==typeof define&&define.amd?define([],e):"object"==typeof module&&module.exports?module.exports=e():(A.AnchorJS=e(),A.anchors=new A.AnchorJS)}(this,function(){"use strict";return function(A){function e(A){A.icon=A.hasOwnProperty("icon")?A.icon:"",A.visible=A.hasOwnProperty("visible")?A.visible:"hover",A.placement=A.hasOwnProperty("placement")?A.placement:"right",A.ariaLabel=A.hasOwnProperty("ariaLabel")?A.ariaLabel:"Anchor",A.class=A.hasOwnProperty("class")?A.class:"",A.truncate=A.hasOwnProperty("truncate")?Math.floor(A.truncate):64}function t(A){var e;if("string"==typeof A||A instanceof String)e=[].slice.call(document.querySelectorAll(A));else{if(!(Array.isArray(A)||A instanceof NodeList))throw new Error("The selector provided to AnchorJS was invalid.");e=[].slice.call(A)}return e}function i(){if(null===document.head.querySelector("style.anchorjs")){var A,e=document.createElement("style");e.className="anchorjs",e.appendChild(document.createTextNode("")),void 0===(A=document.head.querySelector('[rel="stylesheet"], style'))?document.head.appendChild(e):document.head.insertBefore(e,A),e.sheet.insertRule(" .anchorjs-link {   opacity: 0;   text-decoration: none;   -webkit-font-smoothing: antialiased;   -moz-osx-font-smoothing: grayscale; }",e.sheet.cssRules.length),e.sheet.insertRule(" *:hover > .anchorjs-link, .anchorjs-link:focus  {   opacity: 1; }",e.sheet.cssRules.length),e.sheet.insertRule(" [data-anchorjs-icon]::after {   content: attr(data-anchorjs-icon); }",e.sheet.cssRules.length),e.sheet.insertRule(' @font-face {   font-family: "anchorjs-icons";   src: url(data:n/a;base64,AAEAAAALAIAAAwAwT1MvMg8yG2cAAAE4AAAAYGNtYXDp3gC3AAABpAAAAExnYXNwAAAAEAAAA9wAAAAIZ2x5ZlQCcfwAAAH4AAABCGhlYWQHFvHyAAAAvAAAADZoaGVhBnACFwAAAPQAAAAkaG10eASAADEAAAGYAAAADGxvY2EACACEAAAB8AAAAAhtYXhwAAYAVwAAARgAAAAgbmFtZQGOH9cAAAMAAAAAunBvc3QAAwAAAAADvAAAACAAAQAAAAEAAHzE2p9fDzz1AAkEAAAAAADRecUWAAAAANQA6R8AAAAAAoACwAAAAAgAAgAAAAAAAAABAAADwP/AAAACgAAA/9MCrQABAAAAAAAAAAAAAAAAAAAAAwABAAAAAwBVAAIAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAMCQAGQAAUAAAKZAswAAACPApkCzAAAAesAMwEJAAAAAAAAAAAAAAAAAAAAARAAAAAAAAAAAAAAAAAAAAAAQAAg//0DwP/AAEADwABAAAAAAQAAAAAAAAAAAAAAIAAAAAAAAAIAAAACgAAxAAAAAwAAAAMAAAAcAAEAAwAAABwAAwABAAAAHAAEADAAAAAIAAgAAgAAACDpy//9//8AAAAg6cv//f///+EWNwADAAEAAAAAAAAAAAAAAAAACACEAAEAAAAAAAAAAAAAAAAxAAACAAQARAKAAsAAKwBUAAABIiYnJjQ3NzY2MzIWFxYUBwcGIicmNDc3NjQnJiYjIgYHBwYUFxYUBwYGIwciJicmNDc3NjIXFhQHBwYUFxYWMzI2Nzc2NCcmNDc2MhcWFAcHBgYjARQGDAUtLXoWOR8fORYtLTgKGwoKCjgaGg0gEhIgDXoaGgkJBQwHdR85Fi0tOAobCgoKOBoaDSASEiANehoaCQkKGwotLXoWOR8BMwUFLYEuehYXFxYugC44CQkKGwo4GkoaDQ0NDXoaShoKGwoFBe8XFi6ALjgJCQobCjgaShoNDQ0NehpKGgobCgoKLYEuehYXAAAADACWAAEAAAAAAAEACAAAAAEAAAAAAAIAAwAIAAEAAAAAAAMACAAAAAEAAAAAAAQACAAAAAEAAAAAAAUAAQALAAEAAAAAAAYACAAAAAMAAQQJAAEAEAAMAAMAAQQJAAIABgAcAAMAAQQJAAMAEAAMAAMAAQQJAAQAEAAMAAMAAQQJAAUAAgAiAAMAAQQJAAYAEAAMYW5jaG9yanM0MDBAAGEAbgBjAGgAbwByAGoAcwA0ADAAMABAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAH//wAP) format("truetype"); }',e.sheet.cssRules.length)}}this.options=A||{},this.elements=[],e(this.options),this.isTouchDevice=function(){return!!("ontouchstart"in window||window.DocumentTouch&&document instanceof DocumentTouch)},this.add=function(A){var n,o,s,a,r,c,h,l,u,d,f,p=[];if(e(this.options),"touch"===(f=this.options.visible)&&(f=this.isTouchDevice()?"always":"hover"),A||(A="h2, h3, h4, h5, h6"),0===(n=t(A)).length)return this;for(i(),o=document.querySelectorAll("[id]"),s=[].map.call(o,function(A){return A.id}),r=0;r<n.length;r++)if(this.hasAnchorJSLink(n[r]))p.push(r);else{if(n[r].hasAttribute("id"))a=n[r].getAttribute("id");else if(n[r].hasAttribute("data-anchor-id"))a=n[r].getAttribute("data-anchor-id");else{u=l=this.urlify(n[r].textContent),h=0;do{void 0!==c&&(u=l+"-"+h),c=s.indexOf(u),h+=1}while(-1!==c);c=void 0,s.push(u),n[r].setAttribute("id",u),a=u}a.replace(/-/g," "),(d=document.createElement("a")).className="anchorjs-link "+this.options.class,d.href="#"+a,d.setAttribute("aria-label",this.options.ariaLabel),d.setAttribute("data-anchorjs-icon",this.options.icon),"always"===f&&(d.style.opacity="1"),""===this.options.icon&&(d.style.font="1em/1 anchorjs-icons","left"===this.options.placement&&(d.style.lineHeight="inherit")),"left"===this.options.placement?(d.style.position="absolute",d.style.marginLeft="-1em",d.style.paddingRight="0.5em",n[r].insertBefore(d,n[r].firstChild)):(d.style.paddingLeft="0.375em",n[r].appendChild(d))}for(r=0;r<p.length;r++)n.splice(p[r]-r,1);return this.elements=this.elements.concat(n),this},this.remove=function(A){for(var e,i,n=t(A),o=0;o<n.length;o++)(i=n[o].querySelector(".anchorjs-link"))&&(-1!==(e=this.elements.indexOf(n[o]))&&this.elements.splice(e,1),n[o].removeChild(i));return this},this.removeAll=function(){this.remove(this.elements)},this.urlify=function(A){var t=/[& +$,:;=?@"#{}|^~[`%!'<>\]\.\/\(\)\*\\]/g;return this.options.truncate||e(this.options),A.trim().replace(/\'/gi,"").replace(t,"-").replace(/-{2,}/g,"-").substring(0,this.options.truncate).replace(/^-+|-+$/gm,"").toLowerCase()},this.hasAnchorJSLink=function(A){var e=A.firstChild&&(" "+A.firstChild.className+" ").indexOf(" anchorjs-link ")>-1,t=A.lastChild&&(" "+A.lastChild.className+" ").indexOf(" anchorjs-link ")>-1;return e||t||!1}}});  </script>
-
+// @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt Expat
+//
+// AnchorJS - v4.2.2 - 2020-04-20
+// https://www.bryanbraun.com/anchorjs/
+// Copyright (c) 2020 Bryan Braun; Licensed MIT
+//
+// @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt Expat
+!function(A,e){"use strict";"function"==typeof define&&define.amd?define([],e):"object"==typeof module&&module.exports?module.exports=e():(A.AnchorJS=e(),A.anchors=new A.AnchorJS)}(this,function(){"use strict";return function(A){function f(A){A.icon=A.hasOwnProperty("icon")?A.icon:"",A.visible=A.hasOwnProperty("visible")?A.visible:"hover",A.placement=A.hasOwnProperty("placement")?A.placement:"right",A.ariaLabel=A.hasOwnProperty("ariaLabel")?A.ariaLabel:"Anchor",A.class=A.hasOwnProperty("class")?A.class:"",A.base=A.hasOwnProperty("base")?A.base:"",A.truncate=A.hasOwnProperty("truncate")?Math.floor(A.truncate):64,A.titleText=A.hasOwnProperty("titleText")?A.titleText:""}function p(A){var e;if("string"==typeof A||A instanceof String)e=[].slice.call(document.querySelectorAll(A));else{if(!(Array.isArray(A)||A instanceof NodeList))throw new Error("The selector provided to AnchorJS was invalid.");e=[].slice.call(A)}return e}this.options=A||{},this.elements=[],f(this.options),this.isTouchDevice=function(){return!!("ontouchstart"in window||window.DocumentTouch&&document instanceof DocumentTouch)},this.add=function(A){var e,t,i,n,o,s,a,r,c,h,l,u,d=[];if(f(this.options),"touch"===(l=this.options.visible)&&(l=this.isTouchDevice()?"always":"hover"),0===(e=p(A=A||"h2, h3, h4, h5, h6")).length)return this;for(!function(){if(null!==document.head.querySelector("style.anchorjs"))return;var A,e=document.createElement("style");e.className="anchorjs",e.appendChild(document.createTextNode("")),void 0===(A=document.head.querySelector('[rel="stylesheet"],style'))?document.head.appendChild(e):document.head.insertBefore(e,A);e.sheet.insertRule(".anchorjs-link{opacity:0;text-decoration:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}",e.sheet.cssRules.length),e.sheet.insertRule(":hover>.anchorjs-link,.anchorjs-link:focus{opacity:1}",e.sheet.cssRules.length),e.sheet.insertRule("[data-anchorjs-icon]::after{content:attr(data-anchorjs-icon)}",e.sheet.cssRules.length),e.sheet.insertRule('@font-face{font-family:anchorjs-icons;src:url(data:n/a;base64,AAEAAAALAIAAAwAwT1MvMg8yG2cAAAE4AAAAYGNtYXDp3gC3AAABpAAAAExnYXNwAAAAEAAAA9wAAAAIZ2x5ZlQCcfwAAAH4AAABCGhlYWQHFvHyAAAAvAAAADZoaGVhBnACFwAAAPQAAAAkaG10eASAADEAAAGYAAAADGxvY2EACACEAAAB8AAAAAhtYXhwAAYAVwAAARgAAAAgbmFtZQGOH9cAAAMAAAAAunBvc3QAAwAAAAADvAAAACAAAQAAAAEAAHzE2p9fDzz1AAkEAAAAAADRecUWAAAAANQA6R8AAAAAAoACwAAAAAgAAgAAAAAAAAABAAADwP/AAAACgAAA/9MCrQABAAAAAAAAAAAAAAAAAAAAAwABAAAAAwBVAAIAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAMCQAGQAAUAAAKZAswAAACPApkCzAAAAesAMwEJAAAAAAAAAAAAAAAAAAAAARAAAAAAAAAAAAAAAAAAAAAAQAAg//0DwP/AAEADwABAAAAAAQAAAAAAAAAAAAAAIAAAAAAAAAIAAAACgAAxAAAAAwAAAAMAAAAcAAEAAwAAABwAAwABAAAAHAAEADAAAAAIAAgAAgAAACDpy//9//8AAAAg6cv//f///+EWNwADAAEAAAAAAAAAAAAAAAAACACEAAEAAAAAAAAAAAAAAAAxAAACAAQARAKAAsAAKwBUAAABIiYnJjQ3NzY2MzIWFxYUBwcGIicmNDc3NjQnJiYjIgYHBwYUFxYUBwYGIwciJicmNDc3NjIXFhQHBwYUFxYWMzI2Nzc2NCcmNDc2MhcWFAcHBgYjARQGDAUtLXoWOR8fORYtLTgKGwoKCjgaGg0gEhIgDXoaGgkJBQwHdR85Fi0tOAobCgoKOBoaDSASEiANehoaCQkKGwotLXoWOR8BMwUFLYEuehYXFxYugC44CQkKGwo4GkoaDQ0NDXoaShoKGwoFBe8XFi6ALjgJCQobCjgaShoNDQ0NehpKGgobCgoKLYEuehYXAAAADACWAAEAAAAAAAEACAAAAAEAAAAAAAIAAwAIAAEAAAAAAAMACAAAAAEAAAAAAAQACAAAAAEAAAAAAAUAAQALAAEAAAAAAAYACAAAAAMAAQQJAAEAEAAMAAMAAQQJAAIABgAcAAMAAQQJAAMAEAAMAAMAAQQJAAQAEAAMAAMAAQQJAAUAAgAiAAMAAQQJAAYAEAAMYW5jaG9yanM0MDBAAGEAbgBjAGgAbwByAGoAcwA0ADAAMABAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAH//wAP) format("truetype")}',e.sheet.cssRules.length)}(),t=document.querySelectorAll("[id]"),i=[].map.call(t,function(A){return A.id}),o=0;o<e.length;o++)if(this.hasAnchorJSLink(e[o]))d.push(o);else{if(e[o].hasAttribute("id"))n=e[o].getAttribute("id");else if(e[o].hasAttribute("data-anchor-id"))n=e[o].getAttribute("data-anchor-id");else{for(c=r=this.urlify(e[o].textContent),a=0;void 0!==s&&(c=r+"-"+a),a+=1,-1!==(s=i.indexOf(c)););s=void 0,i.push(c),e[o].setAttribute("id",c),n=c}(h=document.createElement("a")).className="anchorjs-link "+this.options.class,h.setAttribute("aria-label",this.options.ariaLabel),h.setAttribute("data-anchorjs-icon",this.options.icon),this.options.titleText&&(h.title=this.options.titleText),u=document.querySelector("base")?window.location.pathname+window.location.search:"",u=this.options.base||u,h.href=u+"#"+n,"always"===l&&(h.style.opacity="1"),""===this.options.icon&&(h.style.font="1em/1 anchorjs-icons","left"===this.options.placement&&(h.style.lineHeight="inherit")),"left"===this.options.placement?(h.style.position="absolute",h.style.marginLeft="-1em",h.style.paddingRight="0.5em",e[o].insertBefore(h,e[o].firstChild)):(h.style.paddingLeft="0.375em",e[o].appendChild(h))}for(o=0;o<d.length;o++)e.splice(d[o]-o,1);return this.elements=this.elements.concat(e),this},this.remove=function(A){for(var e,t,i=p(A),n=0;n<i.length;n++)(t=i[n].querySelector(".anchorjs-link"))&&(-1!==(e=this.elements.indexOf(i[n]))&&this.elements.splice(e,1),i[n].removeChild(t));return this},this.removeAll=function(){this.remove(this.elements)},this.urlify=function(A){return this.options.truncate||f(this.options),A.trim().replace(/\'/gi,"").replace(/[& +$,:;=?@"#{}|^~[`%!'<>\]\.\/\(\)\*\\\n\t\b\v]/g,"-").replace(/-{2,}/g,"-").substring(0,this.options.truncate).replace(/^-+|-+$/gm,"").toLowerCase()},this.hasAnchorJSLink=function(A){var e=A.firstChild&&-1<(" "+A.firstChild.className+" ").indexOf(" anchorjs-link "),t=A.lastChild&&-1<(" "+A.lastChild.className+" ").indexOf(" anchorjs-link ");return e||t||!1}}});
+// @license-end
+  </script>
   <script>
 /*
   $(document).ready(function() {

data/lib/isodoc/rsd/html/word_rsd_intro.html

@@ -1,8 +1,8 @@
-<div class="zzCopyright">
-  <div id="boilerplate-copyright-destination" style='color:windowtext'/>
-  <div id="boilerplate-feedback-destination" style='color:windowtext'/>
-</div>
-
 <p class="zzContents" style='margin-top:0cm'><span lang="EN-GB">Contents</span></p>
 
 WORDTOC
+
+<div class="zzCopyright">
+  <div id="boilerplate-feedback-destination" style='color:windowtext'/>
+  <div id="boilerplate-copyright-destination" style='color:windowtext'/>
+</div>

data/lib/isodoc/rsd/html/word_rsd_titlepage.html

@@ -1,15 +1,15 @@
-<p class="MsoNormal" align="right" style='text-align:right'><b style='mso-bidi-font-weight:
-normal'><span lang="EN-GB" style='font-size:14.0pt;mso-no-proof:yes'>{{ docnumber }} {{ draftinfo }}</span></b><b
-style='mso-bidi-font-weight:normal'><span lang="EN-GB" style='font-size:14.0pt'><o:p></o:p></span></b></p>
+<p class="MsoNormal" align="right" style='text-align:right'><b style='mso-bidi-font-weight:normal'><span lang="EN-GB" style='font-size:14.0pt;mso-no-proof:yes'>RR {{ docnumber }}:{{docyear}} {{ draftinfo }}</span></b></p>
 
-<p class="MsoNormal" align="right" style='text-align:right'><span lang="EN-GB"><span
-style='mso-no-proof:yes'>Ribose&nbsp;{{ tc | join: "/" }}</span></p>
+{% if tc %}
+<p class="MsoNormal" align="right" style='text-align:right'><span
+style='mso-no-proof:yes'>Ribose&#xA0;{{ tc | join: "/" }}</span></p>
+{% endif %}
 
 <p class="MsoNormal" align="center" style='text-align:center;line-height:18.0pt;margin-bottom:0.0pt'><b
 style='mso-bidi-font-weight:normal'><span lang="EN-GB" style='font-size:24.0pt'>{{ doctitle }}</span>
 </b><br/><span lang="EN-GB" style='font-size:16.0pt'>{{ docsubtitle }}</span></p>
 
-<p class="MsoNormal" style='margin-top:100.0pt'><span lang="EN-GB"><o:p>&nbsp;</o:p></span></p>
+<p class="MsoNormal" style='margin-top:100.0pt'><span lang="EN-GB"><o:p>&#xA0;</o:p></span></p>
 
 <div style='mso-element:para-border-div;border:solid windowtext 1.0pt;
 mso-border-alt:solid windowtext .5pt;padding:1.0pt 4.0pt 1.0pt 4.0pt;
@@ -30,12 +30,6 @@ mso-border-alt:solid windowtext .5pt;padding:0cm;mso-padding-alt:1.0pt 4.0pt 1.0
                      lang="EN-GB" style='font-size:16.0pt'>Ribose {{ doctype }}</span></p>
 
 
-{% if security %}
-<p class="MsoNormal" align="center" style='text-align:center;border:none;
-mso-border-alt:solid windowtext .5pt;padding:0cm;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span
-                     lang="EN-GB" style='font-size:16.0pt'> Classification: {{ security }}</span></p>
-{% endif %}
-
 {% if doctype == "Policy And Procedures" or doctype == "Proposal" %}
 <p class="MsoNormal" align="center" style='text-align:center;border:none;
 mso-border-alt:solid windowtext .5pt;padding:0cm;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt'><span
@@ -43,7 +37,34 @@ mso-border-alt:solid windowtext .5pt;padding:0cm;mso-padding-alt:1.0pt 4.0pt 1.0
 {% endif %}
 </div>
 
-<p class="MsoNormal" style='margin-bottom:6.0pt'><span lang="EN-GB"><o:p>&nbsp;</o:p></span></p>
+<p class="MsoNormal" style='margin-bottom:6.0pt'><span lang="EN-GB"><o:p>&#xA0;</o:p></span></p>
+
+{% for author in authors %}
+<p class="MsoNormal">{{ author }}</p>
+{% endfor %}
+
+<p/>
+
+<p/>
+
+<p/>
+
+{% if draft %}
+<p class="MsoNormal">Version {{draft}}<br/>
+{{ revdate_MMMddyyyy || circulateddate }}</p>
+{% endif %}
+
+{% if security %}
+<p class="MsoNormal">&#xA0;</p>
+
+<p class="MsoNormal"><i> {{ security }}</i></p>
+{% endif %}
+
+{% if recipient %}
+<p class="MsoNormal">&#xA0;</p>
+
+<p class="MsoNormal">Recipient: {{ recipient  }}</p>
+{% endif %}
 
 <div style='mso-element:para-border-div;border:solid windowtext 1.0pt;
 mso-border-alt:solid windowtext .5pt;padding:1.0pt 4.0pt 1.0pt 4.0pt;
@@ -56,9 +77,43 @@ margin-left:4.25pt;margin-right:4.25pt'>
 </div>
 
 <div align="center" style='text-align:center'>
-  <div id=boilerplate-copyright-destination"/>
+  <div id="boilerplate-copyright-destination"/>
   </div>
 
 
+<p class="MsoHeader"><v:shapetype id="_x0000_t75" coordsize="21600,21600"
+ o:spt="75" o:preferrelative="t" path="m@4@5l@4@11@9@11@9@5xe" filled="f"
+ stroked="f">
+ <v:stroke joinstyle="miter"/>
+ <v:formulas>
+  <v:f eqn="if lineDrawn pixelLineWidth 0"/>
+  <v:f eqn="sum @0 1 0"/>
+  <v:f eqn="sum 0 0 @1"/>
+  <v:f eqn="prod @2 1 2"/>
+  <v:f eqn="prod @3 21600 pixelWidth"/>
+  <v:f eqn="prod @3 21600 pixelHeight"/>
+  <v:f eqn="sum @0 0 1"/>
+  <v:f eqn="prod @6 1 2"/>
+  <v:f eqn="prod @7 21600 pixelWidth"/>
+  <v:f eqn="sum @8 21600 0"/>
+  <v:f eqn="prod @7 21600 pixelHeight"/>
+  <v:f eqn="sum @10 21600 0"/>
+ </v:formulas>
+ <v:path o:extrusionok="f" gradientshapeok="t" o:connecttype="rect"/>
+ <o:lock v:ext="edit" aspectratio="t"/>
+</v:shapetype><v:shape id="Picture_x0020_39" o:spid="_x0000_s1026" type="#_x0000_t75"
+ alt="A close up of a logo&#10;&#10;Description automatically generated"
+ style='position:absolute;margin-left:.15pt;margin-top:96pt;width:123.65pt;
+ height:31.1pt;z-index:251658240;visibility:visible;mso-wrap-style:square;
+ mso-width-percent:0;mso-height-percent:0;mso-wrap-distance-left:9pt;
+ mso-wrap-distance-top:0;mso-wrap-distance-right:9pt;
+ mso-wrap-distance-bottom:0;mso-position-horizontal:absolute;
+ mso-position-horizontal-relative:text;mso-position-vertical:absolute;
+ mso-position-vertical-relative:text;mso-width-percent:0;mso-height-percent:0;
+ mso-width-relative:page;mso-height-relative:page'>
+<v:imagedata src="{{ logo }}" o:title="A close up of a logo&#10;&#10;Description automatically generated"/>
+ <w:wrap type="square"/>
+</v:shape>
+</p>
 
 

data/lib/isodoc/rsd/html/wordstyle.scss

@@ -71,7 +71,7 @@ p.MsoNormal, li.MsoNormal, div.MsoNormal
 	margin:0cm;
 	margin-bottom:12.0pt;
 	mso-pagination:widow-orphan;
-	font-size:10.5pt;
+	font-size:12.0pt;
 	font-family:$bodyfont;
 	mso-fareast-font-family:"Times New Roman";
 	mso-ansi-language:EN-US;
@@ -84,9 +84,9 @@ p.MsoListParagraph, li.MsoListParagraph, div.MsoListParagraph
         margin-right:0cm;
         margin-bottom:12.0pt;
         /* do not put in margin-left, it is specific to list level */
-        mso-add-space:auto;
+        /*mso-add-space:auto;*/
         mso-pagination:widow-orphan;
-        font-size:10.5pt;
+        font-size:12.0pt;
         font-family:$bodyfont;
         mso-ansi-language:EN-AU;
         mso-fareast-language:EN-US;}
@@ -99,9 +99,9 @@ p.MsoListParagraphCxSpFirst, li.MsoListParagraphCxSpFirst, div.MsoListParagraphC
         margin-right:0cm;
         margin-bottom:12.0pt;
         /* do not put in margin-left, it is specific to list level */
-        mso-add-space:auto;
+        /*mso-add-space:auto;*/
         mso-pagination:widow-orphan;
-        font-size:10.5pt;
+        font-size:12.0pt;
         font-family:$bodyfont;
         mso-ansi-language:EN-AU;
         mso-fareast-language:EN-US;}
@@ -114,9 +114,9 @@ p.MsoListParagraphCxSpMiddle, li.MsoListParagraphCxSpMiddle, div.MsoListParagrap
         margin-right:0cm;
         margin-bottom:12.0pt;
         /* do not put in margin-left, it is specific to list level */
-        mso-add-space:auto;
+        /*mso-add-space:auto;*/
         mso-pagination:widow-orphan;
-        font-size:10.5pt;
+        font-size:12.0pt;
         font-family:$bodyfont;
         mso-ansi-language:EN-AU;
         mso-fareast-language:EN-US;}
@@ -129,9 +129,9 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
         margin-right:0cm;
         margin-bottom:12.0pt;
         /* do not put in margin-left, it is specific to list level */
-        mso-add-space:auto;
+        /*mso-add-space:auto;*/
         mso-pagination:widow-orphan;
-        font-size:10.5pt;
+        font-size:12.0pt;
         font-family:$bodyfont;
         mso-ansi-language:EN-AU;
         mso-fareast-language:EN-US;}
@@ -153,7 +153,7 @@ p.MsoHeader, li.MsoHeader, div.MsoHeader
 	margin-bottom:.0001pt;
 	mso-pagination:widow-orphan;
 	tab-stops:center 216.0pt right 482.0pt;
-	font-size:10.5pt;
+	font-size:12.0pt;
 	font-family:$bodyfont;
 	mso-fareast-font-family:"Times New Roman";
 	mso-ansi-language:EN-US;
@@ -164,7 +164,7 @@ p.MsoHeaderLandscape, li.MsoHeaderLandscape, div.MsoHeaderLandscape
         margin-bottom:.0001pt;
         mso-pagination:widow-orphan;
         tab-stops:center 367.0pt right 734.0pt;
-        font-size:10.5pt;
+        font-size:12.0pt;
         font-family:$bodyfont;
         mso-fareast-font-family:"Times New Roman";
         mso-ansi-language:EN-US;
@@ -175,7 +175,7 @@ p.MsoFooter, li.MsoFooter, div.MsoFooter
 	margin-bottom:.0001pt;
 	mso-pagination:widow-orphan;
 	tab-stops:right 482.0pt;
-	font-size:10.5pt;
+	font-size:10.0pt;
 	font-family:$bodyfont;
 	mso-fareast-font-family:"Times New Roman";
 	mso-ansi-language:EN-US;
@@ -186,7 +186,7 @@ p.MsoFooterLandscape, li.MsoFooterLandscape, div.MsoFooterLandscape
         margin-bottom:.0001pt;
         mso-pagination:widow-orphan;
         tab-stops:right 734.0pt;
-        font-size:10.5pt;
+        font-size:10.0pt;
         font-family:$bodyfont;
         mso-fareast-font-family:"Times New Roman";
         mso-ansi-language:EN-US;
@@ -289,7 +289,7 @@ p.MsoTitleCxSpLast, li.MsoTitleCxSpLast, div.MsoTitleCxSpLast
 a:link, span.MsoHyperlink
 	{mso-style-unhide:no;
 	mso-style-parent:"";
-	color:blue;
+	color:#ED7D31;
 	text-decoration:underline;
 	text-underline:single;}
 a:visited, span.MsoHyperlinkFollowed
@@ -362,6 +362,7 @@ h1
 	font-family:$headerfont;
 	mso-fareast-font-family:$headerfont;
         color:#0E1A85;
+        font-weight:normal;
 	mso-font-kerning:0pt;
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
@@ -386,9 +387,10 @@ h1.Annex
 	mso-list:l1 level1 lfo6;
 	mso-hyphenate:none;
 	tab-stops:20.0pt list 21.6pt left 28.0pt;
-	font-size:12.0pt;
+	font-size:13.0pt;
 	mso-bidi-font-size:11.0pt;
 	font-family:$headerfont;
+        font-weight:normal;
 	mso-fareast-font-family:$headerfont;
         color:#0E1A85;
 	mso-font-kerning:0pt;
@@ -416,7 +418,7 @@ h1.Annex
         font-size:12.0pt;
         mso-bidi-font-size:11.0pt;
         font-family:$headerfont;
-        font-weight:bold;
+        font-weight:normal;
         mso-fareast-font-family:$headerfont;
         color:#0E1A85;
         mso-ansi-language:EN-GB;
@@ -444,6 +446,7 @@ h2
 	font-size:12.0pt;
 	mso-bidi-font-size:11.0pt;
 	font-family:$headerfont;
+        font-weight:normal;
 	mso-fareast-font-family:$headerfont;
         color:#0E1A85;
 	mso-ansi-language:EN-GB;
@@ -470,6 +473,7 @@ h3
 	tab-stops:list 36.0pt left 44.0pt;
 	font-size:11.0pt;
 	font-family:$headerfont;
+        font-weight:normal;
         color:#0E1A85;
 	mso-fareast-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
@@ -496,6 +500,7 @@ h4
 	tab-stops:51.05pt 57.0pt 68.0pt;
 	font-size:11.0pt;
 	font-family:$headerfont;
+        font-weight:normal;
         color:#0E1A85;
 	mso-fareast-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
@@ -522,6 +527,7 @@ h5
 	tab-stops:51.05pt list 54.0pt;
 	font-size:11.0pt;
 	font-family:$headerfont;
+        font-weight:normal;
 	mso-fareast-font-family:$headerfont;
         color:#0E1A85;
 	mso-ansi-language:EN-GB;
@@ -548,6 +554,7 @@ h6
 	tab-stops:51.05pt list 72.0pt;
 	font-size:11.0pt;
 	font-family:$headerfont;
+        font-weight:normal;
         color:#0E1A85;
 	mso-fareast-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
@@ -567,12 +574,12 @@ p.MsoToc1, li.MsoToc1, div.MsoToc1
 	mso-pagination:widow-orphan;
 	mso-hyphenate:none;
 	tab-stops:20.15pt 36.0pt right dotted 487.6pt;
-	font-size:10.5pt;
+	font-size:12.0pt;
 	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;
 	mso-ansi-language:EN-GB;
-	font-weight:bold;
+	font-weight:normal;
 	mso-bidi-font-weight:normal;}
 p.MsoToc2, li.MsoToc2, div.MsoToc2
 	{mso-style-noshow:yes;
@@ -590,12 +597,12 @@ p.MsoToc2, li.MsoToc2, div.MsoToc2
 	mso-pagination:widow-orphan;
 	mso-hyphenate:none;
 	tab-stops:20.15pt 36.0pt right dotted 487.6pt;
-	font-size:10.5pt;
+	font-size:12.0pt;
 	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;
 	mso-ansi-language:EN-GB;
-	font-weight:bold;
+	font-weight:normal;
 	mso-bidi-font-weight:normal;}
 p.MsoToc3, li.MsoToc3, div.MsoToc3
 	{mso-style-noshow:yes;
@@ -613,12 +620,12 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3
 	mso-pagination:widow-orphan;
 	mso-hyphenate:none;
 	tab-stops:20.15pt 36.0pt right dotted 487.6pt;
-	font-size:10.5pt;
+	font-size:12.0pt;
 	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;
 	mso-ansi-language:EN-GB;
-	font-weight:bold;
+	font-weight:normal;
 	mso-bidi-font-weight:normal;}
 span.MsoFootnoteReference
 	{mso-style-priority:99;
@@ -653,7 +660,7 @@ p.MsoBodyText, li.MsoBodyText, div.MsoBodyText
 	text-align:justify;
 	line-height:12.0pt;
 	mso-pagination:widow-orphan;
-	font-size:10.5pt;
+	font-size:12.0pt;
 	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;
@@ -667,12 +674,13 @@ span.Heading1Char
 	mso-style-link:"Heading 1";
 	mso-ansi-font-size:13.0pt;
 	font-family:$headerfont;
+        color:#0E1A85;
+        font-weight:normal;
 	mso-ascii-font-family:Cambria;
 	mso-fareast-font-family:$headerfont;
 	mso-hansi-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
-	font-weight:bold;
 	mso-bidi-font-weight:normal;}
 span.Heading2Char
 	{mso-style-name:"Heading 2 Char";
@@ -683,12 +691,13 @@ span.Heading2Char
 	mso-style-link:"Heading 2";
 	mso-ansi-font-size:12.0pt;
 	font-family:$headerfont;
+        color:#0E1A85;
+        font-weight:normal;
 	mso-ascii-font-family:Cambria;
 	mso-fareast-font-family:$headerfont;
 	mso-hansi-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
-	font-weight:bold;
 	mso-bidi-font-weight:normal;}
 span.Heading3Char
 	{mso-style-name:"Heading 3 Char";
@@ -699,12 +708,13 @@ span.Heading3Char
 	mso-style-link:"Heading 3";
 	mso-ansi-font-size:11.0pt;
 	font-family:$headerfont;
+        color:#0E1A85;
+        font-weight:normal;
 	mso-ascii-font-family:$headerfont;
 	mso-fareast-font-family:$headerfont;
 	mso-hansi-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
-	font-weight:bold;
 	mso-bidi-font-weight:normal;}
 span.Heading4Char
 	{mso-style-name:"Heading 4 Char";
@@ -715,12 +725,13 @@ span.Heading4Char
 	mso-style-link:"Heading 4";
 	mso-ansi-font-size:11.0pt;
 	font-family:$headerfont;
+        color:#0E1A85;
+        font-weight:normal;
 	mso-ascii-font-family:$headerfont;
 	mso-fareast-font-family:$headerfont;
 	mso-hansi-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
-	font-weight:bold;
 	mso-bidi-font-weight:normal;}
 span.Heading5Char
 	{mso-style-name:"Heading 5 Char";
@@ -731,12 +742,13 @@ span.Heading5Char
 	mso-style-link:"Heading 5";
 	mso-ansi-font-size:11.0pt;
 	font-family:$headerfont;
+        color:#0E1A85;
+        font-weight:normal;
 	mso-ascii-font-family:$headerfont;
 	mso-fareast-font-family:$headerfont;
 	mso-hansi-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
-	font-weight:bold;
 	mso-bidi-font-weight:normal;}
 span.Heading6Char
 	{mso-style-name:"Heading 6 Char";
@@ -747,12 +759,13 @@ span.Heading6Char
 	mso-style-link:"Heading 6";
 	mso-ansi-font-size:11.0pt;
 	font-family:$headerfont;
+        color:#0E1A85;
+        font-weight:normal;
 	mso-ascii-font-family:$headerfont;
 	mso-fareast-font-family:$headerfont;
 	mso-hansi-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
-	font-weight:bold;
 	mso-bidi-font-weight:normal;}
 p.Tablebody, li.Tablebody, div.Tablebody
 	{mso-style-name:"Table body";
@@ -1146,7 +1159,7 @@ table.MsoNormalTable
 	mso-para-margin:0cm;
 	mso-para-margin-bottom:.0001pt;
 	mso-pagination:widow-orphan;
-	font-size:10.0pt;
+	font-size:12.0pt;
 	font-family:$bodyfont;}
 ol
 	{margin-bottom:0cm;