metanorma-iso 1.3.24 → 1.3.25

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -35,6 +35,18 @@ module Asciidoctor
35
35
  xml_section << content
36
36
  end
37
37
  end
38
+
39
+ def section_attributes(node)
40
+ super.merge(
41
+ change: @amd ? node.attr("change") : nil,
42
+ locality: @amd ? node.attr("locality") : nil,
43
+ )
44
+ end
45
+
46
+ def sectiontype(node, level = true)
47
+ return nil if @amd
48
+ super
49
+ end
38
50
  end
39
51
  end
40
52
  end
@@ -24,12 +24,14 @@ module Asciidoctor
24
24
  def isosubgroup_validate(root)
25
25
  root.xpath("//technical-committee/@type").each do |t|
26
26
  unless %w{TC PC JTC JPC}.include? t.text
27
- @log.add("Document Attributes", nil, "invalid technical committee type #{t}")
27
+ @log.add("Document Attributes", nil,
28
+ "invalid technical committee type #{t}")
28
29
  end
29
30
  end
30
31
  root.xpath("//subcommittee/@type").each do |t|
31
32
  unless %w{SC JSC}.include? t.text
32
- @log.add("Document Attributes", nil, "invalid subcommittee type #{t}")
33
+ @log.add("Document Attributes", nil,
34
+ "invalid subcommittee type #{t}")
33
35
  end
34
36
  end
35
37
  end
@@ -39,10 +41,12 @@ module Asciidoctor
39
41
  root.xpath("//xref").each do |t|
40
42
  # does not deal with preceding text marked up
41
43
  preceding = t.at("./preceding-sibling::text()[last()]")
42
- next unless !preceding.nil? && /\b(see| refer to)\s*$/mi.match(preceding)
44
+ next unless !preceding.nil? &&
45
+ /\b(see| refer to)\s*$/mi.match(preceding)
43
46
  (target = root.at("//*[@id = '#{t['target']}']")) || next
44
47
  if target&.at("./ancestor-or-self::*[@obligation = 'normative']")
45
- @log.add("Style", t, "'see #{t['target']}' is pointing to a normative section")
48
+ @log.add("Style", t,
49
+ "'see #{t['target']}' is pointing to a normative section")
46
50
  end
47
51
  end
48
52
  end
@@ -51,13 +55,16 @@ module Asciidoctor
51
55
  def see_erefs_validate(root)
52
56
  root.xpath("//eref").each do |t|
53
57
  preceding = t.at("./preceding-sibling::text()[last()]")
54
- next unless !preceding.nil? && /\b(see|refer to)\s*$/mi.match(preceding)
58
+ next unless !preceding.nil? &&
59
+ /\b(see|refer to)\s*$/mi.match(preceding)
55
60
  unless target = root.at("//*[@id = '#{t['bibitemid']}']")
56
- @log.add("Bibliography", t, "'#{t} is not pointing to a real reference")
61
+ @log.add("Bibliography", t,
62
+ "'#{t} is not pointing to a real reference")
57
63
  next
58
64
  end
59
65
  if target.at("./ancestor::references[@normative = 'true']")
60
- @log.add("Style", t, "'see #{t}' is pointing to a normative reference")
66
+ @log.add("Style", t,
67
+ "'see #{t}' is pointing to a normative reference")
61
68
  end
62
69
  end
63
70
  end
@@ -67,8 +74,9 @@ module Asciidoctor
67
74
  root.xpath("//eref[descendant::locality]").each do |t|
68
75
  if /^(ISO|IEC)/.match t["citeas"]
69
76
  unless /:[ ]?(\d+{4}|–)$/.match t["citeas"]
70
- @log.add("Style", t, "undated reference #{t['citeas']} should not contain "\
71
- "specific elements")
77
+ @log.add("Style", t,
78
+ "undated reference #{t['citeas']} should not contain "\
79
+ "specific elements")
72
80
  end
73
81
  end
74
82
  end
@@ -105,32 +113,37 @@ module Asciidoctor
105
113
  doctype = xmldoc&.at("//bibdata/ext/doctype")&.text
