metanorma-iec 1.2.8 → 1.2.13

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 (43) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/rake.yml +7 -5
  3. data/lib/asciidoctor/iec/basicdoc.rng +52 -3
  4. data/lib/asciidoctor/iec/converter.rb +25 -1
  5. data/lib/asciidoctor/iec/front.rb +35 -58
  6. data/lib/asciidoctor/iec/iec.rng +81 -1
  7. data/lib/asciidoctor/iec/iec_intro_en.xml +110 -56
  8. data/lib/asciidoctor/iec/iec_intro_fr.xml +78 -22
  9. data/lib/asciidoctor/iec/isodoc.rng +51 -3
  10. data/lib/asciidoctor/iec/isostandard.rng +27 -10
  11. data/lib/isodoc/iec/base_convert.rb +2 -2
  12. data/lib/isodoc/iec/html/html_iec_intro.html +1 -1
  13. data/lib/isodoc/iec/html/htmlstyle.css +5 -5
  14. data/lib/isodoc/iec/html/htmlstyle.scss +4 -4
  15. data/lib/isodoc/iec/html/isodoc.css +79 -79
  16. data/lib/isodoc/iec/html/isodoc.scss +79 -79
  17. data/lib/isodoc/iec/html/word_iec_intro.html +1 -1
  18. data/lib/isodoc/iec/html/wordstyle.css +120 -120
  19. data/lib/isodoc/iec/html/wordstyle.scss +120 -120
  20. data/lib/isodoc/iec/html_convert.rb +10 -2
  21. data/lib/isodoc/iec/i18n-en.yaml +17 -0
  22. data/lib/isodoc/iec/i18n-fr.yaml +18 -0
  23. data/lib/isodoc/iec/iec.international-standard.xsl +914 -398
  24. data/lib/isodoc/iec/metadata.rb +33 -0
  25. data/lib/isodoc/iec/presentation_xml_convert.rb +12 -0
  26. data/lib/isodoc/iec/word_convert.rb +12 -2
  27. data/lib/metanorma/iec/processor.rb +11 -8
  28. data/lib/metanorma/iec/version.rb +1 -1
  29. data/metanorma-iec.gemspec +2 -3
  30. data/spec/asciidoctor-iec/base_spec.rb +444 -10
  31. data/spec/asciidoctor-iec/blocks_spec.rb +25 -21
  32. data/spec/asciidoctor-iec/cleanup_spec.rb +99 -14
  33. data/spec/asciidoctor-iec/iev_spec.rb +15 -6
  34. data/spec/asciidoctor-iec/inline_spec.rb +11 -7
  35. data/spec/asciidoctor-iec/lists_spec.rb +13 -9
  36. data/spec/asciidoctor-iec/section_spec.rb +9 -5
  37. data/spec/asciidoctor-iec/validate_spec.rb +16 -1
  38. data/spec/isodoc/i18n_spec.rb +30 -0
  39. data/spec/isodoc/iso_spec.rb +4 -4
  40. data/spec/isodoc/metadata_spec.rb +23 -1
  41. data/spec/metanorma/processor_spec.rb +1 -1
  42. data/spec/spec_helper.rb +20 -31
  43. metadata +5 -19
data/lib/isodoc/iec/html/wordstyle.scss CHANGED
@@ -74,13 +74,13 @@ p.MsoNormal, li.MsoNormal, div.MsoNormal
74
74
  mso-style-link:"PARAGRAPH Char";
75
75
  margin-top:5.0pt;
76
76
  margin-right:0cm;
77
- margin-bottom:10.0pt;
77
+ margin-bottom:$normalfontsize;
78
78
  margin-left:0cm;
79
79
  text-align:justify;
80
80
  mso-pagination:widow-orphan;
81
81
  layout-grid-mode:char;
82
- font-size:10.0pt;
83
- font-family:"Arial",sans-serif;
82
+ font-size:$normalfontsize;
83
+ font-family:$bodyfont;
84
84
  mso-fareast-font-family:"Times New Roman";
85
85
  letter-spacing:.4pt;
86
86
  mso-ansi-language:EN-GB;
@@ -95,8 +95,8 @@ p.MsoNormalIndent, li.MsoNormalIndent, div.MsoNormalIndent
95
95
  margin-bottom:.0001pt;
96
96
  text-align:justify;
97
97
  mso-pagination:widow-orphan;
98
- font-size:10.0pt;
99
- font-family:"Arial",sans-serif;
98
+ font-size:$normalfontsize;
99
+ font-family:$bodyfont;
100
100
  mso-fareast-font-family:"Times New Roman";
101
101
  letter-spacing:.4pt;
102
102
  mso-ansi-language:EN-GB;
