metanorma-iso 1.3.21 → 1.3.26

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.
Files changed (64) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/macos.yml +8 -7
  3. data/.github/workflows/ubuntu.yml +8 -7
  4. data/.github/workflows/windows.yml +8 -8
  5. data/Gemfile +2 -0
  6. data/lib/asciidoctor/iso/base.rb +22 -0
  7. data/lib/asciidoctor/iso/biblio.rng +142 -37
  8. data/lib/asciidoctor/iso/cleanup.rb +19 -2
  9. data/lib/asciidoctor/iso/front.rb +19 -72
  10. data/lib/asciidoctor/iso/front_id.rb +196 -0
  11. data/lib/asciidoctor/iso/isodoc.rng +48 -2
  12. data/lib/asciidoctor/iso/isostandard-amd.rng +98 -0
  13. data/lib/asciidoctor/iso/isostandard.rng +17 -1
  14. data/lib/asciidoctor/iso/macros.rb +21 -0
  15. data/lib/asciidoctor/iso/section.rb +18 -32
  16. data/lib/asciidoctor/iso/term_lookup_cleanup.rb +87 -0
  17. data/lib/asciidoctor/iso/validate.rb +41 -21
  18. data/lib/asciidoctor/iso/validate_requirements.rb +1 -1
  19. data/lib/asciidoctor/iso/validate_section.rb +2 -2
  20. data/lib/asciidoctor/iso/validate_style.rb +7 -6
  21. data/lib/isodoc/iso/base_convert.rb +48 -64
  22. data/lib/isodoc/iso/html/header.html +10 -6
  23. data/lib/isodoc/iso/html/html_iso_titlepage.html +27 -18
  24. data/lib/isodoc/iso/html/isodoc.scss +49 -28
  25. data/lib/isodoc/iso/html/scripts.html +23 -21
  26. data/lib/isodoc/iso/html/style-human.scss +25 -2
  27. data/lib/isodoc/iso/html/style-iso.scss +20 -2
  28. data/lib/isodoc/iso/html/word_iso_titlepage.html +23 -2
  29. data/lib/isodoc/iso/html/wordstyle.scss +80 -39
  30. data/lib/isodoc/iso/html_convert.rb +7 -9
  31. data/lib/isodoc/iso/iso.amendment.xsl +4597 -0
  32. data/lib/isodoc/iso/iso.international-standard.xsl +4597 -0
  33. data/lib/isodoc/iso/metadata.rb +74 -44
  34. data/lib/isodoc/iso/pdf_convert.rb +39 -0
  35. data/lib/isodoc/iso/sections.rb +66 -0
  36. data/lib/isodoc/iso/sts_convert.rb +29 -0
  37. data/lib/metanorma-iso.rb +2 -0
  38. data/lib/metanorma/iso/processor.rb +16 -1
  39. data/lib/metanorma/iso/version.rb +1 -1
  40. data/metanorma-iso.gemspec +4 -1
  41. data/spec/asciidoctor-iso/amd_spec.rb +726 -0
  42. data/spec/asciidoctor-iso/base_spec.rb +43 -21
  43. data/spec/asciidoctor-iso/blocks_spec.rb +21 -9
  44. data/spec/asciidoctor-iso/cleanup_spec.rb +203 -175
  45. data/spec/asciidoctor-iso/inline_spec.rb +2 -1
  46. data/spec/asciidoctor-iso/macros_spec.rb +275 -0
  47. data/spec/asciidoctor-iso/refs_spec.rb +7 -4
  48. data/spec/asciidoctor-iso/section_spec.rb +8 -8
  49. data/spec/assets/iso.xml +64 -1
  50. data/spec/isodoc/amd_spec.rb +606 -0
  51. data/spec/isodoc/i18n_spec.rb +12 -20
  52. data/spec/isodoc/inline_spec.rb +2 -2
  53. data/spec/isodoc/iso_spec.rb +1 -1
  54. data/spec/isodoc/metadata_spec.rb +12 -4
  55. data/spec/isodoc/postproc_spec.rb +20 -119
  56. data/spec/isodoc/ref_spec.rb +5 -5
  57. data/spec/isodoc/section_spec.rb +36 -13
  58. data/spec/isodoc/table_spec.rb +22 -22
  59. data/spec/isodoc/terms_spec.rb +2 -2
  60. data/spec/isodoc/xref_spec.rb +19 -19
  61. data/spec/metanorma/processor_spec.rb +2 -2
  62. data/spec/spec_helper.rb +13 -1
  63. metadata +57 -5
  64. data/asciidoctor-iso.gemspec.old +0 -50
