metanorma-iso 1.8.0 → 1.8.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (52) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/rake.yml +3 -13
  3. data/.hound.yml +3 -1
  4. data/.rubocop.yml +4 -8
  5. data/lib/asciidoctor/iso/base.rb +14 -11
  6. data/lib/asciidoctor/iso/biblio.rng +1 -0
  7. data/lib/asciidoctor/iso/cleanup.rb +40 -24
  8. data/lib/asciidoctor/iso/front.rb +28 -16
  9. data/lib/asciidoctor/iso/front_id.rb +66 -50
  10. data/lib/asciidoctor/iso/isodoc.rng +191 -3
  11. data/lib/asciidoctor/iso/isostandard-amd.rng +3 -0
  12. data/lib/asciidoctor/iso/isostandard.rng +12 -0
  13. data/lib/asciidoctor/iso/section.rb +2 -1
  14. data/lib/asciidoctor/iso/validate.rb +22 -110
  15. data/lib/asciidoctor/iso/validate_image.rb +97 -0
  16. data/lib/asciidoctor/iso/validate_requirements.rb +26 -20
  17. data/lib/asciidoctor/iso/validate_section.rb +55 -29
  18. data/lib/asciidoctor/iso/validate_style.rb +36 -24
  19. data/lib/asciidoctor/iso/validate_title.rb +2 -4
  20. data/lib/isodoc/iso/base_convert.rb +20 -14
  21. data/lib/isodoc/iso/html/isodoc.css +475 -20
  22. data/lib/isodoc/iso/html/isodoc.scss +456 -23
  23. data/lib/isodoc/iso/html/wordstyle.css +202 -31
  24. data/lib/isodoc/iso/html/wordstyle.scss +194 -32
  25. data/lib/isodoc/iso/iso.amendment.xsl +666 -193
  26. data/lib/isodoc/iso/iso.international-standard.xsl +666 -193
  27. data/lib/isodoc/iso/metadata.rb +3 -2
  28. data/lib/isodoc/iso/presentation_xml_convert.rb +15 -14
  29. data/lib/isodoc/iso/sts_convert.rb +10 -13
  30. data/lib/isodoc/iso/word_convert.rb +153 -39
  31. data/lib/isodoc/iso/xref.rb +44 -29
  32. data/lib/metanorma/iso/processor.rb +1 -0
  33. data/lib/metanorma/iso/version.rb +1 -1
  34. data/metanorma-iso.gemspec +3 -3
  35. data/spec/asciidoctor/base_spec.rb +426 -305
  36. data/spec/asciidoctor/blocks_spec.rb +96 -34
  37. data/spec/asciidoctor/cleanup_spec.rb +383 -25
  38. data/spec/asciidoctor/section_spec.rb +0 -14
  39. data/spec/asciidoctor/validate_spec.rb +218 -83
  40. data/spec/isodoc/amd_spec.rb +193 -201
  41. data/spec/isodoc/blocks_spec.rb +100 -88
  42. data/spec/isodoc/i18n_spec.rb +36 -36
  43. data/spec/isodoc/inline_spec.rb +2 -2
  44. data/spec/isodoc/iso_spec.rb +86 -138
  45. data/spec/isodoc/postproc_spec.rb +492 -442
  46. data/spec/isodoc/ref_spec.rb +6 -6
  47. data/spec/isodoc/section_spec.rb +301 -306
  48. data/spec/isodoc/table_spec.rb +166 -231
  49. data/spec/isodoc/terms_spec.rb +11 -8
  50. data/spec/isodoc/xref_spec.rb +147 -118
  51. data/spec/spec_helper.rb +16 -15
  52. metadata +8 -7
data/lib/isodoc/iso/html/wordstyle.css CHANGED
@@ -40,6 +40,14 @@
40
40
  mso-font-pitch: variable;
41
41
  mso-font-signature: -536870145 1073743103 0 0 415 0; }