@@ -111,8 +111,8 @@ p.MsoBlockText, li.MsoBlockText, div.MsoBlockText
111
111
  margin-left:72.0pt;
112
112
  text-align:justify;
113
113
  mso-pagination:widow-orphan;
114
- font-size:10.0pt;
115
- font-family:"Arial",sans-serif;
114
+ font-size:$normalfontsize;
115
+ font-family:$bodyfont;
116
116
  mso-fareast-font-family:"Times New Roman";
117
117
  letter-spacing:.4pt;
118
118
  mso-ansi-language:EN-GB;
@@ -129,8 +129,8 @@ p.MsoListParagraph, li.MsoListParagraph, div.MsoListParagraph
129
129
  margin-bottom:.0001pt;
130
130
  text-align:justify;
131
131
  mso-pagination:widow-orphan;
132
- font-size:10.0pt;
133
- font-family:"Arial",sans-serif;
132
+ font-size:$normalfontsize;
133
+ font-family:$bodyfont;
134
134
  mso-fareast-font-family:"Times New Roman";
135
135
  letter-spacing:.4pt;
136
136
  mso-ansi-language:EN-GB;
@@ -147,8 +147,8 @@ p.MsoListParagraphCxSpFirst, li.MsoListParagraphCxSpFirst, div.MsoListParagraphC
147
147
  margin-bottom:.0001pt;
148
148
  text-align:justify;
149
149
  mso-pagination:widow-orphan;
150
- font-size:10.0pt;
151
- font-family:"Arial",sans-serif;
150
+ font-size:$normalfontsize;
151
+ font-family:$bodyfont;
152
152
  mso-fareast-font-family:"Times New Roman";
153
153
  letter-spacing:.4pt;
154
154
  mso-ansi-language:EN-GB;
@@ -164,8 +164,8 @@ p.MsoListParagraphCxSpMiddle, li.MsoListParagraphCxSpMiddle, div.MsoListParagrap
164
164
  margin-bottom:.0001pt;
165
165
  text-align:justify;
166
166
  mso-pagination:widow-orphan;
167
- font-size:10.0pt;
168
- font-family:"Arial",sans-serif;
167
+ font-size:$normalfontsize;
168
+ font-family:$bodyfont;
169
169
  mso-fareast-font-family:"Times New Roman";
170
170
  letter-spacing:.4pt;
171
171
  mso-ansi-language:EN-GB;
@@ -181,8 +181,8 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
181
181
  margin-bottom:.0001pt;
182
182
  text-align:justify;
183
183
  mso-pagination:widow-orphan;
184
- font-size:10.0pt;
185
- font-family:"Arial",sans-serif;
184
+ font-size:$normalfontsize;
185
+ font-family:$bodyfont;
186
186
  mso-fareast-font-family:"Times New Roman";
187
187
  letter-spacing:.4pt;
188
188
  mso-ansi-language:EN-GB;
@@ -195,9 +195,9 @@ h1.main
195
195
  mso-style-qformat:yes;
196
196
  mso-style-parent:Normal;
197
197
  mso-style-next:Normal;
198
- margin-top:10.0pt;
198
+ margin-top:$normalfontsize;
199
199
  margin-right:0cm;
200
- margin-bottom:10.0pt;
200
+ margin-bottom:$normalfontsize;
201
201
  margin-left:19.85pt;
202
202
  text-align:left;
203
203
  text-indent:-19.85pt;
@@ -209,7 +209,7 @@ h1.main
209
209
  tab-stops:list 19.85pt;
210
210
  layout-grid-mode:char;
211
211
  font-size:11.0pt;
212
- font-family:"Arial",sans-serif;
212
+ font-family:$headerfont;
213
213
  letter-spacing:.4pt;
214
214
  mso-font-kerning:0pt;
215
215
  mso-ansi-language:EN-GB;
@@ -224,7 +224,7 @@ h1.Annex
224
224
  mso-style-next:ANNEX-heading1;
225
225
  margin-top:0cm;
226
226
  margin-right:0cm;
227
- margin-bottom:10.0pt;
227
+ margin-bottom:$normalfontsize;
228
228
  margin-left:0cm;
229
229
  text-align:center;
230
230
  /* text-indent:25.5pt; */
@@ -234,7 +234,7 @@ h1.Annex
234
234
  mso-list:l4 level1 lfo19;
235
235
  layout-grid-mode:char;
236
236
  font-size:12.0pt;
237
- font-family:"Arial",sans-serif;
237
+ font-family:$headerfont;
238
238
  mso-fareast-font-family:"Times New Roman";
239
239
  letter-spacing:.4pt;
