metanorma-iso 1.3.22 → 1.3.27

data/lib/isodoc/iso/html/scripts.html

@@ -1,24 +1,8 @@
-<script>
-    //TOC generation
-      $('#toc').toc({
-          //'selectors': 'h1,h2:not(.TermNum)', //elements to use as headings
-          '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();
-      }
-      });
+  <script>
+    $("#toc").on('click', 'li', function(e) {
+    $(this).parent().find('li.toc-active').removeClass('toc-active');
+    $(this).addClass('toc-active');
+});
   </script>
 
   <script>
@@ -174,3 +158,21 @@ $('#toggle').on('click', function(){
         $("[rel=footnote]").inlineFootnote();
         });
 </script>
+  <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>
+  anchors.options = {
+  placement: 'left'
+};
+anchors.add('h1, h2, h3, h4');
+</script>
+

data/lib/isodoc/iso/html/style-human.scss

@@ -7,6 +7,7 @@
    License: none (public domain)
 */
 
+
 @import 'base_style/all';
 
 body {
@@ -174,6 +175,21 @@ h6 {
     line-height: 1.2;
 }
 
+/* override for amendments */
+
+{% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
+
+h1, h2, h3, h4, h5, h6 {
+    font-weight: normal;
+    font-size: initial;
+    font-style: italic;
+    line-height: 2em;
+    margin-top: 2em;
+    margin-bottom: 1em;
+}
+
+{% endif %}
+
 h2 p {
     display: inline;
 }
@@ -189,6 +205,10 @@ p.zzSTDTitle1 {
     font-size: 1.5em;
 }
 
+p.zzSTDTitle2 {
+    font-size: 1.5em;
+}
+
 span.obligation {
     font-weight: 400;
 }
@@ -487,6 +507,9 @@ pre {
     @include blockTitle()
 }
 
+.figure dl {
+}
+
 /*
 3.7 Notes
 */

data/lib/isodoc/iso/html/style-iso.scss

@@ -130,6 +130,17 @@ h1, h2, h3, h4, h5, h6 {
     line-height: 1.2;
 }
 
+{% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
+
+h1, h2, h3, h4, h5, h6 {
+    font-weight: normal;
+    font-size: initial;
+    font-style: italic;
+}
+
+{% endif %}
+
+
 p {
     margin-top: 1em;
     margin-bottom: 1em;
@@ -140,6 +151,10 @@ p.zzSTDTitle1 {
     font-size: 1.5em;
 }
 
+p.zzSTDTitle2 {
+    font-size: 1.5em;
+}
+
 span.obligation {
     font-weight: 400;
 }
@@ -522,6 +537,9 @@ pre {
     @include blockTitle()
 }
 
+.figure dl {
+}
+
 /*
 3.7 Notes
 */

data/lib/isodoc/iso/html/word_iso_intro.html

@@ -5,6 +5,10 @@ margin-left:5.1pt;margin-right:5.1pt'>
 <div id="boilerplate-copyright-destination"/>
 </div>
 
+{% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
+{% else %}
+
 <p class="zzContents" style='margin-top:0cm'><span lang="EN-GB">Contents</span></p>
 
 WORDTOC
+{% endif %}

data/lib/isodoc/iso/html/word_iso_titlepage.html

@@ -6,7 +6,7 @@ style='mso-bidi-font-weight:normal'>
 {% endfor %}
 {% else %}
 <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 }}(E) {{ draftinfo }}</span></b><b
+normal'><span lang="EN-GB" style='font-size:14.0pt;mso-no-proof:yes'>{{ docnumber_lang }} {{ 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>
 {% endif %}
 
@@ -15,7 +15,15 @@ style='mso-bidi-font-weight:normal'>
 {% endif %}
 
 {% if tc_docnumber.size > 0 %}
-<p class="MsoNormal" align="right" style='text-align:right'><span lang="EN-GB" style='mso-no-proof:yes'>{{ docnumber }}(E) {{ draftinfo }}</span></p>
+<p class="MsoNormal" align="right" style='text-align:right'><span lang="EN-GB" style='mso-no-proof:yes'>{{ docnumber_lang }} {{ draftinfo }}</span></p>
+{% endif %}
+
+{% if doctitleamdlabel %}
+<p class="MsoNormal" align="right" style='text-align:right'><b>{{ doctitleamdlabel }}</b></p>
+{% endif %}
+
+{% if doctitlecorrlabel %}
+<p class="MsoNormal" align="right" style='text-align:right'><b>{{ doctitlecorrlabel }}</b></p>
 {% endif %}
 
 <p class="MsoNormal" align="right" style='text-align:right'><span lang="EN-GB"
@@ -31,6 +39,13 @@ style='mso-no-proof:yes'>{{ agency }}/{{ editorialgroup | join: "/" }}
 <span class="part"><b>{{ doctitlepart }}</b></span>
 {% endif %}
 </p>
+{% if doctitleamdlabel %}
+<p class="MsoNormal" style='text-align:left;line-height:18.0pt;margin-bottom:0.0pt;margin-top:6.0pt;font-size:16.0pt'>{{ doctitleamdlabel }}{% if doctitleamd %}: {{ doctitleamd }}{% endif %}</p>
+{% endif %}
+{% if doctitlecorrlabel %}
+<p class="MsoNormal" style='text-align:left;line-height:18.0pt;margin-bottom:0.0pt;margin-top:6.0pt;font-size:16.0pt'>{{ doctitlecorrlabel }}</p>
+{% endif %}
+
 
 <br/>
 <p class="MsoNormal" align="left" style='text-align:left;line-height:18.0pt;margin-bottom:0.0pt;font-size:16.0pt'>
@@ -41,6 +56,12 @@ style='mso-no-proof:yes'>{{ agency }}/{{ editorialgroup | join: "/" }}
 <span class="part">{{ docsubtitlepart }}</span>
 {% endif %}
 </p>
+{% if docsubtitleamdlabel %}
+<p class="MsoNormal" style='text-align:left;line-height:18.0pt;margin-bottom:0.0pt;margin-top:6.0pt;font-size:16.0pt'>{{ docsubtitleamdlabel }}{% if docsubtitleamd %}: {{ docsubtitleamd }}{% endif %}</p>
+{% endif %}
+{% if docsubtitlecorrlabel %}
+<p class="MsoNormal" style='text-align:left;line-height:18.0pt;margin-bottom:0.0pt;margin-top:6.0pt;font-size:16.0pt'>{{ docsubtitlecorrlabel }}</p>
+{% endif %}
 
 
 

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

@@ -63,7 +63,7 @@ p.MsoNormal, li.MsoNormal, div.MsoNormal
 	tab-stops:20.15pt;
 	font-size:11.0pt;
 	font-family:$bodyfont;
-	mso-fareast-font-family:$bodyfont;
+	mso-fareast-font-family:"SimSun",serif;
 	mso-bidi-font-family:$bodyfont;
 	mso-ansi-language:EN-GB;}
 p.MsoNormalIndent, li.MsoNormalIndent, div.MsoNormalIndent
@@ -78,7 +78,7 @@ p.MsoNormalIndent, li.MsoNormalIndent, div.MsoNormalIndent
 	tab-stops:20.15pt;
 	font-size:11.0pt;
 	font-family:$bodyfont;
-	mso-fareast-font-family:$bodyfont;
+	mso-fareast-font-family:"SimSun",serif;
 	mso-bidi-font-family:$bodyfont;
 	mso-ansi-language:EN-GB;}
 p.MsoBlockText, li.MsoBlockText, div.MsoBlockText
@@ -98,7 +98,7 @@ p.MsoBlockText, li.MsoBlockText, div.MsoBlockText
 	font-family:$bodyfont;
 	mso-ascii-font-family:$bodyfont;
 	mso-ascii-theme-font:minor-latin;
-	mso-fareast-font-family:$bodyfont;
+	mso-fareast-font-family:"SimSun",serif;
 	mso-fareast-theme-font:minor-fareast;
 	mso-hansi-font-family:$bodyfont;
 	mso-hansi-theme-font:minor-latin;
@@ -184,14 +184,25 @@ h1
 	mso-list:l1 level1 lfo6;
 	mso-hyphenate:none;
 	tab-stops:20.0pt list 21.6pt left 28.0pt;
-	font-size:13.0pt;
+        {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
+        font-style: italic ;
+	font-size:11.0pt;
+        font-weight: normal ;
+        {% else %}
+        font-size:13.0pt;
+        {% endif %}
 	mso-bidi-font-size:11.0pt;
 	font-family:$headerfont;
-	mso-fareast-font-family:$headerfont;
+	mso-fareast-font-family:"SimHei",serif;
 	mso-font-kerning:0pt;
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
 	mso-bidi-font-weight:normal;}
+h1.ForewordTitle {
+        font-size:13.0pt;
+        font-style: normal ;
+        font-weight: bold;
+}
 h1.Annex
 	{mso-style-priority:1;
 	mso-style-unhide:no;
@@ -215,7 +226,7 @@ h1.Annex
 	font-size:13.0pt;
 	mso-bidi-font-size:11.0pt;
 	font-family:$headerfont;
-	mso-fareast-font-family:$headerfont;
+	mso-fareast-font-family:"SimHei",serif;
 	mso-font-kerning:0pt;
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
@@ -238,11 +249,17 @@ h1.Annex
         mso-outline-level:2;
         mso-hyphenate:none;
         tab-stops:27.0pt 35.0pt;
-        font-size:12.0pt;
+        {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
+        font-style: italic ;
+        font-size:11.0pt;
+        font-weight: normal ;
+        {% else %}
+        font-size:13.0pt;
         font-weight:bold;
+        {% endif %}
         mso-bidi-font-size:11.0pt;
         font-family:$headerfont;
-        mso-fareast-font-family:$headerfont;
+        mso-fareast-font-family:"SimHei",serif;
         mso-ansi-language:EN-GB;
         mso-fareast-language:JA;
         mso-bidi-font-weight:normal;}
@@ -266,10 +283,16 @@ h2
 	mso-outline-level:3;
 	mso-hyphenate:none;
 	tab-stops:list 36.0pt left 44.0pt;
-	font-size:11.0pt;
-	font-family:$headerfont;
+        {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
+        font-style: italic ;
+        font-size:11.0pt;
+        font-weight: normal ;
+        {% else %}
+        font-size:13.0pt;
         font-weight:bold;
-	mso-fareast-font-family:$headerfont;
+        {% endif %}
+	font-family:$headerfont;
+	mso-fareast-font-family:"SimHei",serif;
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
 	mso-bidi-font-weight:normal;}
@@ -294,8 +317,13 @@ h3      {mso-list:l1 level3 lfo6;}
 	tab-stops:51.05pt 57.0pt 68.0pt;
 	font-size:11.0pt;
 	font-family:$headerfont;
+        {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
+        font-style: italic ;
+        font-weight: normal ;
+        {% else %}
         font-weight:bold;
-	mso-fareast-font-family:$headerfont;
+        {% endif %}
+	mso-fareast-font-family:"SimHei",serif;
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
 	mso-bidi-font-weight:normal;}
@@ -320,8 +348,13 @@ h4      {mso-list:l1 level4 lfo6;}
 	tab-stops:51.05pt list 54.0pt;
 	font-size:11.0pt;
 	font-family:$headerfont;
+        {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
+        font-style: italic ;
+        font-weight: normal ;
+        {% else %}
         font-weight:bold;
-	mso-fareast-font-family:$headerfont;
+        {% endif %}
+	mso-fareast-font-family:"SimHei",serif;
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
 	mso-bidi-font-weight:normal;}
@@ -346,8 +379,13 @@ h6
 	tab-stops:51.05pt list 72.0pt;
 	font-size:11.0pt;
 	font-family:$headerfont;
+        {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
+        font-style: italic ;
+        font-weight: normal ;
+        {% else %}
         font-weight:bold;
-	mso-fareast-font-family:$headerfont;
+        {% endif %}
+	mso-fareast-font-family:"SimHei",serif;
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
 	mso-bidi-font-weight:normal;}
@@ -368,7 +406,7 @@ p.MsoToc1, li.MsoToc1, div.MsoToc1
 	tab-stops:20.15pt 36.0pt right dotted 487.6pt;
 	font-size:11.0pt;
 	font-family:$bodyfont;
-	mso-fareast-font-family:$bodyfont;
+	mso-fareast-font-family:"SimHei",serif;
 	mso-bidi-font-family:$bodyfont;
 	mso-ansi-language:EN-GB;
 	font-weight:bold;
@@ -391,7 +429,7 @@ p.MsoToc2, li.MsoToc2, div.MsoToc2
 	tab-stops:20.15pt 36.0pt right dotted 487.6pt;
 	font-size:11.0pt;
 	font-family:$bodyfont;
-	mso-fareast-font-family:$bodyfont;
+	mso-fareast-font-family:"SimSun",serif;
 	mso-bidi-font-family:$bodyfont;
 	mso-ansi-language:EN-GB;
 	font-weight:bold;
@@ -414,7 +452,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3
 	tab-stops:20.15pt 36.0pt right dotted 487.6pt;
 	font-size:11.0pt;
 	font-family:$bodyfont;
-	mso-fareast-font-family:$bodyfont;
+	mso-fareast-font-family:"SimSun",serif;
 	mso-bidi-font-family:$bodyfont;
 	mso-ansi-language:EN-GB;
 	font-weight:bold;
@@ -435,7 +473,7 @@ p.MsoHeader, li.MsoHeader, div.MsoHeader
 	tab-stops:20.15pt;
 	font-size:11.0pt;
 	font-family:$headerfont;
-	mso-fareast-font-family:$headerfont;
+	mso-fareast-font-family:"SimHei",serif;
 	mso-bidi-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
 	font-weight:bold;
@@ -456,7 +494,7 @@ p.MsoHeaderLandscape, li.MsoHeaderLandscape, div.MsoHeaderLandscape
         tab-stops:20.15pt;
         font-size:11.0pt;
         font-family:$headerfont;
-        mso-fareast-font-family:$headerfont;
+        mso-fareast-font-family:"SimHei",serif;
         mso-bidi-font-family:$headerfont;
         mso-ansi-language:EN-GB;
         font-weight:bold;
@@ -477,7 +515,7 @@ p.MsoFooter, li.MsoFooter, div.MsoFooter
 	tab-stops:right 487.6pt;
 	font-size:11.0pt;
 	font-family:$headerfont;
-	mso-fareast-font-family:$headerfont;
+	mso-fareast-font-family:"SimHei",serif;
 	mso-bidi-font-family:$headerfont;
 	mso-ansi-language:EN-GB;}
 p.MsoFooterLandscape, li.MsoFooterLandscape, div.MsoFooterLandscape
@@ -496,7 +534,7 @@ p.MsoFooterLandscape, li.MsoFooterLandscape, div.MsoFooterLandscape
         tab-stops:right 734.0pt;
         font-size:11.0pt;
         font-family:$headerfont;
-        mso-fareast-font-family:$headerfont;
+        mso-fareast-font-family:"SimHei",serif;
         mso-bidi-font-family:$headerfont;
         mso-ansi-language:EN-GB;}
 span.MsoFootnoteReference
