metanorma-iso 1.5.10 → 1.6.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (62) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/rake.yml +66 -0
  3. data/README.adoc +5 -6
  4. data/lib/asciidoctor/iso/base.rb +5 -5
  5. data/lib/asciidoctor/iso/basicdoc.rng +50 -3
  6. data/lib/asciidoctor/iso/boilerplate-fr.xml +40 -0
  7. data/lib/asciidoctor/iso/boilerplate.xml +1 -0
  8. data/lib/asciidoctor/iso/cleanup.rb +38 -6
  9. data/lib/asciidoctor/iso/front.rb +5 -0
  10. data/lib/asciidoctor/iso/isodoc.rng +36 -43
  11. data/lib/asciidoctor/iso/isostandard.rng +11 -0
  12. data/lib/asciidoctor/iso/validate.rb +1 -1
  13. data/lib/asciidoctor/iso/validate_section.rb +9 -0
  14. data/lib/isodoc/iso/base_convert.rb +2 -1
  15. data/lib/isodoc/iso/html/header.html +12 -24
  16. data/lib/isodoc/iso/html/htmlstyle.css +1 -1
  17. data/lib/isodoc/iso/html/htmlstyle.scss +1 -1
  18. data/lib/isodoc/iso/html/isodoc.css +42 -42
  19. data/lib/isodoc/iso/html/isodoc.scss +42 -42
  20. data/lib/isodoc/iso/html/style-human.css +13 -9
  21. data/lib/isodoc/iso/html/style-human.scss +7 -7
  22. data/lib/isodoc/iso/html/style-iso.css +11 -7
  23. data/lib/isodoc/iso/html/style-iso.scss +5 -5
  24. data/lib/isodoc/iso/html/wordstyle.css +67 -67
  25. data/lib/isodoc/iso/html/wordstyle.scss +67 -67
  26. data/lib/isodoc/iso/html_convert.rb +4 -0
  27. data/lib/isodoc/iso/i18n-en.yaml +4 -0
  28. data/lib/isodoc/iso/i18n-fr.yaml +5 -0
  29. data/lib/isodoc/iso/i18n-zh-Hans.yaml +5 -0
  30. data/lib/isodoc/iso/i18n.rb +10 -11
  31. data/lib/isodoc/iso/iso.amendment.xsl +391 -88
  32. data/lib/isodoc/iso/iso.international-standard.xsl +391 -88
  33. data/lib/isodoc/iso/metadata.rb +20 -19
  34. data/lib/isodoc/iso/word_convert.rb +4 -0
  35. data/lib/isodoc/iso/xref.rb +10 -0
  36. data/lib/metanorma/iso/processor.rb +11 -9
  37. data/lib/metanorma/iso/version.rb +1 -1
  38. data/metanorma-iso.gemspec +2 -2
  39. data/spec/asciidoctor-iso/base_spec.rb +26 -14
  40. data/spec/asciidoctor-iso/blocks_spec.rb +1 -1
  41. data/spec/asciidoctor-iso/cleanup_spec.rb +11 -5
  42. data/spec/asciidoctor-iso/lists_spec.rb +6 -6
  43. data/spec/asciidoctor-iso/refs_spec.rb +174 -143
  44. data/spec/asciidoctor-iso/section_spec.rb +5 -0
  45. data/spec/asciidoctor-iso/validate_spec.rb +18 -1
  46. data/spec/isodoc/amd_spec.rb +187 -22
  47. data/spec/isodoc/blocks_spec.rb +1 -0
  48. data/spec/isodoc/i18n_spec.rb +9 -22
  49. data/spec/isodoc/inline_spec.rb +1 -1
  50. data/spec/isodoc/metadata_spec.rb +170 -3
  51. data/spec/isodoc/postproc_spec.rb +2 -5
  52. data/spec/isodoc/ref_spec.rb +4 -7
  53. data/spec/isodoc/section_spec.rb +20 -0
  54. data/spec/isodoc/xref_spec.rb +12 -0
  55. data/spec/spec_helper.rb +17 -1
  56. metadata +8 -12
  57. data/.github/workflows/macos.yml +0 -41
  58. data/.github/workflows/ubuntu.yml +0 -45
  59. data/.github/workflows/windows.yml +0 -43
  60. data/lib/asciidoctor/iso/macros.rb +0 -21
  61. data/lib/asciidoctor/iso/term_lookup_cleanup.rb +0 -86
  62. data/spec/asciidoctor-iso/macros_spec.rb +0 -310