240
240
  mso-ansi-language:EN-GB;
@@ -261,8 +261,8 @@ h1
261
261
  mso-hyphenate:none;
262
262
  tab-stops:list 31.2pt;
263
263
  layout-grid-mode:char;
264
- font-size:10.0pt;
265
- font-family:"Arial",sans-serif;
264
+ font-size:$normalfontsize;
265
+ font-family:$headerfont;
266
266
  letter-spacing:.4pt;
267
267
  mso-ansi-language:EN-GB;
268
268
  mso-fareast-language:ZH-CN;
@@ -287,8 +287,8 @@ h2
287
287
  mso-hyphenate:none;
288
288
  tab-stops:list 42.55pt;
289
289
  layout-grid-mode:char;
290
- font-size:10.0pt;
291
- font-family:"Arial",sans-serif;
290
+ font-size:$normalfontsize;
291
+ font-family:$headerfont;
292
292
  letter-spacing:.4pt;
293
293
  mso-ansi-language:EN-GB;
294
294
  mso-fareast-language:ZH-CN;
@@ -312,8 +312,8 @@ h3 {mso-list:l26 level3 lfo40;
312
312
  mso-hyphenate:none;
313
313
  tab-stops:list 53.85pt;
314
314
  layout-grid-mode:char;
315
- font-size:10.0pt;
316
- font-family:"Arial",sans-serif;
315
+ font-size:$normalfontsize;
316
+ font-family:$headerfont;
317
317
  letter-spacing:.4pt;
318
318
  mso-ansi-language:EN-GB;
319
319
  mso-fareast-language:ZH-CN;
@@ -337,8 +337,8 @@ h4 {mso-list:l26 level2 lfo40;
337
337
  mso-hyphenate:none;
338
338
  tab-stops:list 65.2pt;
339
339
  layout-grid-mode:char;
340
- font-size:10.0pt;
341
- font-family:"Arial",sans-serif;
340
+ font-size:$normalfontsize;
341
+ font-family:$headerfont;
342
342
  letter-spacing:.4pt;
343
343
  mso-ansi-language:EN-GB;
344
344
  mso-fareast-language:ZH-CN;
@@ -362,8 +362,8 @@ h6
362
362
  mso-hyphenate:none;
363
363
  tab-stops:list 76.55pt;
364
364
  layout-grid-mode:char;
365
- font-size:10.0pt;
366
- font-family:"Arial",sans-serif;
365
+ font-size:$normalfontsize;
366
+ font-family:$headerfont;
367
367
  letter-spacing:.4pt;
368
368
  mso-ansi-language:EN-GB;
369
369
  mso-fareast-language:ZH-CN;
@@ -388,8 +388,8 @@ p.MsoHeading7, li.MsoHeading7, div.MsoHeading7
388
388
  mso-hyphenate:none;
389
389
  tab-stops:list 87.9pt;
390
390
  layout-grid-mode:char;
391
- font-size:10.0pt;
392
- font-family:"Arial",sans-serif;
391
+ font-size:$normalfontsize;
392
+ font-family:$headerfont;
393
393
  mso-fareast-font-family:"Times New Roman";
394
394
  letter-spacing:.4pt;
395
395
  mso-ansi-language:EN-GB;
@@ -413,8 +413,8 @@ p.MsoHeading8, li.MsoHeading8, div.MsoHeading8
413
413
  mso-hyphenate:none;
414
414
  tab-stops:list 99.25pt;
415
415
  layout-grid-mode:char;
416
- font-size:10.0pt;
417
- font-family:"Arial",sans-serif;
416
+ font-size:$normalfontsize;
417
+ font-family:$headerfont;
418
418
  mso-fareast-font-family:"Times New Roman";
419
419
  letter-spacing:.4pt;
420
420
  mso-ansi-language:EN-GB;
@@ -438,8 +438,8 @@ p.MsoHeading9, li.MsoHeading9, div.MsoHeading9
438
438
  mso-hyphenate:none;
439
439
  tab-stops:list 110.55pt;
440
440
  layout-grid-mode:char;
441
- font-size:10.0pt;
442
- font-family:"Arial",sans-serif;
441
+ font-size:$normalfontsize;
442
+ font-family:$headerfont;
443
443
  mso-fareast-font-family:"Times New Roman";
444
444
  letter-spacing:.4pt;
445
445
  mso-ansi-language:EN-GB;
@@ -459,8 +459,8 @@ p.MsoToc1, li.MsoToc1, div.MsoToc1
459
459
  mso-hyphenate:none;
460
460
  tab-stops:22.7pt right dotted 453.5pt;
461
461
  layout-grid-mode:char;
462
- font-size:10.0pt;
463
- font-family:"Arial",sans-serif;
462
+ font-size:$normalfontsize;
463
+ font-family:$headerfont;
464
464
  mso-fareast-font-family:"Times New Roman";
465
465
  letter-spacing:.4pt;
466
466
  mso-ansi-language:EN-GB;
@@ -480,8 +480,8 @@ p.MsoToc2, li.MsoToc2, div.MsoToc2
480
480
  mso-hyphenate:none;
481
481
  tab-stops:49.65pt right dotted 453.5pt;
482
482
  layout-grid-mode:char;
483
- font-size:10.0pt;
484
- font-family:"Arial",sans-serif;
483
+ font-size:$normalfontsize;
484
+ font-family:$headerfont;
485
485
  mso-fareast-font-family:"Times New Roman";
486
486
  letter-spacing:.4pt;
487
487
  mso-ansi-language:EN-GB;
@@ -501,8 +501,8 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3
501
501
  mso-hyphenate:none;
502
502
  tab-stops:78.0pt right dotted 453.5pt;
503
503
  layout-grid-mode:char;
504
- font-size:10.0pt;
505
- font-family:"Arial",sans-serif;
504
+ font-size:$normalfontsize;
505
+ font-family:$headerfont;
506
506
  mso-fareast-font-family:"Times New Roman";
507
507
  letter-spacing:.4pt;
508
508
  mso-ansi-language:EN-GB;
@@ -522,8 +522,8 @@ p.MsoToc4, li.MsoToc4, div.MsoToc4
522
522
  mso-hyphenate:none;
523
523
  tab-stops:78.0pt 130.4pt right dotted 453.5pt;
524
524
  layout-grid-mode:char;
525
- font-size:10.0pt;
526
- font-family:"Arial",sans-serif;
525
+ font-size:$normalfontsize;
526
+ font-family:$headerfont;
527
527
  mso-fareast-font-family:"Times New Roman";
528
528
  letter-spacing:.4pt;
529
529
  mso-ansi-language:EN-GB;
@@ -543,8 +543,8 @@ p.MsoToc5, li.MsoToc5, div.MsoToc5
543
543
  mso-hyphenate:none;
544
544
  tab-stops:78.0pt 184.3pt right dotted 453.5pt;
545
545
  layout-grid-mode:char;
546
- font-size:10.0pt;
547
- font-family:"Arial",sans-serif;
546
+ font-size:$normalfontsize;
547
+ font-family:$headerfont;
548
548
  mso-fareast-font-family:"Times New Roman";
549
549
  letter-spacing:.4pt;
550
550
  mso-ansi-language:EN-GB;
@@ -564,8 +564,8 @@ p.MsoToc6, li.MsoToc6, div.MsoToc6
564
564
  mso-hyphenate:none;
565
565
  tab-stops:78.0pt 246.65pt right dotted 453.5pt;
566
566
  layout-grid-mode:char;
567
- font-size:10.0pt;
568
- font-family:"Arial",sans-serif;
567
+ font-size:$normalfontsize;
568
+ font-family:$headerfont;
569
569
  mso-fareast-font-family:"Times New Roman";
570
570
  letter-spacing:.4pt;
571
571
  mso-ansi-language:EN-GB;
@@ -585,8 +585,8 @@ p.MsoToc7, li.MsoToc7, div.MsoToc7
585
585
  mso-hyphenate:none;
586
586
  tab-stops:22.7pt right 453.5pt;
587
587
  layout-grid-mode:char;
588
- font-size:10.0pt;
589
- font-family:"Arial",sans-serif;
588
+ font-size:$normalfontsize;
589
+ font-family:$headerfont;
590
590
  mso-fareast-font-family:"Times New Roman";
591
591
  letter-spacing:.4pt;
592
592
  mso-ansi-language:EN-GB;
@@ -606,8 +606,8 @@ p.MsoToc8, li.MsoToc8, div.MsoToc8
606
606
  mso-hyphenate:none;
607
607
  tab-stops:22.7pt right dotted 453.5pt;
608
608
  layout-grid-mode:char;
609
- font-size:10.0pt;
610
- font-family:"Arial",sans-serif;
609
+ font-size:$normalfontsize;
610
+ font-family:$headerfont;
611
611
  mso-fareast-font-family:"Times New Roman";
612
612
  letter-spacing:.4pt;
613
613
  mso-ansi-language:EN-GB;
@@ -627,8 +627,8 @@ p.MsoToc9, li.MsoToc9, div.MsoToc9
627
627
  mso-hyphenate:none;
628
628
  tab-stops:22.7pt right dotted 453.5pt;
629
629
  layout-grid-mode:char;
630
- font-size:10.0pt;
631
- font-family:"Arial",sans-serif;
630
+ font-size:$normalfontsize;
631
+ font-family:$headerfont;
632
632
  mso-fareast-font-family:"Times New Roman";
633
633
  letter-spacing:.4pt;
634
634
  mso-ansi-language:EN-GB;
@@ -642,8 +642,8 @@ p.MsoHeader, li.MsoHeader, div.MsoHeader
642
642
  mso-pagination:widow-orphan;
643
643
  tab-stops:center 8.0cm right 16.0cm;
644
644
  layout-grid-mode:char;
645
- font-size:10.0pt;
646
- font-family:"Arial",sans-serif;
645
+ font-size:$normalfontsize;
646
+ font-family:$headerfont;
647
647
  mso-fareast-font-family:"Times New Roman";
648
648
  letter-spacing:.4pt;
649
649
  mso-ansi-language:EN-GB;
@@ -656,8 +656,8 @@ p.MsoHeaderLandscape, li.MsoHeaderLandscape, div.MsoHeaderLandscape
656
656
  mso-pagination:widow-orphan;
657
657
  tab-stops:center 331.0pt right 662.0pt;
658
658
  layout-grid-mode:char;
659
- font-size:10.0pt;
660
- font-family:"Arial",sans-serif;
659
+ font-size:$normalfontsize;
660
+ font-family:$headerfont;
661
661
  mso-fareast-font-family:"Times New Roman";
662
662
  letter-spacing:.4pt;
663
663
  mso-ansi-language:EN-GB;
@@ -673,8 +673,8 @@ p.MsoFooter, li.MsoFooter, div.MsoFooter
673
673
  mso-pagination:widow-orphan;
674
674
  tab-stops:center 8.0cm right 16.0cm;
675
675
  layout-grid-mode:char;
676
- font-size:10.0pt;
677
- font-family:"Arial",sans-serif;
676
+ font-size:$normalfontsize;
677
+ font-family:$headerfont;
678
678
  mso-fareast-font-family:"Times New Roman";
679
679
  letter-spacing:.4pt;
680
680
  mso-ansi-language:EN-GB;
@@ -690,8 +690,8 @@ p.MsoFooterLandscape, li.MsoFooterLandscape, div.MsoFooterLandscape
690
690
  mso-pagination:widow-orphan;
691
691
  tab-stops:center 331.0pt right 662.0pt;
692
692
  layout-grid-mode:char;
693
- font-size:10.0pt;
694
- font-family:"Arial",sans-serif;
693
+ font-size:$normalfontsize;
694
+ font-family:$headerfont;
695
695
  mso-fareast-font-family:"Times New Roman";
696
696
  letter-spacing:.4pt;
697
697
  mso-ansi-language:EN-GB;
@@ -702,7 +702,7 @@ span.MsoFootnoteReference
702
702
  mso-style-parent:"";
703
703
  mso-ansi-font-size:8.0pt;
704
704
  mso-bidi-font-size:8.0pt;
705
- font-family:"Arial",sans-serif;
705
+ font-family:$bodyfont;
706
706
  mso-ascii-font-family:Arial;
707
707
  mso-hansi-font-family:Arial;
708
708
  position:relative;
@@ -720,8 +720,8 @@ p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText
720
720
  text-indent:-14.2pt;
721
721
  mso-pagination:widow-orphan;
722
722
  layout-grid-mode:char;
723
- font-size:8.0pt;
724
- font-family:"Arial",sans-serif;
723
+ font-size:$footnotefontsize;
724
+ font-family:$bodyfont;
725
725
  mso-fareast-font-family:"Times New Roman";
726
726
  letter-spacing:.4pt;
727
727
  mso-ansi-language:EN-GB;
@@ -749,7 +749,7 @@ span.Heading1Char
749
749
  mso-style-link:"Heading 1";
750
750
  mso-ansi-font-size:11.0pt;
751
751
  font-size:11.0pt;
752
- font-family:"Arial",sans-serif;
752
+ font-family:$headerfont;
753
753
  letter-spacing:.4pt;
754
754
  mso-font-kerning:0pt;
755
755
  mso-ansi-language:EN-GB;
@@ -762,9 +762,9 @@ span.Heading2Char
762
762
  mso-style-locked:yes;
763
763
  mso-style-parent:"";
764
764
  mso-style-link:"Heading 2";
765
- mso-ansi-font-size:10.0pt;
766
- font-size:10.0pt;
767
- font-family:"Arial",sans-serif;
765
+ mso-ansi-font-size:$normalfontsize;
766
+ font-size:$normalfontsize;
767
+ font-family:$headerfont;
768
768
  letter-spacing:.4pt;
769
769
  mso-ansi-language:EN-GB;
770
770
  mso-fareast-language:ZH-CN;
@@ -776,9 +776,9 @@ span.Heading3Char
776
776
  mso-style-locked:yes;
777
777
  mso-style-parent:"";
778
778
  mso-style-link:"Heading 3";
779
- mso-ansi-font-size:10.0pt;
780
- font-size:10.0pt;
781
- font-family:"Arial",sans-serif;
779
+ mso-ansi-font-size:$normalfontsize;
780
+ font-size:$normalfontsize;
781
+ font-family:$headerfont;
782
782
  letter-spacing:.4pt;
783
783
  mso-ansi-language:EN-GB;
784
784
  mso-fareast-language:JA;
@@ -791,9 +791,9 @@ span.Heading4Char
791
791
  mso-style-locked:yes;
792
792
  mso-style-parent:"";
793
793
  mso-style-link:"Heading 4";
794
- mso-ansi-font-size:10.0pt;
795
- font-size:10.0pt;
796
- font-family:"Arial",sans-serif;
794
+ mso-ansi-font-size:$normalfontsize;
795
+ font-size:$normalfontsize;
796
+ font-family:$headerfont;
797
797
  letter-spacing:.4pt;
798
798
  mso-ansi-language:EN-GB;
799
799
  mso-fareast-language:JA;
@@ -806,9 +806,9 @@ span.Heading5Char
806
806
  mso-style-locked:yes;
807
807
  mso-style-parent:"";
808
808
  mso-style-link:"Heading 5";
809
- mso-ansi-font-size:10.0pt;
810
- font-size:10.0pt;
811
- font-family:"Arial",sans-serif;
809
+ mso-ansi-font-size:$normalfontsize;
810
+ font-size:$normalfontsize;
811
+ font-family:$headerfont;
812
812
  letter-spacing:.4pt;
813
813
  mso-ansi-language:EN-GB;
814
814
  mso-fareast-language:JA;
@@ -821,9 +821,9 @@ span.Heading6Char
821
821
  mso-style-locked:yes;
822
822
  mso-style-parent:"";
823
823
  mso-style-link:"Heading 6";
824
- mso-ansi-font-size:10.0pt;
825
- font-size:10.0pt;
826
- font-family:"Arial",sans-serif;
824
+ mso-ansi-font-size:$normalfontsize;
825
+ font-size:$normalfontsize;
826
+ font-family:$headerfont;
827
827
  letter-spacing:.4pt;
828
828
  mso-ansi-language:EN-GB;
829
829
  mso-fareast-language:JA;
@@ -981,7 +981,7 @@ span.BodyTextChar
981
981
  mso-style-locked:yes;
982
982
  mso-style-parent:"";
983
983
  mso-style-link:"Body Text";
984
- font-family:"Arial",sans-serif;
984
+ font-family:$bodyfont;
985
985
  mso-ascii-font-family:Arial;
986
986
  mso-hansi-font-family:Arial;
987
987
  mso-bidi-font-family:Arial;
@@ -1025,7 +1025,7 @@ p.MsoCommentSubject, li.MsoCommentSubject, div.MsoCommentSubject
1025
1025
  line-height:12.0pt;
1026
1026
  mso-pagination:widow-orphan;
1027
1027
  tab-stops:20.15pt;
1028
- font-size:10.0pt;
1028
+ font-size:$normalfontsize;
1029
1029
  font-family:$headerfont;
1030
1030
  mso-fareast-font-family:$headerfont;
1031
1031
  mso-bidi-font-family:$headerfont;
@@ -1042,7 +1042,7 @@ p.Tablebody, li.Tablebody, div.Tablebody
1042
1042
  margin-left:0cm;
1043
1043
  line-height:10.5pt;
1044
1044
  mso-pagination:widow-orphan;
1045
- font-size:10.0pt;
1045
+ font-size:$normalfontsize;
1046
1046
  mso-bidi-font-size:11.0pt;
1047
1047
  font-family:$bodyfont;
1048
1048
  mso-fareast-font-family:$bodyfont;
@@ -1066,8 +1066,8 @@ p.Tablebody, li.Tablebody, div.Tablebody
1066
1066
  mso-pagination:widow-orphan;
1067
1067
  tab-stops:17.0pt;
1068
1068
  layout-grid-mode:char;
1069
- font-size:10.0pt;
1070
- font-family:"Arial",sans-serif;
1069
+ font-size:$normalfontsize;
1070
+ font-family:$bodyfont;
1071
1071
  mso-fareast-font-family:"Times New Roman";
1072
1072
  letter-spacing:.4pt;
1073
1073
  mso-ansi-language:EN-GB;
@@ -1085,8 +1085,8 @@ p.MsoListBullet, li.MsoListBullet, div.MsoListBullet
1085
1085
  mso-list:l22 level1 lfo8;
1086
1086
  tab-stops:17.0pt;
1087
1087
  layout-grid-mode:char;
1088
- font-size:10.0pt;
1089
- font-family:"Arial",sans-serif;
1088
+ font-size:$normalfontsize;
1089
+ font-family:$bodyfont;
1090
1090
  mso-fareast-font-family:"Times New Roman";
1091
1091
  letter-spacing:.4pt;
1092
1092
  mso-ansi-language:EN-GB;
@@ -1105,8 +1105,8 @@ p.MsoListNumber, li.MsoListNumber, div.MsoListNumber
1105
1105
  mso-list:l15 level1 lfo1;
1106
1106
  tab-stops:17.0pt;
1107
1107
  layout-grid-mode:char;
1108
- font-size:10.0pt;
1109
- font-family:"Arial",sans-serif;
1108
+ font-size:$normalfontsize;
1109
+ font-family:$bodyfont;
1110
1110
  mso-fareast-font-family:"Times New Roman";
1111
1111
  letter-spacing:.4pt;
1112
1112
  mso-ansi-language:EN-GB;
@@ -1119,13 +1119,13 @@ p.MsoIndex1, li.MsoIndex1, div.MsoIndex1
1119
1119
  margin-top:0cm;
1120
1120
  margin-right:0cm;
1121
1121
  margin-bottom:0cm;
1122
- margin-left:10.0pt;
1122
+ margin-left:$normalfontsize;
1123
1123
  margin-bottom:.0001pt;
1124
1124
  text-align:justify;
1125
- text-indent:-10.0pt;
1125
+ text-indent:-$normalfontsize;
1126
1126
  mso-pagination:widow-orphan;
1127
- font-size:10.0pt;
1128
- font-family:"Arial",sans-serif;
1127
+ font-size:$normalfontsize;
1128
+ font-family:$bodyfont;
1129
1129
  mso-fareast-font-family:"Times New Roman";
1130
1130
  letter-spacing:.4pt;
1131
1131
  mso-ansi-language:EN-GB;
@@ -1141,10 +1141,10 @@ p.MsoIndex2, li.MsoIndex2, div.MsoIndex2
1141
1141
  margin-left:20.0pt;
1142
1142
  margin-bottom:.0001pt;
1143
1143
  text-align:justify;
1144
- text-indent:-10.0pt;
1144
+ text-indent:-$normalfontsize;
1145
1145
  mso-pagination:widow-orphan;
1146
- font-size:10.0pt;
1147
- font-family:"Arial",sans-serif;
1146
+ font-size:$normalfontsize;
1147
+ font-family:$bodyfont;
1148
1148
  mso-fareast-font-family:"Times New Roman";
1149
1149
  letter-spacing:.4pt;
1150
1150
  mso-ansi-language:EN-GB;
@@ -1160,10 +1160,10 @@ p.MsoIndex3, li.MsoIndex3, div.MsoIndex3
1160
1160
  margin-left:30.0pt;
1161
1161
  margin-bottom:.0001pt;
1162
1162
  text-align:justify;
1163
- text-indent:-10.0pt;
1163
+ text-indent:-$normalfontsize;
1164
1164
  mso-pagination:widow-orphan;
1165
- font-size:10.0pt;
1166
- font-family:"Arial",sans-serif;
1165
+ font-size:$normalfontsize;
1166
+ font-family:$bodyfont;
1167
1167
  mso-fareast-font-family:"Times New Roman";
1168
1168
  letter-spacing:.4pt;
1169
1169
  mso-ansi-language:EN-GB;
@@ -1179,10 +1179,10 @@ p.MsoIndex4, li.MsoIndex4, div.MsoIndex4
1179
1179
  margin-left:40.0pt;
1180
1180
  margin-bottom:.0001pt;
1181
1181
  text-align:justify;
1182
- text-indent:-10.0pt;
1182
+ text-indent:-$normalfontsize;
1183
1183
  mso-pagination:widow-orphan;
1184
- font-size:10.0pt;
1185
- font-family:"Arial",sans-serif;
1184
+ font-size:$normalfontsize;
1185
+ font-family:$bodyfont;
1186
1186
  mso-fareast-font-family:"Times New Roman";
1187
1187
  letter-spacing:.4pt;
1188
1188
  mso-ansi-language:EN-GB;
@@ -1198,10 +1198,10 @@ p.MsoIndex5, li.MsoIndex5, div.MsoIndex5
1198
1198
  margin-left:50.0pt;
1199
1199
  margin-bottom:.0001pt;
1200
1200
  text-align:justify;
1201
- text-indent:-10.0pt;
1201
+ text-indent:-$normalfontsize;
1202
1202
  mso-pagination:widow-orphan;
1203
- font-size:10.0pt;
1204
- font-family:"Arial",sans-serif;
1203
+ font-size:$normalfontsize;
1204
+ font-family:$bodyfont;
1205
1205
  mso-fareast-font-family:"Times New Roman";
1206
1206
  letter-spacing:.4pt;
1207
1207
  mso-ansi-language:EN-GB;
@@ -1217,10 +1217,10 @@ p.MsoIndex6, li.MsoIndex6, div.MsoIndex6
1217
1217
  margin-left:60.0pt;
1218
1218
  margin-bottom:.0001pt;
1219
1219
  text-align:justify;
1220
- text-indent:-10.0pt;
1220
+ text-indent:-$normalfontsize;
1221
1221
  mso-pagination:widow-orphan;
1222
- font-size:10.0pt;
1223
- font-family:"Arial",sans-serif;
1222
+ font-size:$normalfontsize;
1223
+ font-family:$bodyfont;
1224
1224
  mso-fareast-font-family:"Times New Roman";
1225
1225
  letter-spacing:.4pt;
1226
1226
  mso-ansi-language:EN-GB;
@@ -1236,10 +1236,10 @@ p.MsoIndex7, li.MsoIndex7, div.MsoIndex7
1236
1236
  margin-left:70.0pt;
1237
1237
  margin-bottom:.0001pt;
1238
1238
  text-align:justify;
1239
- text-indent:-10.0pt;
1239
+ text-indent:-$normalfontsize;
1240
1240
  mso-pagination:widow-orphan;
1241
- font-size:10.0pt;
1242
- font-family:"Arial",sans-serif;
1241
+ font-size:$normalfontsize;
1242
+ font-family:$bodyfont;
1243
1243
  mso-fareast-font-family:"Times New Roman";
1244
1244
  letter-spacing:.4pt;
1245
1245
  mso-ansi-language:EN-GB;
@@ -1255,10 +1255,10 @@ p.MsoIndex8, li.MsoIndex8, div.MsoIndex8
1255
1255
  margin-left:80.0pt;
1256
1256
  margin-bottom:.0001pt;
1257
1257
  text-align:justify;
1258
- text-indent:-10.0pt;
1258
+ text-indent:-$normalfontsize;
1259
1259
  mso-pagination:widow-orphan;
1260
- font-size:10.0pt;
1261
- font-family:"Arial",sans-serif;
1260
+ font-size:$normalfontsize;
1261
+ font-family:$bodyfont;
1262
1262
  mso-fareast-font-family:"Times New Roman";
1263
1263
  letter-spacing:.4pt;
1264
1264
  mso-ansi-language:EN-GB;
@@ -1274,10 +1274,10 @@ p.MsoIndex9, li.MsoIndex9, div.MsoIndex9
1274
1274
  margin-left:90.0pt;
1275
1275
  margin-bottom:.0001pt;
1276
1276
  text-align:justify;
1277
- text-indent:-10.0pt;
1277
+ text-indent:-$normalfontsize;
1278
1278
  mso-pagination:widow-orphan;
1279
- font-size:10.0pt;
1280
- font-family:"Arial",sans-serif;
1279
+ font-size:$normalfontsize;
1280
+ font-family:$bodyfont;
1281
1281
  mso-fareast-font-family:"Times New Roman";
1282
1282
  letter-spacing:.4pt;
1283
1283
  mso-ansi-language:EN-GB;
@@ -1290,7 +1290,7 @@ p.MsoIndexHeading, li.MsoIndexHeading, div.MsoIndexHeading
1290
1290
  margin-bottom:.0001pt;
1291
1291
  text-align:justify;
1292
1292
  mso-pagination:widow-orphan;
1293
- font-size:10.0pt;
1293
+ font-size:$normalfontsize;
1294
1294
  font-family:"Cambria",serif;
1295
1295
  mso-fareast-font-family:"MS Gothic";
1296
1296
  mso-bidi-font-family:"Times New Roman";
@@ -1849,7 +1849,7 @@ table.MsoNormalTable
1849
1849
  mso-para-margin:0cm;
1850
1850
  mso-para-margin-bottom:.0001pt;
1851
1851
  mso-pagination:widow-orphan;
1852
- font-size:10.0pt;
1852
+ font-size:$normalfontsize;
1853
1853
  font-family:$bodyfont;}
1854
1854
  ol
1855
1855
  {margin-bottom:0cm;