metanorma-iso 1.3.24 → 1.3.25

data/lib/asciidoctor/iso/section.rb

@@ -35,6 +35,18 @@ module Asciidoctor
           xml_section << content
         end
       end
+
+      def section_attributes(node)
+        super.merge(
+          change: @amd ? node.attr("change") : nil,
+          locality: @amd ? node.attr("locality") : nil,
+        )
+      end
+
+      def sectiontype(node, level = true)
+        return nil if @amd
+        super
+      end
     end
   end
 end

data/lib/asciidoctor/iso/validate.rb

@@ -24,12 +24,14 @@ module Asciidoctor
       def isosubgroup_validate(root)
         root.xpath("//technical-committee/@type").each do |t|
           unless %w{TC PC JTC JPC}.include? t.text
-            @log.add("Document Attributes", nil, "invalid technical committee type #{t}")
+            @log.add("Document Attributes", nil,
+                     "invalid technical committee type #{t}")
           end
         end
         root.xpath("//subcommittee/@type").each do |t|
           unless %w{SC JSC}.include? t.text
-            @log.add("Document Attributes", nil, "invalid subcommittee type #{t}")
+            @log.add("Document Attributes", nil,
+                     "invalid subcommittee type #{t}")
           end
         end
       end
@@ -39,10 +41,12 @@ module Asciidoctor
         root.xpath("//xref").each do |t|
           # does not deal with preceding text marked up
           preceding = t.at("./preceding-sibling::text()[last()]")
-          next unless !preceding.nil? && /\b(see| refer to)\s*$/mi.match(preceding)
+          next unless !preceding.nil? &&
+            /\b(see| refer to)\s*$/mi.match(preceding)
           (target = root.at("//*[@id = '#{t['target']}']")) || next
           if target&.at("./ancestor-or-self::*[@obligation = 'normative']")
-            @log.add("Style", t, "'see #{t['target']}' is pointing to a normative section")
+            @log.add("Style", t,
+                     "'see #{t['target']}' is pointing to a normative section")
           end
         end
       end
@@ -51,13 +55,16 @@ module Asciidoctor
       def see_erefs_validate(root)
         root.xpath("//eref").each do |t|
           preceding = t.at("./preceding-sibling::text()[last()]")
-          next unless !preceding.nil? && /\b(see|refer to)\s*$/mi.match(preceding)
+          next unless !preceding.nil? &&
+            /\b(see|refer to)\s*$/mi.match(preceding)
           unless target = root.at("//*[@id = '#{t['bibitemid']}']")
-            @log.add("Bibliography", t, "'#{t} is not pointing to a real reference")
+            @log.add("Bibliography", t,
+                     "'#{t} is not pointing to a real reference")
             next
           end
           if target.at("./ancestor::references[@normative = 'true']")
-            @log.add("Style", t, "'see #{t}' is pointing to a normative reference")
+            @log.add("Style", t,
+                     "'see #{t}' is pointing to a normative reference")
           end
         end
       end
@@ -67,8 +74,9 @@ module Asciidoctor
         root.xpath("//eref[descendant::locality]").each do |t|
           if /^(ISO|IEC)/.match t["citeas"]
             unless /:[ ]?(\d+{4}|–)$/.match t["citeas"]
-              @log.add("Style", t, "undated reference #{t['citeas']} should not contain "\
-                "specific elements")
+              @log.add("Style", t,
+                       "undated reference #{t['citeas']} should not contain "\
+                       "specific elements")
             end
           end
         end
@@ -105,32 +113,37 @@ module Asciidoctor
         doctype = xmldoc&.at("//bibdata/ext/doctype")&.text
         %w(international-standard technical-specification technical-report 
         publicly-available-specification international-workshop-agreement 
-        guide).include? doctype or
-        @log.add("Document Attributes", nil, "#{doctype} is not a recognised document type")
+        guide amendment technical-corrigendum).include? doctype or
+        @log.add("Document Attributes", nil,
+                 "#{doctype} is not a recognised document type")
       end
 
       def script_validate(xmldoc)
         script = xmldoc&.at("//bibdata/script")&.text
         script == "Latn" or
-          @log.add("Document Attributes", nil, "#{script} is not a recognised script")
+          @log.add("Document Attributes", nil,
+                   "#{script} is not a recognised script")
       end
 
       def stage_validate(xmldoc)
         stage = xmldoc&.at("//bibdata/status/stage")&.text
         %w(00 10 20 30 40 50 60 90 95).include? stage or