106
114
  %w(international-standard technical-specification technical-report
107
115
  publicly-available-specification international-workshop-agreement
108
- guide).include? doctype or
109
- @log.add("Document Attributes", nil, "#{doctype} is not a recognised document type")
116
+ guide amendment technical-corrigendum).include? doctype or
117
+ @log.add("Document Attributes", nil,
118
+ "#{doctype} is not a recognised document type")
110
119
  end
111
120
 
112
121
  def script_validate(xmldoc)
113
122
  script = xmldoc&.at("//bibdata/script")&.text
114
123
  script == "Latn" or
115
- @log.add("Document Attributes", nil, "#{script} is not a recognised script")
124
+ @log.add("Document Attributes", nil,
125
+ "#{script} is not a recognised script")
116
126
  end
117
127
 
118
128
  def stage_validate(xmldoc)
119
129
  stage = xmldoc&.at("//bibdata/status/stage")&.text
120
130
  %w(00 10 20 30 40 50 60 90 95).include? stage or
121
- @log.add("Document Attributes", nil, "#{stage} is not a recognised stage")
131
+ @log.add("Document Attributes", nil,
132
+ "#{stage} is not a recognised stage")
122
133
  end
123
134
 
124
135
  def substage_validate(xmldoc)
125
136
  substage = xmldoc&.at("//bibdata/status/substage")&.text or return
126
137
  %w(00 20 60 90 92 93 98 99).include? substage or
127
- @log.add("Document Attributes", nil, "#{substage} is not a recognised substage")
138
+ @log.add("Document Attributes", nil,
139
+ "#{substage} is not a recognised substage")
128
140
  end
129
141
 
130
142
  def iteration_validate(xmldoc)
131
143
  iteration = xmldoc&.at("//bibdata/status/iteration")&.text or return
132
144
  /^\d+/.match(iteration) or
133
- @log.add("Document Attributes", nil, "#{iteration} is not a recognised iteration")
145
+ @log.add("Document Attributes", nil,
146
+ "#{iteration} is not a recognised iteration")
134
147
  end
135
148
 
136
149
  def bibdata_validate(doc)
@@ -162,15 +175,23 @@ module Asciidoctor
162
175
  found = true if /^ISO DATE:/.match n.text
163
176
  end
164
177
  found or
165
- @log.add("Style", b, "Reference #{b&.at("./@id")&.text} does not have an "\
166
- "associated footnote indicating unpublished status")
178
+ @log.add("Style", b,
179
+ "Reference #{b&.at("./@id")&.text} does not have an "\
180
+ "associated footnote indicating unpublished status")
167
181
  end
168
182
  end
169
183
 
170
184
  def validate(doc)
171
185
  content_validate(doc)
186
+ doctype = doc&.at("//bibdata/ext/doctype")&.text
187
+ schema = case doctype
188
+ when "amendment", "technical-corrigendum" # @amd
189
+ "isostandard-amd.rng"
190
+ else
191
+ "isostandard.rng"
192
+ end
172
193
  schema_validate(formattedstr_strip(doc.dup),
173
- File.join(File.dirname(__FILE__), "isostandard.rng"))
194
+ File.join(File.dirname(__FILE__), schema))
174
195
  end
175
196
  end
176
197
  end
@@ -9,6 +9,34 @@ module IsoDoc
9
9
  @meta = Metadata.new(lang, script, labels)
10
10
  end
11
11
 
12
+ def convert1(docxml, filename, dir)
13
+ doctype = docxml&.at(ns("//bibdata/ext/doctype"))&.text
14
+ @amd = %w(amendment technical-corrigendum).include? doctype
15
+ if @amd
16
+ @oldsuppressheadingnumbers = @suppressheadingnumbers
17
+ @suppressheadingnumbers = true
18
+ end
19
+ super
20
+ end
21
+
22
+ def annex(isoxml, out)
23
+ @amd and @suppressheadingnumbers = @oldsuppressheadingnumbers
24
+ super
25
+ @amd and @suppressheadingnumbers = true
26
+ end
27
+
28
+ def anchor_names(docxml)
29
+ if @amd
30
+ back_anchor_names(docxml)
31
+ note_anchor_names(docxml.xpath(ns("//annex//table | //annex//figure")))
32
+ note_anchor_names(docxml.xpath(ns("//annex")))
33
+ example_anchor_names(docxml.xpath(ns("//annex")))
34
+ list_anchor_names(docxml.xpath(ns("//annex")))
35
+ else
36
+ super
37
+ end
38
+ end
39
+
12
40
  def implicit_reference(b)