@@ -1,24 +1,8 @@
1
- <script>
2
- //TOC generation
3
- $('#toc').toc({
4
- //'selectors': 'h1,h2:not(.TermNum)', //elements to use as headings
5
- 'selectors': toclevel(), //elements to use as headings
6
- 'container': 'main', //element to find all selectors in
7
- 'smoothScrolling': true, //enable or disable smooth scrolling on click
8
- 'prefix': 'toc', //prefix for anchor tags and class names
9
- 'onHighlight': function(el) {}, //called when a new section is highlighted
10
- 'highlightOnScroll': true, //add class to heading that is currently in focus
11
- 'highlightOffset': 100, //offset to trigger the next headline
12
- 'anchorName': function(i, heading, prefix) { //custom function for anchor name
13
- return prefix+i;
14
- },
15
- 'headerText': function(i, heading, $heading) { //custom function building the header-item text
16
- return $heading.text();
17
- },
18
- 'itemClass': function(i, heading, $heading, prefix) { // custom function for item class
19
- return $heading[0].tagName.toLowerCase();
20
- }
21
- });
1
+ <script>
2
+ $("#toc").on('click', 'li', function(e) {
3
+ $(this).parent().find('li.toc-active').removeClass('toc-active');
4
+ $(this).addClass('toc-active');
5
+ });
22
6
  </script>
23
7
 
24
8
  <script>
@@ -174,3 +158,21 @@ $('#toggle').on('click', function(){
174
158
  $("[rel=footnote]").inlineFootnote();
175
159
  });
176
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
  }
@@ -189,6 +205,10 @@ p.zzSTDTitle1 {
189
205
  font-size: 1.5em;
190
206
  }
191
207
 
208
+ p.zzSTDTitle2 {
209
+ font-size: 1.5em;
210
+ }
211
+
192
212
  span.obligation {
193
213
  font-weight: 400;
194
214
  }