42
42
 
43
+ @font-face {
44
+ font-family: "Segoe UI";
45
+ panose-1: 2 11 5 2 4 2 4 2 2 3;
46
+ mso-font-charset: 0;
47
+ mso-generic-font-family: swiss;
48
+ mso-font-pitch: variable;
49
+ mso-font-signature: -469750017 -1073683329 9 0 511 0; }
50
+
43
51
  @font-face {
44
52
  font-family: "Malgun Gothic";
45
53
  panose-1: 2 11 5 3 2 0 0 2 0 4;
@@ -63,7 +71,7 @@ p.MsoNormal, li.MsoNormal, div.MsoNormal {
63
71
  mso-style-parent: "";
64
72
  margin-top: 0cm;
65
73
  margin-right: 0cm;
66
- margin-bottom: 12.0pt;
74
+ margin-bottom: 6.0pt;
67
75
  margin-left: 0cm;
68
76
  text-align: justify;
69
77
  line-height: 12.0pt;
@@ -119,15 +127,105 @@ p.MsoBlockText, li.MsoBlockText, div.MsoBlockText {
119
127
  mso-ansi-language: EN-AU;
120
128
  font-style: italic; }
121
129
 
130
+ p.MsoList, li.MsoList, div.MsoList {
131
+ mso-style-priority: 4;
132
+ mso-style-unhide: no;
133
+ mso-style-parent: "MsoListParagraph";
134
+ margin-top: 0cm;
135
+ margin-right: 0cm;
136
+ margin-bottom: 6.0pt;
137
+ /* do not put in margin-left, it is specific to list level */
138
+ mso-add-space: auto;
139
+ text-align: justify;
140
+ line-height: 12.0pt;
141
+ mso-pagination: widow-orphan;
142
+ page-break-after: avoid;
143
+ mso-list: l3 level1 lfo20;
144
+ font-size: {{normalfontsize}};
145
+ font-family: {{bodyfont}};
146
+ mso-fareast-font-family: Calibri;
147
+ mso-bidi-font-family: "Times New Roman";
148
+ mso-ansi-language: EN-GB;
149
+ mso-fareast-language: EN-US; }
150
+
151
+ p.MsoListCxSpFirst, li.MsoListCxSpFirst, div.MsoListCxSpFirst {
152
+ mso-style-priority: 4;
153
+ mso-style-unhide: no;
154
+ mso-style-parent: "MsoListParagraph";
155
+ mso-style-type: export-only;
156
+ margin-top: 0cm;
157
+ margin-right: 0cm;
158
+ margin-bottom: 0cm;
159
+ /* do not put in margin-left, it is specific to list level */
160
+ mso-add-space: auto;
161
+ text-align: justify;
162
+ line-height: 12.0pt;
163
+ mso-pagination: widow-orphan;
164
+ page-break-after: avoid;
165
+ mso-list: l3 level1 lfo20;
166
+ font-size: {{normalfontsize}};
167
+ font-family: {{bodyfont}};
168
+ mso-fareast-font-family: Calibri;
169
+ mso-bidi-font-family: "Times New Roman";
170
+ mso-ansi-language: EN-GB;
171
+ mso-fareast-language: EN-US; }
172
+
173
+ p.MsoListCxSpMiddle, li.MsoListCxSpMiddle, div.MsoListCxSpMiddle {
174
+ mso-style-priority: 4;
175
+ mso-style-unhide: no;
176
+ mso-style-parent: "MsoListParagraph";
177
+ mso-style-type: export-only;
178
+ margin-top: 0cm;
179
+ margin-right: 0cm;
180
+ margin-bottom: 0cm;
181
+ /* do not put in margin-left, it is specific to list level */
182
+ mso-add-space: auto;
183
+ text-align: justify;
184
+ line-height: 12.0pt;
185
+ mso-pagination: widow-orphan;
186
+ page-break-after: avoid;
187
+ mso-list: l3 level1 lfo20;
188
+ font-size: {{normalfontsize}};
189
+ font-family: {{bodyfont}};
190
+ mso-fareast-font-family: Calibri;
191
+ mso-bidi-font-family: "Times New Roman";
192
+ mso-ansi-language: EN-GB;
193
+ mso-fareast-language: EN-US; }
194
+
195
+ p.MsoListCxSpLast, li.MsoListCxSpLast, div.MsoListCxSpLast {
196
+ mso-style-priority: 4;
197
+ mso-style-unhide: no;
198
+ mso-style-parent: "MsoListParagraph";
199
+ mso-style-type: export-only;
200
+ margin-top: 0cm;
201
+ margin-right: 0cm;
202
+ margin-bottom: 6.0pt;
203
+ /* do not put in margin-left, it is specific to list level */
204
+ mso-add-space: auto;
205
+ text-align: justify;
206
+ line-height: 12.0pt;
207
+ mso-pagination: widow-orphan;
208
+ page-break-after: avoid;
209
+ mso-list: l3 level1 lfo20;
210
+ font-size: {{normalfontsize}};
211
+ font-family: {{bodyfont}};
212
+ mso-fareast-font-family: Calibri;
213
+ mso-bidi-font-family: "Times New Roman";
214
+ mso-ansi-language: EN-GB;
215
+ mso-fareast-language: EN-US; }
216
+
122
217
  p.MsoListParagraph, li.MsoListParagraph, div.MsoListParagraph {
123
218
  mso-style-priority: 34;
124
219
  mso-style-unhide: no;
125
220
  mso-style-qformat: yes;
126
221
  margin-top: 0cm;
127
222
  margin-right: 0cm;
128
- margin-bottom: 12.0pt;
223
+ margin-bottom: 6.0pt;
129
224
  /* do not put in margin-left, it is specific to list level */
225
+ text-align: justify;
226
+ line-height: 12.0pt;
130
227
  mso-pagination: widow-orphan;
228
+ tab-stops: 20.15pt;
131
229
  font-size: {{normalfontsize}};
132
230
  font-family: {{bodyfont}};
133
231
  mso-ansi-language: EN-AU;
@@ -140,9 +238,12 @@ p.MsoListParagraphCxSpFirst, li.MsoListParagraphCxSpFirst, div.MsoListParagraphC
140
238
  mso-style-type: export-only;
141
239
  margin-top: 0cm;
142
240
  margin-right: 0cm;
143
- margin-bottom: 12.0pt;
241
+ margin-bottom: 0cm;
144
242
  /* do not put in margin-left, it is specific to list level */
243
+ text-align: justify;
244
+ line-height: 12.0pt;
145
245
  mso-pagination: widow-orphan;
246
+ tab-stops: 20.15pt;
146
247
  font-size: {{normalfontsize}};
147
248
  font-family: {{bodyfont}};
148
249
  mso-ansi-language: EN-AU;
@@ -155,9 +256,12 @@ p.MsoListParagraphCxSpMiddle, li.MsoListParagraphCxSpMiddle, div.MsoListParagrap
155
256
  mso-style-type: export-only;
156
257
  margin-top: 0cm;
157
258
  margin-right: 0cm;
158
- margin-bottom: 12.0pt;
259
+ margin-bottom: 0cm;
159
260
  /* do not put in margin-left, it is specific to list level */
261
+ text-align: justify;
262
+ line-height: 12.0pt;
160
263
  mso-pagination: widow-orphan;
264
+ tab-stops: 20.15pt;
161
265
  font-size: {{normalfontsize}};
162
266
  font-family: {{bodyfont}};
163
267
  mso-ansi-language: EN-AU;
@@ -170,9 +274,12 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
170
274
  mso-style-type: export-only;
171
275
  margin-top: 0cm;
172
276
  margin-right: 0cm;
173
- margin-bottom: 12.0pt;
277
+ margin-bottom: 6.0pt;
174
278
  /* do not put in margin-left, it is specific to list level */
279
+ text-align: justify;
280
+ line-height: 12.0pt;
175
281
  mso-pagination: widow-orphan;
282
+ tab-stops: 20.15pt;
176
283
  font-size: {{normalfontsize}};
177
284
  font-family: {{bodyfont}};
178
285
  mso-ansi-language: EN-AU;
@@ -189,7 +296,7 @@ h1 {
189
296
  mso-style-next: Normal;
190
297
  margin-top: 13.5pt;
191
298
  margin-right: 0cm;
192
- margin-bottom: 12.0pt;
299
+ margin-bottom: 6.0pt;
193
300
  margin-left: 0cm;
194
301
  text-indent: 0cm;
195
302
  line-height: 13.5pt;
@@ -205,6 +312,7 @@ h1 {
205
312
  font-weight: normal;
206
313
  {% else %}
207
314
  font-size: 13.0pt;
315
+ font-weight: bold;
208
316
  {% endif %}
209
317
  mso-bidi-font-size: {{normalfontsize}};
210
318
  font-family: {{headerfont}};
@@ -227,7 +335,7 @@ h1.Annex {
227
335
  mso-style-next: Normal;
228
336
  margin-top: 13.5pt;
229
337
  margin-right: 0cm;
230
- margin-bottom: 12.0pt;
338
+ margin-bottom: 6.0pt;
231
339
  margin-left: 0cm;
232
340
  text-indent: 0cm;
233
341
  line-height: 13.5pt;
@@ -257,7 +365,7 @@ h1.Annex {
257
365
  mso-style-next: Normal;
258
366
  margin-top: 3.0pt;
259
367
  margin-right: 0cm;
260
- margin-bottom: 12.0pt;
368
+ margin-bottom: 6.0pt;
261
369
  margin-left: 0cm;
262
370
  text-indent: 0cm;
263
371
  line-height: 12.5pt;
@@ -293,7 +401,7 @@ h2 {
293
401
  mso-style-next: Normal;
294
402
  margin-top: 3.0pt;
295
403
  margin-right: 0cm;
296
- margin-bottom: 12.0pt;
404
+ margin-bottom: 6.0pt;
297
405
  margin-left: 0cm;
298
406
  text-indent: 0cm;
299
407
  line-height: 12.0pt;
@@ -329,7 +437,7 @@ h3 {
329
437
  mso-style-next: Normal;
330
438
  margin-top: 3.0pt;
331
439
  margin-right: 0cm;
332
- margin-bottom: 12.0pt;
440
+ margin-bottom: 6.0pt;
333
441
  margin-left: 0cm;
334
442
  text-indent: 0cm;
335
443
  line-height: 12.0pt;
@@ -363,7 +471,7 @@ h4 {
363
471
  mso-style-next: Normal;
364
472
  margin-top: 3.0pt;
365
473
  margin-right: 0cm;
366
- margin-bottom: 12.0pt;
474
+ margin-bottom: 6.0pt;
367
475
  margin-left: 0cm;
368
476
  text-indent: 0cm;
369
477
  line-height: 12.0pt;
@@ -397,7 +505,7 @@ h6 {
397
505
  mso-style-next: Normal;
398
506
  margin-top: 3.0pt;
399
507
  margin-right: 0cm;
400
- margin-bottom: 12.0pt;
508
+ margin-bottom: 6.0pt;
401
509
  margin-left: 0cm;
402
510
  text-indent: 0cm;
403
511
  line-height: 12.0pt;
@@ -430,7 +538,6 @@ p.MsoToc1, li.MsoToc1, div.MsoToc1 {
430
538
  margin-right: 25.0pt;
431
539
  margin-bottom: 0cm;
432
540
  margin-left: 36.0pt;
433
- margin-bottom: .0001pt;
434
541
  text-indent: -36.0pt;
435
542
  line-height: 12.0pt;
436
543
  mso-pagination: widow-orphan;
@@ -454,7 +561,6 @@ p.MsoToc2, li.MsoToc2, div.MsoToc2 {
454
561
  margin-right: 25.0pt;
455
562
  margin-bottom: 0cm;
456
563
  margin-left: 36.0pt;
457
- margin-bottom: .0001pt;
458
564
  text-indent: -36.0pt;
459
565
  line-height: 12.0pt;
460
566
  mso-pagination: widow-orphan;
@@ -478,7 +584,6 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3 {
478
584
  margin-right: 25.0pt;
479
585
  margin-bottom: 0cm;
480
586
  margin-left: 36.0pt;
481
- margin-bottom: .0001pt;
482
587
  text-indent: -36.0pt;
483
588
  line-height: 12.0pt;
484
589
  mso-pagination: widow-orphan;
@@ -580,6 +685,27 @@ span.MsoFootnoteReference {
580
685
  mso-style-priority: 99;
581
686
  vertical-align: super; }
582
687
 
688
+ p.MsoCaption, li.MsoCaption, div.MsoCaption {
689
+ mso-style-priority: 35;
690
+ mso-style-qformat: yes;
691
+ mso-style-next: Normal;
692
+ margin-top: 0cm;
693
+ margin-right: 0cm;
694
+ margin-bottom: 10.0pt;
695
+ margin-left: 0cm;
696
+ text-align: justify;
697
+ mso-pagination: widow-orphan;
698
+ tab-stops: 20.15pt;
699
+ font-size: 9.0pt;
700
+ font-family: {{bodyfont}};
701
+ mso-fareast-font-family: Calibri;
702
+ mso-bidi-font-family: "Times New Roman";
703
+ color: #44546A;
704
+ mso-themecolor: text2;
705
+ mso-ansi-language: EN-GB;
706
+ mso-fareast-language: EN-US;
707
+ font-style: italic; }
708
+
583
709
  p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText {
584
710
  mso-style-noshow: yes;
585
711
  mso-style-priority: 99;
@@ -611,6 +737,7 @@ p.MsoBodyText, li.MsoBodyText, div.MsoBodyText {
611
737
  text-align: justify;
612
738
  line-height: 12.0pt;
613
739
  mso-pagination: widow-orphan;
740
+ tab-stops: 20.15pt;
614
741
  font-size: {{normalfontsize}};
615
742
  font-family: {{bodyfont}};
616
743
  mso-fareast-font-family: "SimSun",serif;
@@ -632,7 +759,49 @@ a:visited, span.MsoHyperlinkFollowed {
632
759
  mso-themecolor: followedhyperlink;
633
760
  text-decoration: underline;
634
761
  text-underline: single;
635
- color: purple; }
762
+ color: #954F72; }
763
+
764
+ p {
765
+ mso-style-noshow: yes;
766
+ mso-style-priority: 99;
767
+ mso-margin-top-alt: auto;
768
+ margin-right: 0cm;
769
+ mso-margin-bottom-alt: auto;
770
+ mso-pagination: widow-orphan;
771
+ font-size: {{normalfontsize}};
772
+ font-family: {{bodyfont}};
773
+ mso-fareast-font-family: "Times New Roman";
774
+ mso-ansi-language: EN-US;
775
+ mso-fareast-language: EN-US; }
776
+
777
+ p.MsoAcetate, li.MsoAcetate, div.MsoAcetate {
778
+ mso-style-noshow: yes;
779
+ mso-style-priority: 99;
780
+ mso-style-link: "Balloon Text Char";
781
+ margin: 0cm;
782
+ text-align: justify;
783
+ mso-pagination: widow-orphan;
784
+ tab-stops: 20.15pt;
785
+ font-size: 9.0pt;
786
+ font-family: "Segoe UI",sans-serif;
787
+ mso-fareast-font-family: Calibri;
788
+ mso-ansi-language: EN-GB;
789
+ mso-fareast-language: EN-US; }
790
+
791
+ span.Char1 {
792
+ mso-style-name: "Balloon Text Char";
793
+ mso-style-noshow: yes;
794
+ mso-style-priority: 99;
795
+ mso-style-unhide: no;
796
+ mso-style-locked: yes;
797
+ mso-style-link: "Balloon Text";
798
+ mso-ansi-font-size: 9.0pt;
799
+ mso-bidi-font-size: 9.0pt;
800
+ font-family: "Segoe UI",sans-serif;
801
+ mso-ascii-font-family: "Segoe UI";
802
+ mso-hansi-font-family: "Segoe UI";
803
+ mso-bidi-font-family: "Segoe UI";
804
+ mso-ansi-language: EN-GB; }
636
805
 
637
806
  span.MsoPlaceholderText {
638
807
  mso-style-noshow: yes;
@@ -641,7 +810,7 @@ span.MsoPlaceholderText {
641
810
  mso-style-parent: "";
642
811
  color: gray; }
643
812
 
644
- span.Heading1Char {
813
+ span.Heading1Char, span.1Char {
645
814
  mso-style-name: "Heading 1 Char";
646
815
  mso-style-priority: 1;
647
816
  mso-style-unhide: no;
@@ -661,7 +830,7 @@ span.Heading1Char {
661
830
  {% endif %}
662
831
  mso-bidi-font-weight: normal; }
663
832
 
664
- span.Heading2Char {
833
+ span.Heading2Char, span.2Char {
665
834
  mso-style-name: "Heading 2 Char";
666
835
  mso-style-priority: 2;
667
836
  mso-style-unhide: no;
@@ -678,7 +847,7 @@ span.Heading2Char {
678
847
  font-weight: bold;
679
848
  mso-bidi-font-weight: normal; }
680
849
 
681
- span.Heading3Char {
850
+ span.Heading3Char, span.3Char {
682
851
  mso-style-name: "Heading 3 Char";
683
852
  mso-style-priority: 3;
684
853
  mso-style-unhide: no;
@@ -695,7 +864,7 @@ span.Heading3Char {
695
864
  font-weight: bold;
696
865
  mso-bidi-font-weight: normal; }
697
866
 
698
- span.Heading4Char {
867
+ span.Heading4Char, span.4Char {
699
868
  mso-style-name: "Heading 4 Char";
700
869
  mso-style-priority: 4;
701
870
  mso-style-unhide: no;
@@ -712,7 +881,7 @@ span.Heading4Char {
712
881
  font-weight: bold;
713
882
  mso-bidi-font-weight: normal; }
714
883
 
715
- span.Heading5Char {
884
+ span.Heading5Char, span.5Char {
716
885
  mso-style-name: "Heading 5 Char";
717
886
  mso-style-priority: 5;
718
887
  mso-style-unhide: no;
@@ -729,7 +898,7 @@ span.Heading5Char {
729
898
  font-weight: bold;
730
899
  mso-bidi-font-weight: normal; }
731
900
 
732
- span.Heading6Char {
901
+ span.Heading6Char, span.6Char {
733
902
  mso-style-name: "Heading 6 Char";
734
903
  mso-style-priority: 6;
735
904
  mso-style-unhide: no;
@@ -753,7 +922,7 @@ p.a2, li.a2, div.a2 {
753
922
  mso-style-next: Normal;
754
923
  margin-top: 13.5pt;
755
924
  margin-right: 0cm;
756
- margin-bottom: 12.0pt;
925
+ margin-bottom: 6.0pt;
757
926
  margin-left: 0cm;
758
927
  text-indent: 0cm;
759
928
  line-height: 13.5pt;
@@ -779,7 +948,7 @@ p.a3, li.a3, div.a3 {
779
948
  mso-style-next: Normal;
780
949
  margin-top: 3.0pt;
781
950
  margin-right: 0cm;
782
- margin-bottom: 12.0pt;
951
+ margin-bottom: 6.0pt;
783
952
  margin-left: 0cm;
784
953
  text-indent: 0cm;
785
954
  line-height: 12.5pt;
@@ -805,7 +974,7 @@ p.a4, li.a4, div.a4 {
805
974
  mso-style-next: Normal;
806
975
  margin-top: 3.0pt;
807
976
  margin-right: 0cm;
808
- margin-bottom: 12.0pt;
977
+ margin-bottom: 6.0pt;
809
978
  margin-left: 0cm;
810
979
  text-indent: 0cm;
811
980
  line-height: 12.0pt;
@@ -830,7 +999,7 @@ p.a5, li.a5, div.a5 {
830
999
  mso-style-next: Normal;
831
1000
  margin-top: 3.0pt;
832
1001
  margin-right: 0cm;
833
- margin-bottom: 12.0pt;
1002
+ margin-bottom: 6.0pt;
834
1003
  margin-left: 0cm;
835
1004
  text-indent: 0cm;
836
1005
  line-height: 12.0pt;
@@ -855,7 +1024,7 @@ p.a6, li.a6, div.a6 {
855
1024
  mso-style-next: Normal;
856
1025
  margin-top: 3.0pt;
857
1026
  margin-right: 0cm;
858
- margin-bottom: 12.0pt;
1027
+ margin-bottom: 6.0pt;
859
1028
  margin-left: 0cm;
860
1029
  text-indent: 0cm;
861
1030
  line-height: 12.0pt;
@@ -872,7 +1041,7 @@ p.a6, li.a6, div.a6 {
872
1041
  mso-fareast-language: JA;
873
1042
  font-weight: bold; }
874
1043
 
875
- span.FooterChar {
1044
+ span.FooterChar, span.Char {
876
1045
  mso-style-name: "Footer Char";
877
1046
  mso-style-noshow: yes;
878
1047
  mso-style-priority: 99;
@@ -884,7 +1053,7 @@ span.FooterChar {
884
1053
  mso-bidi-font-size: {{normalfontsize}};
885
1054
  mso-ansi-language: EN-GB; }
886
1055
 
887
- span.HeaderChar {
1056
+ span.HeaderChar, span.Char0 {
888
1057
  mso-style-name: "Header Char";
889
1058
  mso-style-noshow: yes;
890
1059
  mso-style-priority: 99;
@@ -898,7 +1067,7 @@ span.HeaderChar {
898
1067
  font-weight: bold;
899
1068
  mso-bidi-font-weight: normal; }
900
1069
 
901
- span.BodyTextChar {
1070
+ span.BodyTextChar, span.Char3 {
902
1071
  mso-style-name: "Body Text Char";
903
1072
  mso-style-noshow: yes;
904
1073
  mso-style-priority: 99;
@@ -968,7 +1137,7 @@ p.Tablebody, li.Tablebody, div.Tablebody {
968
1137
  margin-right: 0cm;
969
1138
  margin-bottom: 3.0pt;
970
1139
  margin-left: 0cm;
971
- line-height: 10.5pt;
1140
+ line-height: 12.0pt;
972
1141
  mso-pagination: widow-orphan;
973
1142
  font-size: {{smallerfontsize}};
974
1143
  mso-bidi-font-size: {{normalfontsize}};
@@ -980,6 +1149,8 @@ p.Tablebody, li.Tablebody, div.Tablebody {
980
1149
  .MsoChpDefault {
981
1150
  mso-style-type: export-only;
982
1151
  mso-default-props: yes;
1152
+ font-family: {{bodyfont}};
1153
+ font-size: 10.0pt;
983
1154
  mso-ascii-font-family: {{bodyfont}};
984
1155
  mso-fareast-font-family: "SimSun",serif;
985
1156
  mso-hansi-font-family: {{bodyfont}}; }