13
41
  b&.at(ns("./docidentifier"))&.text == "IEV"
14
42
  end
@@ -191,12 +219,10 @@ module IsoDoc
191
219
  ""
192
220
  end
193
221
 
194
- def format_ref(ref, prefix, isopub, date, allparts)
195
- ref = ref.sub(/ \(All Parts\)/i, "")
196
- ref = docid_prefix(prefix, ref)
197
- return "[#{ref}]" if /^\d+$/.match(ref) && !prefix &&
198
- !/^\[.*\]$/.match(ref)
199
- ref
222
+ def reference_names(ref)
223
+ super
224
+ @anchors[ref["id"]] = { xref: @anchors[ref["id"]][:xref].
225
+ sub(/ \(All Parts\)/i, "") }
200
226
  end
201
227
 
202
228
  def table_footnote_reference_format(a)
@@ -26,7 +26,14 @@ name="CVP_Secretariat_Loca">Secretariat: {{ secretariat }}

26
26
  {% if doctitlepartlabel %}<span class="partlabel">{{ doctitlepartlabel }}: </span>{% endif %}
27
27
  <span class="part">{{ doctitlepart }}</span>
28
28
  {% endif %}
29
- </div></div>
29
+ </div>
30
+ {% if doctitleamdlabel %}
31
+ <div class="doctitle-part">{{ doctitleamdlabel }}{% if doctitleamd %}: {{ doctitleamd }}{% endif %}</div>
32
+ {% endif %}
33
+ {% if doctitlecorrlabel %}
34
+ <div class="doctitle-part">{{ doctitlecorrlabel }}</div>
35
+ {% endif %}
36
+ </div>
30
37
 
31
38
  <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>
32
39
  {% if docsubtitlepart %}
@@ -34,7 +41,14 @@ name="CVP_Secretariat_Loca">Secretariat: {{ secretariat }}

34
41
  {% if docsubtitlepartlabel %}<span class="partlabel">{{ docsubtitlepartlabel }}: </span>{% endif %}
35
42
  <span class="part">{{ docsubtitlepart }}</span>
36
43
  {% endif %}
37
- </div></div>
44
+ </div>
45
+ {% if docsubtitleamdlabel %}
46
+ <div>{{ docsubtitleamdlabel }}{% if docsubtitleamd %}: {{ docsubtitleamd }}{% endif %}</div>
47
+ {% endif %}
48
+ {% if docsubtitlecorrlabel %}
49
+ <div>{{ docsubtitlecorrlabel }}</div>
50
+ {% endif %}
51
+ </div>
38
52
 
39
53
  <div class="coverpage_docstage">
40
54
  {% if unpublished %}
@@ -45,19 +59,5 @@ name="CVP_Secretariat_Loca">Secretariat: {{ secretariat }}

45
59
  {% if unpublished %}
46
60
  <div class="coverpage_warning">
47
61
  <div id="boilerplate-license-destination"/>
48
- <!--
49
- <p>Warning for WDs
50
- and CDs</p>
51
-
52
- <p>This
53
- document is not an ISO International Standard. It is distributed for review and
54
- comment. It is subject to change without notice and may not be referred to as
55
- an International Standard.</p>
56
-
57
- <p>Recipients
58
- of this draft are invited to submit, with their comments, notification of any
59
- relevant patent rights of which they are aware and to provide supporting
60
- documentation.</p>
61
- -->
62
62
  </div>
63
63
  {% endif %}
@@ -158,3 +158,21 @@ $('#toggle').on('click', function(){
158
158
  $("[rel=footnote]").inlineFootnote();
159
159
  });
160
160
  </script>