@@ -317,14 +337,17 @@ div.figure {
317
337
  */
318
338
 
319
339
  .document-type-band {
320
- @include docBand(2, 100%, 180px);
340
+ @include docBand($order: 2, $offset: 180px);
341
+
342
+ .document-type {
343
+ top: 20px;
344
+ }
321
345
  }
322
346
 
323
347
  .document-stage-band {
324
348
  @include docBand(1, 100%);
325
349
  }
326
350
 
327
- p.document-type,
328
351
  p.document-stage {
329
352
  @include docBandTitle(210px);
330
353
  writing-mode: vertical-rl;
@@ -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;
@@ -140,6 +151,10 @@ p.zzSTDTitle1 {
140
151
  font-size: 1.5em;
141
152
  }
142
153
 
154
+ p.zzSTDTitle2 {
155
+ font-size: 1.5em;
156
+ }
157
+
143
158
  span.obligation {
144
159
  font-weight: 400;
145
160
  }
@@ -263,14 +278,17 @@ div.figure {
263
278
  */
264
279
 
265
280
  .document-type-band {
266
- @include docBand(2, 100%, 180px);
281
+ @include docBand($order: 2, $offset: 180px);
282
+
283
+ .document-type {
284
+ top: 20px;
285
+ }
267
286
  }
268
287
 
269
288
  .document-stage-band {
270
289
  @include docBand(1, 100%);
271
290
  }
272
291
 
273
- p.document-type,
274
292
  p.document-stage {
275
293
  @include docBandTitle(210px);
276
294
  writing-mode: vertical-rl;
@@ -6,7 +6,7 @@ style='mso-bidi-font-weight:normal'>
6
6
  {% endfor %}
7
7
  {% else %}
8
8
  <p class="MsoNormal" align="right" style='text-align:right'><b style='mso-bidi-font-weight:
9
- normal'><span lang="EN-GB" style='font-size:14.0pt;mso-no-proof:yes'>{{ docnumber }}(E) {{ draftinfo }}</span></b><b
9
+ normal'><span lang="EN-GB" style='font-size:14.0pt;mso-no-proof:yes'>{{ docnumber_lang }} {{ draftinfo }}</span></b><b
10
10
  style='mso-bidi-font-weight:normal'><span lang="EN-GB" style='font-size:14.0pt'><o:p></o:p></span></b></p>
11
11
  {% endif %}
12
12
 
@@ -15,7 +15,15 @@ style='mso-bidi-font-weight:normal'>
15
15
  {% endif %}
16
16
 
17
17
  {% if tc_docnumber.size > 0 %}
18
- <p class="MsoNormal" align="right" style='text-align:right'><span lang="EN-GB" style='mso-no-proof:yes'>{{ docnumber }}(E) {{ draftinfo }}</span></p>
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
+ {% endif %}
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>
19
27
  {% endif %}
20
28
 
21
29
  <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: "/" }}
31
39
  <span class="part"><b>{{ doctitlepart }}</b></span>
32
40
  {% endif %}
33
41
  </p>
42
+ {% if doctitleamdlabel %}
43
+ <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>
44
+ {% endif %}
45
+ {% if doctitlecorrlabel %}
46
+ <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>
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" 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>
61
+ {% endif %}
62
+ {% if docsubtitlecorrlabel %}
63
+ <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>
64
+ {% endif %}
44
65
 
45
66
 
46
67
 
@@ -63,7 +63,7 @@ p.MsoNormal, li.MsoNormal, div.MsoNormal
63
63
  tab-stops:20.15pt;
64
64
  font-size:11.0pt;
65
65
  font-family:$bodyfont;
66
- mso-fareast-font-family:$bodyfont;
66
+ mso-fareast-font-family:"SimSun",serif;
67
67
  mso-bidi-font-family:$bodyfont;
68
68
  mso-ansi-language:EN-GB;}
69
69
  p.MsoNormalIndent, li.MsoNormalIndent, div.MsoNormalIndent
@@ -78,7 +78,7 @@ p.MsoNormalIndent, li.MsoNormalIndent, div.MsoNormalIndent
78
78
  tab-stops:20.15pt;
79
79
  font-size:11.0pt;
80
80
  font-family:$bodyfont;
81
- mso-fareast-font-family:$bodyfont;
81
+ mso-fareast-font-family:"SimSun",serif;
82
82
  mso-bidi-font-family:$bodyfont;
83
83
  mso-ansi-language:EN-GB;}
84
84
  p.MsoBlockText, li.MsoBlockText, div.MsoBlockText
@@ -98,7 +98,7 @@ p.MsoBlockText, li.MsoBlockText, div.MsoBlockText
98
98
  font-family:$bodyfont;
99
99
  mso-ascii-font-family:$bodyfont;
100
100
  mso-ascii-theme-font:minor-latin;
101
- mso-fareast-font-family:$bodyfont;
101
+ mso-fareast-font-family:"SimSun",serif;
102
102
  mso-fareast-theme-font:minor-fareast;
103
103
  mso-hansi-font-family:$bodyfont;
104
104
  mso-hansi-theme-font:minor-latin;
@@ -184,14 +184,25 @@ 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
+ font-weight: normal ;
191
+ {% else %}
192
+ font-size:13.0pt;
193
+ {% endif %}
188
194
  mso-bidi-font-size:11.0pt;
189
195
  font-family:$headerfont;
190
- mso-fareast-font-family:$headerfont;
196
+ mso-fareast-font-family:"SimHei",serif;
191
197
  mso-font-kerning:0pt;
192
198
  mso-ansi-language:EN-GB;
193
199
  mso-fareast-language:JA;
194
200
  mso-bidi-font-weight:normal;}
201
+ h1.ForewordTitle {
202
+ font-size:13.0pt;
203
+ font-style: normal ;
204
+ font-weight: bold;
205
+ }
195
206
  h1.Annex