@@ -516,7 +554,7 @@ p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText
 	tab-stops:20.15pt;
 	font-size:10.0pt;
 	font-family:$bodyfont;
-	mso-fareast-font-family:$bodyfont;
+	mso-fareast-font-family:"SimSun",serif;
 	mso-bidi-font-family:$bodyfont;
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:EN-US;}
@@ -534,7 +572,7 @@ p.MsoBodyText, li.MsoBodyText, div.MsoBodyText
 	mso-pagination:widow-orphan;
 	font-size:11.0pt;
 	font-family:$bodyfont;
-	mso-fareast-font-family:$bodyfont;
+	mso-fareast-font-family:"SimSun",serif;
 	mso-bidi-font-family:$bodyfont;
 	mso-ansi-language:EN-GB;}
 a:link, span.MsoHyperlink
@@ -568,11 +606,14 @@ span.Heading1Char
 	mso-ansi-font-size:13.0pt;
 	font-family:$headerfont;
 	mso-ascii-font-family:Cambria;
-	mso-fareast-font-family:$headerfont;
+	mso-fareast-font-family:"SimHei",serif;
 	mso-hansi-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
+        {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
+        {% else %}
 	font-weight:bold;
+        {% endif %}
 	mso-bidi-font-weight:normal;}
 span.Heading2Char
 	{mso-style-name:"Heading 2 Char";
@@ -584,7 +625,7 @@ span.Heading2Char
 	mso-ansi-font-size:12.0pt;
 	font-family:$headerfont;
 	mso-ascii-font-family:Cambria;
-	mso-fareast-font-family:$headerfont;
+	mso-fareast-font-family:"SimHei",serif;
 	mso-hansi-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
@@ -600,7 +641,7 @@ span.Heading3Char
 	mso-ansi-font-size:11.0pt;
 	font-family:$headerfont;
 	mso-ascii-font-family:$headerfont;
-	mso-fareast-font-family:$headerfont;
+	mso-fareast-font-family:"SimHei",serif;
 	mso-hansi-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
@@ -616,7 +657,7 @@ span.Heading4Char
 	mso-ansi-font-size:11.0pt;
 	font-family:$headerfont;
 	mso-ascii-font-family:$headerfont;
-	mso-fareast-font-family:$headerfont;
+	mso-fareast-font-family:"SimHei",serif;
 	mso-hansi-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
@@ -632,7 +673,7 @@ span.Heading5Char
 	mso-ansi-font-size:11.0pt;
 	font-family:$headerfont;
 	mso-ascii-font-family:$headerfont;
-	mso-fareast-font-family:$headerfont;
+	mso-fareast-font-family:"SimHei",serif;
 	mso-hansi-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
@@ -648,7 +689,7 @@ span.Heading6Char
 	mso-ansi-font-size:11.0pt;
 	font-family:$headerfont;
 	mso-ascii-font-family:$headerfont;
-	mso-fareast-font-family:$headerfont;
+	mso-fareast-font-family:"SimHei",serif;
 	mso-hansi-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
@@ -673,7 +714,7 @@ p.a2, li.a2, div.a2
 	font-size:13.0pt;
 	mso-bidi-font-size:11.0pt;
 	font-family:$bodyfont;
-	mso-fareast-font-family:$headerfont;
+	mso-fareast-font-family:"SimHei",serif;
 	mso-bidi-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
@@ -698,7 +739,7 @@ p.a3, li.a3, div.a3
 	font-size:12.0pt;
 	mso-bidi-font-size:11.0pt;
 	font-family:$bodyfont;
-	mso-fareast-font-family:$headerfont;
+	mso-fareast-font-family:"SimHei",serif;
 	mso-bidi-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
@@ -722,7 +763,7 @@ p.a4, li.a4, div.a4
 	tab-stops:20.15pt 44.0pt list 54.0pt;
 	font-size:11.0pt;
 	font-family:$bodyfont;
-	mso-fareast-font-family:$headerfont;
+	mso-fareast-font-family:"SimHei",serif;
 	mso-bidi-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
@@ -746,7 +787,7 @@ p.a5, li.a5, div.a5
 	tab-stops:20.15pt list 54.0pt left 62.35pt 68.0pt;
 	font-size:11.0pt;
 	font-family:$bodyfont;
-	mso-fareast-font-family:$headerfont;
+	mso-fareast-font-family:"SimHei",serif;
 	mso-bidi-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
@@ -770,7 +811,7 @@ p.a6, li.a6, div.a6
 	tab-stops:20.15pt 62.35pt 68.0pt list 72.0pt;
 	font-size:11.0pt;
 	font-family:$bodyfont;
-	mso-fareast-font-family:$headerfont;
+	mso-fareast-font-family:"SimHei",serif;
 	mso-bidi-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
@@ -810,7 +851,7 @@ span.BodyTextChar
 	mso-ansi-font-size:11.0pt;
 	mso-bidi-font-size:11.0pt;
 	font-family:$bodyfont;
-	mso-fareast-font-family:$bodyfont;
+	mso-fareast-font-family:"SimSun",serif;
 	mso-ansi-language:EN-GB;}
 p.MsoCommentText, li.MsoCommentText, div.MsoCommentText
 	{mso-style-noshow:yes;
@@ -826,7 +867,7 @@ p.MsoCommentText, li.MsoCommentText, div.MsoCommentText
 	tab-stops:20.15pt;
 	font-size:12.0pt;
 	font-family:$bodyfont;
-	mso-fareast-font-family:$bodyfont;
+	mso-fareast-font-family:"SimSun",serif;
 	mso-bidi-font-family:$bodyfont;
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:EN-US;}
@@ -852,7 +893,7 @@ p.MsoCommentSubject, li.MsoCommentSubject, div.MsoCommentSubject
 	tab-stops:20.15pt;
 	font-size:10.0pt;
 	font-family:$headerfont;
-	mso-fareast-font-family:$headerfont;
+	mso-fareast-font-family:"SimHei",serif;
 	mso-bidi-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:EN-US;
@@ -870,14 +911,14 @@ p.Tablebody, li.Tablebody, div.Tablebody
 	font-size:10.0pt;
 	mso-bidi-font-size:11.0pt;
 	font-family:$bodyfont;
-	mso-fareast-font-family:$bodyfont;
+	mso-fareast-font-family:"SimSun",serif;
 	mso-bidi-font-family:$bodyfont;
 	mso-ansi-language:EN-GB;}
 .MsoChpDefault
 	{mso-style-type:export-only;
 	mso-default-props:yes;
 	mso-ascii-font-family:$bodyfont;
-	mso-fareast-font-family:$bodyfont;
+	mso-fareast-font-family:"SimSun",serif;
 	mso-hansi-font-family:$bodyfont;}
  /* Page Definitions */
 @page