161
+ <script>
162
+ // @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt Expat
163
+ //
164
+ // AnchorJS - v4.2.2 - 2020-04-20
165
+ // https://www.bryanbraun.com/anchorjs/
166
+ // Copyright (c) 2020 Bryan Braun; Licensed MIT
167
+ //
168
+ // @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt Expat
169
+ !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}}});
170
+ // @license-end
171
+ </script>
172
+ <script>
173
+ anchors.options = {
174
+ placement: 'left'
175
+ };
176
+ anchors.add('h1, h2, h3, h4');
177
+ </script>
178
+
@@ -7,6 +7,7 @@
7
7
  License: none (public domain)
8
8
  */
9
9
 
10
+
10
11
  @import 'base_style/all';
11
12
 
12
13
  body {
@@ -174,6 +175,21 @@ h6 {
174
175
  line-height: 1.2;
175
176
  }
176
177
 
178
+ /* override for amendments */
179
+
180
+ {% if doctype == "amendment" or doctype == "technical-corrigendum" %}
181
+
182
+ h1, h2, h3, h4, h5, h6 {
183
+ font-weight: normal;
184
+ font-size: initial;
185
+ font-style: italic;
186
+ line-height: 2em;
187
+ margin-top: 2em;
188
+ margin-bottom: 1em;
189
+ }
190
+
191
+ {% endif %}
192
+
177
193
  h2 p {
178
194
  display: inline;
179
195
  }
@@ -130,6 +130,17 @@ h1, h2, h3, h4, h5, h6 {
130
130
  line-height: 1.2;
131
131
  }
132
132
 
133
+ {% if doctype == "amendment" or doctype == "technical-corrigendum" %}
134
+
135
+ h1, h2, h3, h4, h5, h6 {
136
+ font-weight: normal;
137
+ font-size: initial;
138
+ font-style: italic;
139
+ }
140
+
141
+ {% endif %}
142
+
143
+
133
144
  p {
134
145
  margin-top: 1em;
135
146
  margin-bottom: 1em;
@@ -18,6 +18,14 @@ style='mso-bidi-font-weight:normal'>
18
18
  <p class="MsoNormal" align="right" style='text-align:right'><span lang="EN-GB" style='mso-no-proof:yes'>{{ docnumber_lang }} {{ draftinfo }}</span></p>
19
19
  {% endif %}
20
20
 
21
+ {% if doctitleamdlabel %}
22
+ <p class="MsoNormal" align="right" style='text-align:right'><b>{{ doctitleamdlabel }}</b></p>
23
+ {% endif %}
24
+
25
+ {% if doctitlecorrlabel %}
26
+ <p class="MsoNormal" align="right" style='text-align:right'><b>{{ doctitlecorrlabel }}</b></p>
27
+ {% endif %}
28
+
21
29
  <p class="MsoNormal" align="right" style='text-align:right'><span lang="EN-GB"
22
30
  style='mso-no-proof:yes'>{{ agency }}/{{ editorialgroup | join: "/" }}</span></p>
23
31
 
@@ -31,6 +39,13 @@ style='mso-no-proof:yes'>{{ agency }}/{{ editorialgroup | join: "/" }}
31
39
  <span class="part"><b>{{ doctitlepart }}</b></span>
32
40
  {% endif %}
33
41
  </p>
42
+ {% if doctitleamdlabel %}
43
+ <p class="MsoNormal">{{ doctitleamdlabel }}{% if doctitleamd %}: {{ doctitleamd }}{% endif %}</p>
44
+ {% endif %}
45
+ {% if doctitlecorrlabel %}
46
+ <p class="MsoNormal">{{ doctitlecorrlabel }}</p>
47
+ {% endif %}
48
+
34
49
 
35
50
  <br/>
36
51
  <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: "/" }}
41
56
  <span class="part">{{ docsubtitlepart }}</span>
42
57
  {% endif %}
43
58
  </p>
59
+ {% if docsubtitleamdlabel %}
60
+ <p class="MsoNormal">{{ docsubtitleamdlabel }}{% if docsubtitleamd %}: {{ docsubtitleamd }}{% endif %}</p>
61
+ {% endif %}
62
+ {% if docsubtitlecorrlabel %}
63
+ <p class="MsoNormal">{{ docsubtitlecorrlabel }}</p>
64
+ {% endif %}
44
65
 