196
207
  {mso-style-priority:1;
197
208
  mso-style-unhide:no;
@@ -215,7 +226,7 @@ h1.Annex
215
226
  font-size:13.0pt;
216
227
  mso-bidi-font-size:11.0pt;
217
228
  font-family:$headerfont;
218
- mso-fareast-font-family:$headerfont;
229
+ mso-fareast-font-family:"SimHei",serif;
219
230
  mso-font-kerning:0pt;
220
231
  mso-ansi-language:EN-GB;
221
232
  mso-fareast-language:JA;
@@ -238,11 +249,17 @@ h1.Annex
238
249
  mso-outline-level:2;
239
250
  mso-hyphenate:none;
240
251
  tab-stops:27.0pt 35.0pt;
241
- font-size:12.0pt;
252
+ {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
253
+ font-style: italic ;
254
+ font-size:11.0pt;
255
+ font-weight: normal ;
256
+ {% else %}
257
+ font-size:13.0pt;
242
258
  font-weight:bold;
259
+ {% endif %}
243
260
  mso-bidi-font-size:11.0pt;
244
261
  font-family:$headerfont;
245
- mso-fareast-font-family:$headerfont;
262
+ mso-fareast-font-family:"SimHei",serif;
246
263
  mso-ansi-language:EN-GB;
247
264
  mso-fareast-language:JA;
248
265
  mso-bidi-font-weight:normal;}
@@ -266,10 +283,16 @@ h2
266
283
  mso-outline-level:3;
267
284
  mso-hyphenate:none;
268
285
  tab-stops:list 36.0pt left 44.0pt;
269
- font-size:11.0pt;
270
- font-family:$headerfont;
286
+ {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
287
+ font-style: italic ;
288
+ font-size:11.0pt;
289
+ font-weight: normal ;
290
+ {% else %}
291
+ font-size:13.0pt;
271
292
  font-weight:bold;
272
- mso-fareast-font-family:$headerfont;
293
+ {% endif %}
294
+ font-family:$headerfont;
295
+ mso-fareast-font-family:"SimHei",serif;
273
296
  mso-ansi-language:EN-GB;
274
297
  mso-fareast-language:JA;
275
298
  mso-bidi-font-weight:normal;}
@@ -294,8 +317,13 @@ h3 {mso-list:l1 level3 lfo6;}
294
317
  tab-stops:51.05pt 57.0pt 68.0pt;
295
318
  font-size:11.0pt;
296
319
  font-family:$headerfont;
320
+ {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
321
+ font-style: italic ;
322
+ font-weight: normal ;
323
+ {% else %}
297
324
  font-weight:bold;
298
- mso-fareast-font-family:$headerfont;
325
+ {% endif %}
326
+ mso-fareast-font-family:"SimHei",serif;
299
327
  mso-ansi-language:EN-GB;
300
328
  mso-fareast-language:JA;
301
329
  mso-bidi-font-weight:normal;}
@@ -320,8 +348,13 @@ h4 {mso-list:l1 level4 lfo6;}
320
348
  tab-stops:51.05pt list 54.0pt;
321
349
  font-size:11.0pt;
322
350
  font-family:$headerfont;
351
+ {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
352
+ font-style: italic ;
353
+ font-weight: normal ;
354
+ {% else %}
323
355
  font-weight:bold;
324
- mso-fareast-font-family:$headerfont;
356
+ {% endif %}
357
+ mso-fareast-font-family:"SimHei",serif;
325
358
  mso-ansi-language:EN-GB;
326
359
  mso-fareast-language:JA;
327
360
  mso-bidi-font-weight:normal;}
@@ -346,8 +379,13 @@ h6
346
379
  tab-stops:51.05pt list 72.0pt;
347
380
  font-size:11.0pt;
348
381
  font-family:$headerfont;
382
+ {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
383
+ font-style: italic ;
384
+ font-weight: normal ;
385
+ {% else %}
349
386
  font-weight:bold;
350
- mso-fareast-font-family:$headerfont;
387
+ {% endif %}
388
+ mso-fareast-font-family:"SimHei",serif;
351
389
  mso-ansi-language:EN-GB;
352
390
  mso-fareast-language:JA;
353
391
  mso-bidi-font-weight:normal;}
@@ -368,7 +406,7 @@ p.MsoToc1, li.MsoToc1, div.MsoToc1
368
406
  tab-stops:20.15pt 36.0pt right dotted 487.6pt;
369
407
  font-size:11.0pt;
370
408
  font-family:$bodyfont;
371
- mso-fareast-font-family:$bodyfont;
409
+ mso-fareast-font-family:"SimHei",serif;
372
410
  mso-bidi-font-family:$bodyfont;
373
411
  mso-ansi-language:EN-GB;
374
412
  font-weight:bold;
@@ -391,7 +429,7 @@ p.MsoToc2, li.MsoToc2, div.MsoToc2
391
429
  tab-stops:20.15pt 36.0pt right dotted 487.6pt;
392
430
  font-size:11.0pt;
393
431
  font-family:$bodyfont;
394
- mso-fareast-font-family:$bodyfont;
432
+ mso-fareast-font-family:"SimSun",serif;
395
433
  mso-bidi-font-family:$bodyfont;
396
434
  mso-ansi-language:EN-GB;
397
435
  font-weight:bold;
@@ -414,7 +452,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3
414
452
  tab-stops:20.15pt 36.0pt right dotted 487.6pt;
415
453
  font-size:11.0pt;
416
454
  font-family:$bodyfont;
417
- mso-fareast-font-family:$bodyfont;
455
+ mso-fareast-font-family:"SimSun",serif;
418
456
  mso-bidi-font-family:$bodyfont;
419
457
  mso-ansi-language:EN-GB;
420
458
  font-weight:bold;
@@ -435,7 +473,7 @@ p.MsoHeader, li.MsoHeader, div.MsoHeader
435
473
  tab-stops:20.15pt;
436
474
  font-size:11.0pt;
437
475
  font-family:$headerfont;
438
- mso-fareast-font-family:$headerfont;
476
+ mso-fareast-font-family:"SimHei",serif;
439
477
  mso-bidi-font-family:$headerfont;
440
478
  mso-ansi-language:EN-GB;
441
479
  font-weight:bold;
@@ -456,7 +494,7 @@ p.MsoHeaderLandscape, li.MsoHeaderLandscape, div.MsoHeaderLandscape
456
494
  tab-stops:20.15pt;
457
495
  font-size:11.0pt;
458
496
  font-family:$headerfont;
459
- mso-fareast-font-family:$headerfont;
497
+ mso-fareast-font-family:"SimHei",serif;
460
498
  mso-bidi-font-family:$headerfont;
461
499
  mso-ansi-language:EN-GB;
462
500
  font-weight:bold;
@@ -477,7 +515,7 @@ p.MsoFooter, li.MsoFooter, div.MsoFooter
477
515
  tab-stops:right 487.6pt;
478
516
  font-size:11.0pt;
479
517
  font-family:$headerfont;
480
- mso-fareast-font-family:$headerfont;
518
+ mso-fareast-font-family:"SimHei",serif;
481
519
  mso-bidi-font-family:$headerfont;
482
520
  mso-ansi-language:EN-GB;}