-          @log.add("Document Attributes", nil, "#{stage} is not a recognised stage")
+          @log.add("Document Attributes", nil,
+                   "#{stage} is not a recognised stage")
       end
 
       def substage_validate(xmldoc)
         substage = xmldoc&.at("//bibdata/status/substage")&.text or return
         %w(00 20 60 90 92 93 98 99).include? substage or
-          @log.add("Document Attributes", nil, "#{substage} is not a recognised substage")
+          @log.add("Document Attributes", nil,
+                   "#{substage} is not a recognised substage")
       end
 
       def iteration_validate(xmldoc)
         iteration = xmldoc&.at("//bibdata/status/iteration")&.text or return
         /^\d+/.match(iteration) or
-          @log.add("Document Attributes", nil, "#{iteration} is not a recognised iteration")
+          @log.add("Document Attributes", nil,
+                   "#{iteration} is not a recognised iteration")
       end
 
       def bibdata_validate(doc)
@@ -162,15 +175,23 @@ module Asciidoctor
             found = true if /^ISO DATE:/.match n.text
           end
           found or
-            @log.add("Style", b, "Reference #{b&.at("./@id")&.text} does not have an "\
-          "associated footnote indicating unpublished status")
+            @log.add("Style", b,
+                     "Reference #{b&.at("./@id")&.text} does not have an "\
+                     "associated footnote indicating unpublished status")
         end
       end
 
       def validate(doc)
         content_validate(doc)
+        doctype = doc&.at("//bibdata/ext/doctype")&.text
+        schema = case doctype
+                 when "amendment", "technical-corrigendum" # @amd
+                   "isostandard-amd.rng"
+                 else
+                   "isostandard.rng"
+                 end
         schema_validate(formattedstr_strip(doc.dup),
-                        File.join(File.dirname(__FILE__), "isostandard.rng"))
+                        File.join(File.dirname(__FILE__), schema))
       end
     end
   end

data/lib/isodoc/iso/base_convert.rb

@@ -9,6 +9,34 @@ module IsoDoc
         @meta = Metadata.new(lang, script, labels)
       end
 
+      def convert1(docxml, filename, dir)
+        doctype = docxml&.at(ns("//bibdata/ext/doctype"))&.text
+        @amd = %w(amendment technical-corrigendum).include? doctype
+        if @amd
+          @oldsuppressheadingnumbers = @suppressheadingnumbers
+          @suppressheadingnumbers = true
+        end
+        super
+      end
+
+      def annex(isoxml, out)
+        @amd and @suppressheadingnumbers = @oldsuppressheadingnumbers
+        super
+        @amd and @suppressheadingnumbers = true
+      end
+
+      def anchor_names(docxml)
+        if @amd
+          back_anchor_names(docxml)
+          note_anchor_names(docxml.xpath(ns("//annex//table | //annex//figure")))
+          note_anchor_names(docxml.xpath(ns("//annex")))
+          example_anchor_names(docxml.xpath(ns("//annex")))
+          list_anchor_names(docxml.xpath(ns("//annex")))
+        else
+          super
+        end
+      end
+
       def implicit_reference(b)
         b&.at(ns("./docidentifier"))&.text == "IEV"
       end
@@ -191,12 +219,10 @@ module IsoDoc
         ""
       end
 
-      def format_ref(ref, prefix, isopub, date, allparts)
-        ref = ref.sub(/ \(All Parts\)/i, "")
-        ref = docid_prefix(prefix, ref)
-        return "[#{ref}]" if /^\d+$/.match(ref) && !prefix &&
-          !/^\[.*\]$/.match(ref)
-          ref
+      def reference_names(ref)
+        super
+        @anchors[ref["id"]] = { xref: @anchors[ref["id"]][:xref].
+                                sub(/ \(All Parts\)/i, "") }
       end
 
       def table_footnote_reference_format(a)

data/lib/isodoc/iso/html/html_iso_titlepage.html

@@ -26,7 +26,14 @@ name="CVP_Secretariat_Loca">Secretariat: {{ secretariat }}
   {% if doctitlepartlabel %}<span class="partlabel">{{ doctitlepartlabel }}: </span>{% endif %}
   <span class="part">{{ doctitlepart }}</span>
   {% endif %}