45
66
 
46
67
 
@@ -184,7 +184,12 @@ h1
184
184
  mso-list:l1 level1 lfo6;
185
185
  mso-hyphenate:none;
186
186
  tab-stops:20.0pt list 21.6pt left 28.0pt;
187
- font-size:13.0pt;
187
+ {% if doctype == "amendment" or doctype == "technical-corrigendum" %}
188
+ font-style: italic ;
189
+ font-size:11.0pt;
190
+ {% else %}
191
+ font-size:13.0pt;
192
+ {% endif %}
188
193
  mso-bidi-font-size:11.0pt;
189
194
  font-family:$headerfont;
190
195
  mso-fareast-font-family:"SimHei",serif;
@@ -238,8 +243,13 @@ h1.Annex
238
243
  mso-outline-level:2;
239
244
  mso-hyphenate:none;
240
245
  tab-stops:27.0pt 35.0pt;
241
- font-size:12.0pt;
246
+ {% if doctype == "amendment" or doctype == "technical-corrigendum" %}
247
+ font-style: italic ;
248
+ font-size:11.0pt;
249
+ {% else %}
250
+ font-size:13.0pt;
242
251
  font-weight:bold;
252
+ {% endif %}
243
253
  mso-bidi-font-size:11.0pt;
244
254
  font-family:$headerfont;
245
255
  mso-fareast-font-family:"SimHei",serif;
@@ -266,9 +276,14 @@ h2
266
276
  mso-outline-level:3;
267
277
  mso-hyphenate:none;
268
278
  tab-stops:list 36.0pt left 44.0pt;
269
- font-size:11.0pt;
270
- font-family:$headerfont;
279
+ {% if doctype == "amendment" or doctype == "technical-corrigendum" %}
280
+ font-style: italic ;
281
+ font-size:11.0pt;
282
+ {% else %}
283
+ font-size:13.0pt;
271
284
  font-weight:bold;
285
+ {% endif %}
286
+ font-family:$headerfont;
272
287
  mso-fareast-font-family:"SimHei",serif;
273
288
  mso-ansi-language:EN-GB;
274
289
  mso-fareast-language:JA;
@@ -294,7 +309,11 @@ h3 {mso-list:l1 level3 lfo6;}
294
309
  tab-stops:51.05pt 57.0pt 68.0pt;
295
310
  font-size:11.0pt;
296
311
  font-family:$headerfont;
312
+ {% if doctype == "amendment" or doctype == "technical-corrigendum" %}
313
+ font-style: italic ;
314
+ {% else %}
297
315
  font-weight:bold;
316
+ {% endif %}
298
317
  mso-fareast-font-family:"SimHei",serif;
299
318
  mso-ansi-language:EN-GB;
300
319
  mso-fareast-language:JA;
@@ -320,7 +339,11 @@ h4 {mso-list:l1 level4 lfo6;}
320
339
  tab-stops:51.05pt list 54.0pt;
321
340
  font-size:11.0pt;
322
341
  font-family:$headerfont;
342
+ {% if doctype == "amendment" or doctype == "technical-corrigendum" %}
343
+ font-style: italic ;
344
+ {% else %}
323
345
  font-weight:bold;
346
+ {% endif %}
324
347
  mso-fareast-font-family:"SimHei",serif;
325
348
  mso-ansi-language:EN-GB;
326
349
  mso-fareast-language:JA;
@@ -346,7 +369,11 @@ h6
346
369
  tab-stops:51.05pt list 72.0pt;
347
370
  font-size:11.0pt;
348
371
  font-family:$headerfont;
372
+ {% if doctype == "amendment" or doctype == "technical-corrigendum" %}
373
+ font-style: italic ;
374
+ {% else %}
349
375
  font-weight:bold;
376
+ {% endif %}
350
377
  mso-fareast-font-family:"SimHei",serif;
351
378
  mso-ansi-language:EN-GB;
352
379
  mso-fareast-language:JA;