483
521
  p.MsoFooterLandscape, li.MsoFooterLandscape, div.MsoFooterLandscape
@@ -496,7 +534,7 @@ p.MsoFooterLandscape, li.MsoFooterLandscape, div.MsoFooterLandscape
496
534
  tab-stops:right 734.0pt;
497
535
  font-size:11.0pt;
498
536
  font-family:$headerfont;
499
- mso-fareast-font-family:$headerfont;
537
+ mso-fareast-font-family:"SimHei",serif;
500
538
  mso-bidi-font-family:$headerfont;
501
539
  mso-ansi-language:EN-GB;}
502
540
  span.MsoFootnoteReference
@@ -516,7 +554,7 @@ p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText
516
554
  tab-stops:20.15pt;
517
555
  font-size:10.0pt;
518
556
  font-family:$bodyfont;
519
- mso-fareast-font-family:$bodyfont;
557
+ mso-fareast-font-family:"SimSun",serif;
520
558
  mso-bidi-font-family:$bodyfont;
521
559
  mso-ansi-language:EN-GB;
522
560
  mso-fareast-language:EN-US;}
@@ -534,7 +572,7 @@ p.MsoBodyText, li.MsoBodyText, div.MsoBodyText
534
572
  mso-pagination:widow-orphan;
535
573
  font-size:11.0pt;
536
574
  font-family:$bodyfont;