-</div></div>
+</div>
+{% if doctitleamdlabel %}
+<div class="doctitle-part">{{ doctitleamdlabel }}{% if doctitleamd %}: {{ doctitleamd }}{% endif %}</div>
+{% endif %}
+{% if doctitlecorrlabel %}
+<div class="doctitle-part">{{ doctitlecorrlabel }}</div>
+{% endif %}
+</div>
 
 <div class="doctitle-fr"><div><span class="title">{{ docsubtitleintro }}{% if docsubtitleintro and docsubtitlemain %} &mdash; {% endif %}</span><span class="subtitle">{{ docsubtitlemain }}{% if docsubtitlemain and docsubtitlepart %} &mdash;{% endif %}</span>
   {% if docsubtitlepart %}
@@ -34,7 +41,14 @@ name="CVP_Secretariat_Loca">Secretariat: {{ secretariat }}
   {% if docsubtitlepartlabel %}<span class="partlabel">{{ docsubtitlepartlabel }}: </span>{% endif %}
   <span class="part">{{ docsubtitlepart }}</span>
   {% endif %}
-</div></div>
+</div>
+{% if docsubtitleamdlabel %}
+<div>{{ docsubtitleamdlabel }}{% if docsubtitleamd %}: {{ docsubtitleamd }}{% endif %}</div>
+{% endif %}
+{% if docsubtitlecorrlabel %}
+<div>{{ docsubtitlecorrlabel }}</div>
+{% endif %}
+</div>
 
 <div class="coverpage_docstage">
   {% if unpublished %}
@@ -45,19 +59,5 @@ name="CVP_Secretariat_Loca">Secretariat: {{ secretariat }}
 {% if unpublished %}
 <div class="coverpage_warning">
   <div id="boilerplate-license-destination"/>
-<!--
-<p>Warning for WDs
-and CDs</p>
-
-<p>This
-document is not an ISO International Standard. It is distributed for review and
-comment. It is subject to change without notice and may not be referred to as
-an International Standard.</p>
-
-<p>Recipients
-of this draft are invited to submit, with their comments, notification of any
-relevant patent rights of which they are aware and to provide supporting
-documentation.</p>
--->
 </div>
 {% endif %}

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

@@ -158,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;
 }

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;

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

@@ -18,6 +18,14 @@ style='mso-bidi-font-weight:normal'>
 <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"
 style='mso-no-proof:yes'>{{ agency }}/{{ editorialgroup | join: "/" }}</span></p>
 
@@ -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">{{ doctitleamdlabel }}{% if doctitleamd %}: {{ doctitleamd }}{% endif %}</p>
+{% endif %}
+{% if doctitlecorrlabel %}
+<p class="MsoNormal">{{ 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">{{ docsubtitleamdlabel }}{% if docsubtitleamd %}: {{ docsubtitleamd }}{% endif %}</p>
+{% endif %}
+{% if docsubtitlecorrlabel %}
+<p class="MsoNormal">{{ docsubtitlecorrlabel }}</p>
+{% endif %}
 
 
 

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

@@ -184,7 +184,12 @@ 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;
+        {% else %}
+        font-size:13.0pt;
+        {% endif %}
 	mso-bidi-font-size:11.0pt;
 	font-family:$headerfont;
 	mso-fareast-font-family:"SimHei",serif;
@@ -238,8 +243,13 @@ 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;
+        {% else %}
+        font-size:13.0pt;
         font-weight:bold;
+        {% endif %}
         mso-bidi-font-size:11.0pt;
         font-family:$headerfont;
         mso-fareast-font-family:"SimHei",serif;
@@ -266,9 +276,14 @@ 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;
+        {% else %}
+        font-size:13.0pt;
         font-weight:bold;
+        {% endif %}
+	font-family:$headerfont;
 	mso-fareast-font-family:"SimHei",serif;
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
@@ -294,7 +309,11 @@ 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 ;
+        {% else %}
         font-weight:bold;
+        {% endif %}
 	mso-fareast-font-family:"SimHei",serif;
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
@@ -320,7 +339,11 @@ 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 ;
+        {% else %}
         font-weight:bold;
+        {% endif %}
 	mso-fareast-font-family:"SimHei",serif;
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
@@ -346,7 +369,11 @@ 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 ;
+        {% else %}
         font-weight:bold;
+        {% endif %}
 	mso-fareast-font-family:"SimHei",serif;
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;