data/lib/isodoc/iso/html/style-iso.css CHANGED
@@ -111,6 +111,10 @@ b, strong {
111
111
  div.document-stage-band, div.document-type-band {
112
112
  background-color: #333333; }
113
113
 
114
+ a.FootnoteRef + a.FootnoteRef:before {
115
+ content: ", ";
116
+ vertical-align: super; }
117
+
114
118
  #standard-band {
115
119
  background-color: #0AC442; }
116
120
 
@@ -485,12 +489,12 @@ nav {
485
489
  pre,
486
490
  .pseudocode {
487
491
  background-color: #f7f7f7;
488
- font-size: 0.8em;
492
+ font-size: {{monospacefontsize}};
489
493
  line-height: 1.6em;
490
494
  padding: 1.5em;
491
495
  margin: 2em 0 1em 0;
492
496
  overflow: auto;
493
- font-size: 1em; }
497
+ font-size: {{normalfontsize}}; }
494
498
  .figure .SourceTitle,
495
499
  pre .SourceTitle,
496
500
  .pseudocode .SourceTitle {
@@ -797,12 +801,12 @@ p.Biblio, p.NormRef {
797
801
  pre,
798
802
  .pseudocode {
799
803
  background-color: #f7f7f7;
800
- font-size: 0.8em;
804
+ font-size: {{monospacefontsize}};
801
805
  line-height: 1.6em;
802
806
  padding: 1.5em;
803
807
  margin: 2em 0 1em 0;
804
808
  overflow: auto;
805
- font-size: 1em; }
809
+ font-size: {{normalfontsize}}; }
806
810
  .figure .SourceTitle,
807
811
  pre .SourceTitle,
808
812
  .pseudocode .SourceTitle {
@@ -916,14 +920,14 @@ a.footnote-number, a.TableFootnoteRef, span.TableFootnoteRef {
916
920
  font-size: 0.8em; }
917
921
 
918
922
  .footnote {
919
- font-size: 0.9em; }
923
+ font-size: {{footnotefontsize}}; }
920
924
 
921
925
  sup a {
922
926
  vertical-align: super;
923
927
  font-size: 0.8em; }
924
928
 
925
929
  #footnote_box {
926
- font-size: 14px;
930
+ font-size: {{footnotefontsize}};
927
931
  background: white;
928
932
  padding: 0 10px;
929
933
  margin: 10px;
@@ -936,7 +940,7 @@ ol.footnotes-list, aside.footnote {
936
940
  margin-left: 1em; }
937
941
 
938
942
  ol.footnotes-list li, aside.footnote {
939
- font-size: 0.9em;
943
+ font-size: {{footnotefontsize}};
940
944
  vertical-align: top;
941
945
  list-style: decimal;
942
946
  margin-bottom: 1em; }
data/lib/isodoc/iso/html/style-iso.scss CHANGED
@@ -266,7 +266,7 @@ nav {
266
266
  pre,
267
267
  .pseudocode {
268
268
  @include pseudocodeBlock(#f7f7f7);
269
- font-size: 1em;
269
+ font-size: $normalfontsize;
270
270
  }
271
271
 
272
272
  div.figure {
@@ -523,7 +523,7 @@ p.Biblio, p.NormRef {
523
523
  pre,
524
524
  .pseudocode {
525
525
  @include pseudocodeBlock(#f7f7f7);
526
- font-size: 1em;
526
+ font-size: $normalfontsize;
527
527
  }
528
528
 
529
529
  pre {
@@ -623,7 +623,7 @@ a.footnote-number, a.TableFootnoteRef, span.TableFootnoteRef {
623
623
  }
624
624
 
625
625
  .footnote {
626
- font-size: 0.9em;
626
+ font-size: $footnotefontsize;
627
627
  }
628
628
 
629
629
  sup a {
@@ -631,7 +631,7 @@ sup a {
631
631
  font-size: 0.8em;
632
632
  }
633
633
  #footnote_box {
634
- font-size: 14px;
634
+ font-size: $footnotefontsize;
635
635
  background: white;
636
636
  padding: 0 10px;
637
637
  margin: 10px;
@@ -647,7 +647,7 @@ ol.footnotes-list, aside.footnote {
647
647
  }
648
648
 
649
649
  ol.footnotes-list li, aside.footnote {
650
- font-size: 0.9em;
650
+ font-size: $footnotefontsize;
651
651
  vertical-align: top;
652
652
  list-style:decimal;
653
653
  margin-bottom: 1em;
data/lib/isodoc/iso/html/wordstyle.css CHANGED
@@ -69,7 +69,7 @@ p.MsoNormal, li.MsoNormal, div.MsoNormal {
69
69
  line-height: 12.0pt;
70
70
  mso-pagination: widow-orphan;
71
71
  tab-stops: 20.15pt;
72
- font-size: 11.0pt;
72
+ font-size: {{normalfontsize}};
73
73
  font-family: {{bodyfont}};
74
74
  mso-fareast-font-family: "SimSun",serif;
75
75
  mso-bidi-font-family: {{bodyfont}};
@@ -85,7 +85,7 @@ p.MsoNormalIndent, li.MsoNormalIndent, div.MsoNormalIndent {
85
85
  line-height: 12.0pt;
86
86
  mso-pagination: widow-orphan;
87
87
  tab-stops: 20.15pt;
88
- font-size: 11.0pt;
88
+ font-size: {{normalfontsize}};
89
89
  font-family: {{bodyfont}};
90
90
  mso-fareast-font-family: "SimSun",serif;
91
91
  mso-bidi-font-family: {{bodyfont}};
@@ -128,7 +128,7 @@ p.MsoListParagraph, li.MsoListParagraph, div.MsoListParagraph {
128
128
  margin-bottom: 12.0pt;
129
129
  /* do not put in margin-left, it is specific to list level */
130
130
  mso-pagination: widow-orphan;
131
- font-size: 11.0pt;
131
+ font-size: {{normalfontsize}};
132
132
  font-family: {{bodyfont}};
133
133
  mso-ansi-language: EN-AU;
134
134
  mso-fareast-language: EN-US; }
@@ -143,7 +143,7 @@ p.MsoListParagraphCxSpFirst, li.MsoListParagraphCxSpFirst, div.MsoListParagraphC
143
143
  margin-bottom: 12.0pt;
144
144
  /* do not put in margin-left, it is specific to list level */
145
145
  mso-pagination: widow-orphan;
146
- font-size: 11.0pt;
146
+ font-size: {{normalfontsize}};
147
147
  font-family: {{bodyfont}};
148
148
  mso-ansi-language: EN-AU;
149
149
  mso-fareast-language: EN-US; }
@@ -158,7 +158,7 @@ p.MsoListParagraphCxSpMiddle, li.MsoListParagraphCxSpMiddle, div.MsoListParagrap
158
158
  margin-bottom: 12.0pt;
159
159
  /* do not put in margin-left, it is specific to list level */
160
160
  mso-pagination: widow-orphan;
161
- font-size: 11.0pt;
161
+ font-size: {{normalfontsize}};
162
162
  font-family: {{bodyfont}};
163
163
  mso-ansi-language: EN-AU;
164
164
  mso-fareast-language: EN-US; }
@@ -173,7 +173,7 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
173
173
  margin-bottom: 12.0pt;
174
174
  /* do not put in margin-left, it is specific to list level */
175
175
  mso-pagination: widow-orphan;
176
- font-size: 11.0pt;
176
+ font-size: {{normalfontsize}};
177
177
  font-family: {{bodyfont}};
178
178
  mso-ansi-language: EN-AU;
179
179
  mso-fareast-language: EN-US; }
@@ -199,14 +199,14 @@ h1 {
199
199
  mso-list: l1 level1 lfo6;
200
200
  mso-hyphenate: none;
201
201
  tab-stops: 20.0pt list 21.6pt left 28.0pt;
202
- {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
202
+ {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
203
203
  font-style: italic;
204
- font-size: 11.0pt;
204
+ font-size: {{normalfontsize}};
205
205
  font-weight: normal;
206
- {% else %}
206
+ {% else %}
207
207
  font-size: 13.0pt;
208
- {% endif %}
209
- mso-bidi-font-size: 11.0pt;
208
+ {% endif %}
209
+ mso-bidi-font-size: {{normalfontsize}};
210
210
  font-family: {{headerfont}};
211
211
  mso-fareast-font-family: "SimHei",serif;
212
212
  mso-font-kerning: 0pt;
@@ -240,7 +240,7 @@ h1.Annex {
240
240
  mso-hyphenate: none;
241
241
  tab-stops: 20.0pt list 21.6pt left 28.0pt;
242
242
  font-size: 13.0pt;
243
- mso-bidi-font-size: 11.0pt;
243
+ mso-bidi-font-size: {{normalfontsize}};
244
244
  font-family: {{headerfont}};
245
245
  mso-fareast-font-family: "SimHei",serif;
246
246
  mso-font-kerning: 0pt;
@@ -265,15 +265,15 @@ h1.Annex {
265
265
  page-break-after: avoid;
266
266
  mso-hyphenate: none;
267
267
  tab-stops: 27.0pt 35.0pt;
268
- {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
268
+ {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
269
269
  font-style: italic;
270
- font-size: 11.0pt;
270
+ font-size: {{normalfontsize}};
271
271
  font-weight: normal;
272
- {% else %}
272
+ {% else %}
273
273
  font-size: 13.0pt;
274
274
  font-weight: bold;
275
- {% endif %}
276
- mso-bidi-font-size: 11.0pt;
275
+ {% endif %}
276
+ mso-bidi-font-size: {{normalfontsize}};
277
277
  font-family: {{headerfont}};
278
278
  mso-fareast-font-family: "SimHei",serif;
279
279
  mso-ansi-language: EN-GB;
@@ -302,14 +302,14 @@ h2 {
302
302
  mso-outline-level: 3;
303
303
  mso-hyphenate: none;
304
304
  tab-stops: list 36.0pt left 44.0pt;
305
- {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
305
+ {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
306
306
  font-style: italic;
307
- font-size: 11.0pt;
307
+ font-size: {{normalfontsize}};
308
308
  font-weight: normal;
309
- {% else %}
309
+ {% else %}
310
310
  font-size: 13.0pt;
311
311
  font-weight: bold;
312
- {% endif %}
312
+ {% endif %}
313
313
  font-family: {{headerfont}};
314
314
  mso-fareast-font-family: "SimHei",serif;
315
315
  mso-ansi-language: EN-GB;
@@ -337,14 +337,14 @@ h3 {
337
337
  page-break-after: avoid;
338
338
  mso-hyphenate: none;
339
339
  tab-stops: 51.05pt 57.0pt 68.0pt;
340
- font-size: 11.0pt;
340
+ font-size: {{normalfontsize}};
341
341
  font-family: {{headerfont}};
342
- {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
342
+ {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
343
343
  font-style: italic;
344
344
  font-weight: normal;
345
- {% else %}
345
+ {% else %}
346
346
  font-weight: bold;
347
- {% endif %}
347
+ {% endif %}
348
348
  mso-fareast-font-family: "SimHei",serif;
349
349
  mso-ansi-language: EN-GB;
350
350
  mso-fareast-language: JA;
@@ -371,14 +371,14 @@ h4 {
371
371
  page-break-after: avoid;
372
372
  mso-hyphenate: none;
373
373
  tab-stops: 51.05pt list 54.0pt;
374
- font-size: 11.0pt;
374
+ font-size: {{normalfontsize}};
375
375
  font-family: {{headerfont}};
376
- {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
376
+ {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
377
377
  font-style: italic;
378
378
  font-weight: normal;
379
- {% else %}
379
+ {% else %}
380
380
  font-weight: bold;
381
- {% endif %}
381
+ {% endif %}
382
382
  mso-fareast-font-family: "SimHei",serif;
383
383
  mso-ansi-language: EN-GB;
384
384
  mso-fareast-language: JA;
@@ -405,14 +405,14 @@ h6 {
405
405
  page-break-after: avoid;
406
406
  mso-hyphenate: none;
407
407
  tab-stops: 51.05pt list 72.0pt;
408
- font-size: 11.0pt;
408
+ font-size: {{normalfontsize}};
409
409
  font-family: {{headerfont}};
410
- {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
410
+ {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
411
411
  font-style: italic;
412
412
  font-weight: normal;
413
- {% else %}
413
+ {% else %}
414
414
  font-weight: bold;
415
- {% endif %}
415
+ {% endif %}
416
416
  mso-fareast-font-family: "SimHei",serif;
417
417
  mso-ansi-language: EN-GB;
418
418
  mso-fareast-language: JA;
@@ -436,7 +436,7 @@ p.MsoToc1, li.MsoToc1, div.MsoToc1 {
436
436
  mso-pagination: widow-orphan;
437
437
  mso-hyphenate: none;
438
438
  tab-stops: 20.15pt 36.0pt right dotted 487.6pt;
439
- font-size: 11.0pt;
439
+ font-size: {{normalfontsize}};
440
440
  font-family: {{bodyfont}};
441
441
  mso-fareast-font-family: "SimHei",serif;
442
442
  mso-bidi-font-family: {{bodyfont}};
@@ -460,7 +460,7 @@ p.MsoToc2, li.MsoToc2, div.MsoToc2 {
460
460
  mso-pagination: widow-orphan;
461
461
  mso-hyphenate: none;
462
462
  tab-stops: 20.15pt 36.0pt right dotted 487.6pt;
463
- font-size: 11.0pt;
463
+ font-size: {{normalfontsize}};
464
464
  font-family: {{bodyfont}};
465
465
  mso-fareast-font-family: "SimSun",serif;
466
466
  mso-bidi-font-family: {{bodyfont}};
@@ -484,7 +484,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3 {
484
484
  mso-pagination: widow-orphan;
485
485
  mso-hyphenate: none;
486
486
  tab-stops: 20.15pt 36.0pt right dotted 487.6pt;
487
- font-size: 11.0pt;
487
+ font-size: {{normalfontsize}};
488
488
  font-family: {{bodyfont}};
489
489
  mso-fareast-font-family: "SimSun",serif;
490
490
  mso-bidi-font-family: {{bodyfont}};
@@ -502,11 +502,11 @@ p.MsoHeader, li.MsoHeader, div.MsoHeader {
502
502
  margin-bottom: 30.0pt;
503
503
  margin-left: 0cm;
504
504
  text-align: justify;
505
- line-height: 11.0pt;
505
+ line-height: {{normalfontsize}};
506
506
  mso-line-height-rule: exactly;
507
507
  mso-pagination: widow-orphan;
508
508
  tab-stops: 20.15pt;
509
- font-size: 11.0pt;
509
+ font-size: {{normalfontsize}};
510
510
  font-family: {{headerfont}};
511
511
  mso-fareast-font-family: "SimHei",serif;
512
512
  mso-bidi-font-family: {{headerfont}};
@@ -524,11 +524,11 @@ p.MsoHeaderLandscape, li.MsoHeaderLandscape, div.MsoHeaderLandscape {
524
524
  margin-bottom: 30.0pt;
525
525
  margin-left: 0cm;
526
526
  text-align: justify;
527
- line-height: 11.0pt;
527
+ line-height: {{normalfontsize}};
528
528
  mso-line-height-rule: exactly;
529
529
  mso-pagination: widow-orphan;
530
530
  tab-stops: 20.15pt;
531
- font-size: 11.0pt;
531
+ font-size: {{normalfontsize}};
532
532
  font-family: {{headerfont}};
533
533
  mso-fareast-font-family: "SimHei",serif;
534
534
  mso-bidi-font-family: {{headerfont}};
@@ -546,11 +546,11 @@ p.MsoFooter, li.MsoFooter, div.MsoFooter {
546
546
  margin-bottom: 6.0pt;
547
547
  margin-left: 0cm;
548
548
  text-align: justify;
549
- line-height: 11.0pt;
549
+ line-height: {{normalfontsize}};
550
550
  mso-line-height-rule: exactly;
551
551
  mso-pagination: widow-orphan;
552
552
  tab-stops: right 487.6pt;
553
- font-size: 11.0pt;
553
+ font-size: {{normalfontsize}};
554
554
  font-family: {{headerfont}};
555
555
  mso-fareast-font-family: "SimHei",serif;
556
556
  mso-bidi-font-family: {{headerfont}};
@@ -566,11 +566,11 @@ p.MsoFooterLandscape, li.MsoFooterLandscape, div.MsoFooterLandscape {
566
566
  margin-bottom: 6.0pt;
567
567
  margin-left: 0cm;
568
568
  text-align: justify;
569
- line-height: 11.0pt;
569
+ line-height: {{normalfontsize}};
570
570
  mso-line-height-rule: exactly;
571
571
  mso-pagination: widow-orphan;
572
572
  tab-stops: right 734.0pt;
573
- font-size: 11.0pt;
573
+ font-size: {{normalfontsize}};
574
574
  font-family: {{headerfont}};
575
575
  mso-fareast-font-family: "SimHei",serif;
576
576
  mso-bidi-font-family: {{headerfont}};
@@ -592,7 +592,7 @@ p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText {
592
592
  line-height: 12.0pt;
593
593
  mso-pagination: widow-orphan;
594
594
  tab-stops: 20.15pt;
595
- font-size: 10.0pt;
595
+ font-size: {{footnotefontsize}};
596
596
  font-family: {{bodyfont}};
597
597
  mso-fareast-font-family: "SimSun",serif;
598
598
  mso-bidi-font-family: {{bodyfont}};
@@ -611,7 +611,7 @@ p.MsoBodyText, li.MsoBodyText, div.MsoBodyText {
611
611
  text-align: justify;
612
612
  line-height: 12.0pt;
613
613
  mso-pagination: widow-orphan;
614
- font-size: 11.0pt;
614
+ font-size: {{normalfontsize}};
615
615
  font-family: {{bodyfont}};
616
616
  mso-fareast-font-family: "SimSun",serif;
617
617
  mso-bidi-font-family: {{bodyfont}};
@@ -655,10 +655,10 @@ span.Heading1Char {
655
655
  mso-hansi-font-family: {{headerfont}};
656
656
  mso-ansi-language: EN-GB;
657
657
  mso-fareast-language: JA;
658
- {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
659
- {% else %}
658
+ {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
659
+ {% else %}
660
660
  font-weight: bold;
661
- {% endif %}
661
+ {% endif %}
662
662
  mso-bidi-font-weight: normal; }
663
663
 
664
664
  span.Heading2Char {
@@ -685,7 +685,7 @@ span.Heading3Char {
685
685
  mso-style-locked: yes;
686
686
  mso-style-parent: "";
687
687
  mso-style-link: "Heading 3";
688
- mso-ansi-font-size: 11.0pt;
688
+ mso-ansi-font-size: {{normalfontsize}};
689
689
  font-family: {{headerfont}};
690
690
  mso-ascii-font-family: {{headerfont}};
691
691
  mso-fareast-font-family: "SimHei",serif;
@@ -702,7 +702,7 @@ span.Heading4Char {
702
702
  mso-style-locked: yes;
703
703
  mso-style-parent: "";
704
704
  mso-style-link: "Heading 4";
705
- mso-ansi-font-size: 11.0pt;
705
+ mso-ansi-font-size: {{normalfontsize}};
706
706
  font-family: {{headerfont}};
707
707
  mso-ascii-font-family: {{headerfont}};
708
708
  mso-fareast-font-family: "SimHei",serif;
@@ -719,7 +719,7 @@ span.Heading5Char {
719
719
  mso-style-locked: yes;
720
720
  mso-style-parent: "";
721
721
  mso-style-link: "Heading 5";
722
- mso-ansi-font-size: 11.0pt;
722
+ mso-ansi-font-size: {{normalfontsize}};
723
723
  font-family: {{headerfont}};
724
724
  mso-ascii-font-family: {{headerfont}};
725
725
  mso-fareast-font-family: "SimHei",serif;
@@ -736,7 +736,7 @@ span.Heading6Char {
736
736
  mso-style-locked: yes;
737
737
  mso-style-parent: "";
738
738
  mso-style-link: "Heading 6";
739
- mso-ansi-font-size: 11.0pt;
739
+ mso-ansi-font-size: {{normalfontsize}};
740
740
  font-family: {{headerfont}};
741
741
  mso-ascii-font-family: {{headerfont}};
742
742
  mso-fareast-font-family: "SimHei",serif;
@@ -763,7 +763,7 @@ p.a2, li.a2, div.a2 {
763
763
  mso-list: l0 level2 lfo12;
764
764
  tab-stops: 1.0cm 36.0pt;
765
765
  font-size: 13.0pt;
766
- mso-bidi-font-size: 11.0pt;
766
+ mso-bidi-font-size: {{normalfontsize}};
767
767
  font-family: {{bodyfont}};
768
768
  mso-fareast-font-family: "SimHei",serif;
769
769
  mso-bidi-font-family: {{headerfont}};
@@ -789,7 +789,7 @@ p.a3, li.a3, div.a3 {
789
789
  mso-list: l0 level3 lfo12;
790
790
  tab-stops: 20.15pt list 36.0pt;
791
791
  font-size: 12.0pt;
792
- mso-bidi-font-size: 11.0pt;
792
+ mso-bidi-font-size: {{normalfontsize}};
793
793
  font-family: {{bodyfont}};
794
794
  mso-fareast-font-family: "SimHei",serif;
795
795
  mso-bidi-font-family: {{headerfont}};
@@ -814,7 +814,7 @@ p.a4, li.a4, div.a4 {
814
814
  mso-outline-level: 1;
815
815
  mso-list: l0 level4 lfo12;
816
816
  tab-stops: 20.15pt 44.0pt list 54.0pt;
817
- font-size: 11.0pt;
817
+ font-size: {{normalfontsize}};
818
818
  font-family: {{bodyfont}};
819
819
  mso-fareast-font-family: "SimHei",serif;
820
820
  mso-bidi-font-family: {{headerfont}};
@@ -839,7 +839,7 @@ p.a5, li.a5, div.a5 {
839
839
  mso-outline-level: 1;
840
840
  mso-list: l0 level5 lfo12;
841
841
  tab-stops: 20.15pt list 54.0pt left 62.35pt 68.0pt;
842
- font-size: 11.0pt;
842
+ font-size: {{normalfontsize}};
843
843
  font-family: {{bodyfont}};
844
844
  mso-fareast-font-family: "SimHei",serif;
845
845
  mso-bidi-font-family: {{headerfont}};
@@ -864,7 +864,7 @@ p.a6, li.a6, div.a6 {
864
864
  mso-outline-level: 1;
865
865
  mso-list: l0 level6 lfo12;
866
866
  tab-stops: 20.15pt 62.35pt 68.0pt list 72.0pt;
867
- font-size: 11.0pt;
867
+ font-size: {{normalfontsize}};
868
868
  font-family: {{bodyfont}};
869
869
  mso-fareast-font-family: "SimHei",serif;
870
870
  mso-bidi-font-family: {{headerfont}};
@@ -880,8 +880,8 @@ span.FooterChar {
880
880
  mso-style-locked: yes;
881
881
  mso-style-parent: "";
882
882
  mso-style-link: Footer;
883
- mso-ansi-font-size: 11.0pt;
884
- mso-bidi-font-size: 11.0pt;
883
+ mso-ansi-font-size: {{normalfontsize}};
884
+ mso-bidi-font-size: {{normalfontsize}};
885
885
  mso-ansi-language: EN-GB; }
886
886
 
887
887
  span.HeaderChar {
@@ -892,8 +892,8 @@ span.HeaderChar {
892
892
  mso-style-locked: yes;
893
893
  mso-style-parent: "";
894
894
  mso-style-link: Header;
895
- mso-ansi-font-size: 11.0pt;
896
- mso-bidi-font-size: 11.0pt;
895
+ mso-ansi-font-size: {{normalfontsize}};
896
+ mso-bidi-font-size: {{normalfontsize}};
897
897
  mso-ansi-language: EN-GB;
898
898
  font-weight: bold;
899
899
  mso-bidi-font-weight: normal; }
@@ -906,8 +906,8 @@ span.BodyTextChar {
906
906
  mso-style-locked: yes;
907
907
  mso-style-parent: "";
908
908
  mso-style-link: "Body Text";
909
- mso-ansi-font-size: 11.0pt;
910
- mso-bidi-font-size: 11.0pt;
909
+ mso-ansi-font-size: {{normalfontsize}};
910
+ mso-bidi-font-size: {{normalfontsize}};
911
911
  font-family: {{bodyfont}};
912
912
  mso-fareast-font-family: "SimSun",serif;
913
913
  mso-ansi-language: EN-GB; }
@@ -970,8 +970,8 @@ p.Tablebody, li.Tablebody, div.Tablebody {
970
970
  margin-left: 0cm;
971
971
  line-height: 10.5pt;
972
972
  mso-pagination: widow-orphan;
973
- font-size: 10.0pt;
974
- mso-bidi-font-size: 11.0pt;
973
+ font-size: {{smallerfontsize}};
974
+ mso-bidi-font-size: {{normalfontsize}};
975
975
  font-family: {{bodyfont}};
976
976
  mso-fareast-font-family: "SimSun",serif;
977
977
  mso-bidi-font-family: {{bodyfont}};
@@ -1504,7 +1504,7 @@ table.MsoNormalTable {
1504
1504
  mso-para-margin: 0cm;
1505
1505
  mso-para-margin-bottom: .0001pt;
1506
1506
  mso-pagination: widow-orphan;
1507
- font-size: 10.0pt;
1507
+ font-size: {{smallerfontsize}};
1508
1508
  font-family: {{bodyfont}}; }
1509
1509
 
1510
1510
  ol {