537
- mso-fareast-font-family:$bodyfont;
575
+ mso-fareast-font-family:"SimSun",serif;
538
576
  mso-bidi-font-family:$bodyfont;
539
577
  mso-ansi-language:EN-GB;}
540
578
  a:link, span.MsoHyperlink
@@ -568,11 +606,14 @@ span.Heading1Char
568
606
  mso-ansi-font-size:13.0pt;
569
607
  font-family:$headerfont;
570
608
  mso-ascii-font-family:Cambria;
571
- mso-fareast-font-family:$headerfont;
609
+ mso-fareast-font-family:"SimHei",serif;
572
610
  mso-hansi-font-family:$headerfont;
573
611
  mso-ansi-language:EN-GB;
574
612
  mso-fareast-language:JA;
613
+ {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
614
+ {% else %}
575
615
  font-weight:bold;
616
+ {% endif %}
576
617
  mso-bidi-font-weight:normal;}
577
618
  span.Heading2Char
578
619
  {mso-style-name:"Heading 2 Char";
@@ -584,7 +625,7 @@ span.Heading2Char
584
625
  mso-ansi-font-size:12.0pt;
585
626
  font-family:$headerfont;
586
627
  mso-ascii-font-family:Cambria;
587
- mso-fareast-font-family:$headerfont;
628
+ mso-fareast-font-family:"SimHei",serif;
588
629
  mso-hansi-font-family:$headerfont;
589
630
  mso-ansi-language:EN-GB;
590
631
  mso-fareast-language:JA;
@@ -600,7 +641,7 @@ span.Heading3Char
600
641
  mso-ansi-font-size:11.0pt;
601
642
  font-family:$headerfont;
602
643
  mso-ascii-font-family:$headerfont;
603
- mso-fareast-font-family:$headerfont;
644
+ mso-fareast-font-family:"SimHei",serif;
604
645
  mso-hansi-font-family:$headerfont;
605
646
  mso-ansi-language:EN-GB;
606
647
  mso-fareast-language:JA;
@@ -616,7 +657,7 @@ span.Heading4Char
616
657
  mso-ansi-font-size:11.0pt;
617
658
  font-family:$headerfont;
618
659
  mso-ascii-font-family:$headerfont;
619
- mso-fareast-font-family:$headerfont;
660
+ mso-fareast-font-family:"SimHei",serif;
620
661
  mso-hansi-font-family:$headerfont;
621
662
  mso-ansi-language:EN-GB;
622
663
  mso-fareast-language:JA;
@@ -632,7 +673,7 @@ span.Heading5Char
632
673
  mso-ansi-font-size:11.0pt;
633
674
  font-family:$headerfont;
634
675
  mso-ascii-font-family:$headerfont;
635
- mso-fareast-font-family:$headerfont;
676
+ mso-fareast-font-family:"SimHei",serif;
636
677
  mso-hansi-font-family:$headerfont;
637
678
  mso-ansi-language:EN-GB;
638
679
  mso-fareast-language:JA;
@@ -648,7 +689,7 @@ span.Heading6Char
648
689
  mso-ansi-font-size:11.0pt;
649
690
  font-family:$headerfont;
650
691
  mso-ascii-font-family:$headerfont;
651
- mso-fareast-font-family:$headerfont;
692
+ mso-fareast-font-family:"SimHei",serif;
652
693
  mso-hansi-font-family:$headerfont;
653
694
  mso-ansi-language:EN-GB;
654
695
  mso-fareast-language:JA;
@@ -673,7 +714,7 @@ p.a2, li.a2, div.a2
673
714
  font-size:13.0pt;
674
715
  mso-bidi-font-size:11.0pt;
675
716
  font-family:$bodyfont;
676
- mso-fareast-font-family:$headerfont;
717
+ mso-fareast-font-family:"SimHei",serif;
677
718
  mso-bidi-font-family:$headerfont;
678
719
  mso-ansi-language:EN-GB;
679
720
  mso-fareast-language:JA;
@@ -698,7 +739,7 @@ p.a3, li.a3, div.a3
698
739
  font-size:12.0pt;
699
740
  mso-bidi-font-size:11.0pt;
700
741
  font-family:$bodyfont;
701
- mso-fareast-font-family:$headerfont;
742
+ mso-fareast-font-family:"SimHei",serif;
702
743
  mso-bidi-font-family:$headerfont;
703
744
  mso-ansi-language:EN-GB;
704
745
  mso-fareast-language:JA;
@@ -722,7 +763,7 @@ p.a4, li.a4, div.a4
722
763
  tab-stops:20.15pt 44.0pt list 54.0pt;
723
764
  font-size:11.0pt;
724
765
  font-family:$bodyfont;
725
- mso-fareast-font-family:$headerfont;
766
+ mso-fareast-font-family:"SimHei",serif;
726
767
  mso-bidi-font-family:$headerfont;
727
768
  mso-ansi-language:EN-GB;
728
769
  mso-fareast-language:JA;
@@ -746,7 +787,7 @@ p.a5, li.a5, div.a5
746
787
  tab-stops:20.15pt list 54.0pt left 62.35pt 68.0pt;
747
788
  font-size:11.0pt;
748
789
  font-family:$bodyfont;
749
- mso-fareast-font-family:$headerfont;
790
+ mso-fareast-font-family:"SimHei",serif;
750
791
  mso-bidi-font-family:$headerfont;
751
792
  mso-ansi-language:EN-GB;
752
793
  mso-fareast-language:JA;
@@ -770,7 +811,7 @@ p.a6, li.a6, div.a6
770
811
  tab-stops:20.15pt 62.35pt 68.0pt list 72.0pt;
771
812
  font-size:11.0pt;
772
813
  font-family:$bodyfont;
773
- mso-fareast-font-family:$headerfont;
814
+ mso-fareast-font-family:"SimHei",serif;
774
815
  mso-bidi-font-family:$headerfont;
775
816
  mso-ansi-language:EN-GB;
776
817
  mso-fareast-language:JA;
@@ -810,7 +851,7 @@ span.BodyTextChar
810
851
  mso-ansi-font-size:11.0pt;
811
852
  mso-bidi-font-size:11.0pt;
812
853
  font-family:$bodyfont;
813
- mso-fareast-font-family:$bodyfont;
854
+ mso-fareast-font-family:"SimSun",serif;
814
855
  mso-ansi-language:EN-GB;}
815
856
  p.MsoCommentText, li.MsoCommentText, div.MsoCommentText
816
857
  {mso-style-noshow:yes;
@@ -826,7 +867,7 @@ p.MsoCommentText, li.MsoCommentText, div.MsoCommentText
826
867
  tab-stops:20.15pt;
827
868
  font-size:12.0pt;
828
869
  font-family:$bodyfont;
829
- mso-fareast-font-family:$bodyfont;
870
+ mso-fareast-font-family:"SimSun",serif;
830
871
  mso-bidi-font-family:$bodyfont;
831
872
  mso-ansi-language:EN-GB;
832
873
  mso-fareast-language:EN-US;}
@@ -852,7 +893,7 @@ p.MsoCommentSubject, li.MsoCommentSubject, div.MsoCommentSubject
852
893
  tab-stops:20.15pt;
853
894
  font-size:10.0pt;
854
895
  font-family:$headerfont;
855
- mso-fareast-font-family:$headerfont;
896
+ mso-fareast-font-family:"SimHei",serif;
856
897
  mso-bidi-font-family:$headerfont;
857
898
  mso-ansi-language:EN-GB;
858
899
  mso-fareast-language:EN-US;
@@ -870,14 +911,14 @@ p.Tablebody, li.Tablebody, div.Tablebody
870
911
  font-size:10.0pt;
871
912
  mso-bidi-font-size:11.0pt;
872
913
  font-family:$bodyfont;
873
- mso-fareast-font-family:$bodyfont;
914
+ mso-fareast-font-family:"SimSun",serif;
874
915
  mso-bidi-font-family:$bodyfont;
875
916
  mso-ansi-language:EN-GB;}
876
917
  .MsoChpDefault
877
918
  {mso-style-type:export-only;
878
919
  mso-default-props:yes;
879
920
  mso-ascii-font-family:$bodyfont;
880
- mso-fareast-font-family:$bodyfont;
921
+ mso-fareast-font-family:"SimSun",serif;
881
922
  mso-hansi-font-family:$bodyfont;}
882
923
  /* Page Definitions */
883
924
  @page