metanorma-iso 1.8.4 → 1.9.0.1

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 (39) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/rake.yml +1 -1
  3. data/.rubocop.yml +1 -1
  4. data/lib/asciidoctor/iso/cleanup.rb +0 -1
  5. data/lib/asciidoctor/iso/isodoc.rng +50 -8
  6. data/lib/asciidoctor/iso/isostandard.rng +7 -3
  7. data/lib/asciidoctor/iso/section.rb +3 -0
  8. data/lib/asciidoctor/iso/validate.rb +4 -17
  9. data/lib/asciidoctor/iso/validate_section.rb +50 -34
  10. data/lib/asciidoctor/iso/validate_style.rb +3 -3
  11. data/lib/isodoc/iso/base_convert.rb +41 -16
  12. data/lib/isodoc/iso/html/isodoc.css +475 -20
  13. data/lib/isodoc/iso/html/isodoc.scss +456 -23
  14. data/lib/isodoc/iso/html/wordstyle.css +202 -31
  15. data/lib/isodoc/iso/html/wordstyle.scss +194 -32
  16. data/lib/isodoc/iso/iso.amendment.xsl +480 -388
  17. data/lib/isodoc/iso/iso.international-standard.xsl +480 -388
  18. data/lib/isodoc/iso/isosts_convert.rb +12 -13
  19. data/lib/isodoc/iso/metadata.rb +2 -2
  20. data/lib/isodoc/iso/presentation_xml_convert.rb +62 -9
  21. data/lib/isodoc/iso/sts_convert.rb +4 -5
  22. data/lib/isodoc/iso/word_convert.rb +153 -39
  23. data/lib/isodoc/iso/xref.rb +17 -1
  24. data/lib/metanorma/iso/version.rb +1 -1
  25. data/metanorma-iso.gemspec +4 -4
  26. data/spec/asciidoctor/section_spec.rb +128 -7
  27. data/spec/asciidoctor/validate_spec.rb +15 -15
  28. data/spec/isodoc/amd_spec.rb +193 -201
  29. data/spec/isodoc/blocks_spec.rb +100 -88
  30. data/spec/isodoc/i18n_spec.rb +36 -36
  31. data/spec/isodoc/inline_spec.rb +472 -2
  32. data/spec/isodoc/iso_spec.rb +86 -138
  33. data/spec/isodoc/postproc_spec.rb +19 -10
  34. data/spec/isodoc/ref_spec.rb +6 -6
  35. data/spec/isodoc/section_spec.rb +394 -276
  36. data/spec/isodoc/table_spec.rb +166 -231
  37. data/spec/isodoc/terms_spec.rb +11 -8
  38. data/spec/isodoc/xref_spec.rb +147 -118
  39. metadata +8 -8
data/lib/isodoc/iso/html/wordstyle.scss CHANGED
@@ -34,6 +34,13 @@
34
34
  mso-generic-font-family:roman;
35
35
  mso-font-pitch:variable;
36
36
  mso-font-signature:-536870145 1073743103 0 0 415 0;}
37
+ @font-face
38
+ {font-family:"Segoe UI";
39
+ panose-1:2 11 5 2 4 2 4 2 2 3;
40
+ mso-font-charset:0;
41
+ mso-generic-font-family:swiss;
42
+ mso-font-pitch:variable;
43
+ mso-font-signature:-469750017 -1073683329 9 0 511 0;}
37
44
  @font-face
38
45
  {font-family:"Malgun Gothic";
39
46
  panose-1:2 11 5 3 2 0 0 2 0 4;
@@ -55,7 +62,7 @@ p.MsoNormal, li.MsoNormal, div.MsoNormal
55
62
  mso-style-parent:"";
56
63
  margin-top:0cm;
57
64
  margin-right:0cm;
58
- margin-bottom:12.0pt;
65
+ margin-bottom:6.0pt;
59
66
  margin-left:0cm;
60
67
  text-align:justify;
61
68
  line-height:12.0pt;
@@ -108,15 +115,101 @@ p.MsoBlockText, li.MsoBlockText, div.MsoBlockText
108
115
  mso-themecolor:accent1;
109
116
  mso-ansi-language:EN-AU;
110
117
  font-style:italic;}
118
+ p.MsoList, li.MsoList, div.MsoList
119
+ {mso-style-priority:4;
120
+ mso-style-unhide:no;
121
+ mso-style-parent:"MsoListParagraph";
122
+ margin-top:0cm;
123
+ margin-right:0cm;
124
+ margin-bottom:6.0pt;
125
+ /* do not put in margin-left, it is specific to list level */
126
+ mso-add-space:auto;
127
+ text-align:justify;
128
+ line-height:12.0pt;
129
+ mso-pagination:widow-orphan;
130
+ page-break-after:avoid;
131
+ mso-list:l3 level1 lfo20;
132
+ font-size:$normalfontsize;
133
+ font-family:$bodyfont;
134
+ mso-fareast-font-family:Calibri;
135
+ mso-bidi-font-family:"Times New Roman";
136
+ mso-ansi-language:EN-GB;
137
+ mso-fareast-language:EN-US;}
138
+ p.MsoListCxSpFirst, li.MsoListCxSpFirst, div.MsoListCxSpFirst
139
+ {mso-style-priority:4;
140
+ mso-style-unhide:no;
141
+ mso-style-parent:"MsoListParagraph";
142
+ mso-style-type:export-only;
143
+ margin-top:0cm;
144
+ margin-right:0cm;
145
+ margin-bottom:0cm;
146
+ /* do not put in margin-left, it is specific to list level */
147
+ mso-add-space:auto;
148
+ text-align:justify;
149
+ line-height:12.0pt;
150
+ mso-pagination:widow-orphan;
151
+ page-break-after:avoid;
152
+ mso-list:l3 level1 lfo20;
153
+ font-size:$normalfontsize;
154
+ font-family:$bodyfont;
155
+ mso-fareast-font-family:Calibri;
156
+ mso-bidi-font-family:"Times New Roman";
157
+ mso-ansi-language:EN-GB;
158
+ mso-fareast-language:EN-US;}
159
+ p.MsoListCxSpMiddle, li.MsoListCxSpMiddle, div.MsoListCxSpMiddle
160
+ {mso-style-priority:4;
161
+ mso-style-unhide:no;
162
+ mso-style-parent:"MsoListParagraph";
163
+ mso-style-type:export-only;
164
+ margin-top:0cm;
165
+ margin-right:0cm;
166
+ margin-bottom:0cm;
167
+ /* do not put in margin-left, it is specific to list level */
168
+ mso-add-space:auto;
169
+ text-align:justify;
170
+ line-height:12.0pt;
171
+ mso-pagination:widow-orphan;
172
+ page-break-after:avoid;
173
+ mso-list:l3 level1 lfo20;
174
+ font-size:$normalfontsize;
175
+ font-family:$bodyfont;
176
+ mso-fareast-font-family:Calibri;
177
+ mso-bidi-font-family:"Times New Roman";
178
+ mso-ansi-language:EN-GB;
179
+ mso-fareast-language:EN-US;}
180
+ p.MsoListCxSpLast, li.MsoListCxSpLast, div.MsoListCxSpLast
181
+ {mso-style-priority:4;
182
+ mso-style-unhide:no;
183
+ mso-style-parent:"MsoListParagraph";
184
+ mso-style-type:export-only;
185
+ margin-top:0cm;
186
+ margin-right:0cm;
187
+ margin-bottom:6.0pt;
188
+ /* do not put in margin-left, it is specific to list level */
189
+ mso-add-space:auto;
190
+ text-align:justify;
191
+ line-height:12.0pt;
192
+ mso-pagination:widow-orphan;
193
+ page-break-after:avoid;
194
+ mso-list:l3 level1 lfo20;
195
+ font-size:$normalfontsize;
196
+ font-family:$bodyfont;
197
+ mso-fareast-font-family:Calibri;
198
+ mso-bidi-font-family:"Times New Roman";
199
+ mso-ansi-language:EN-GB;
200
+ mso-fareast-language:EN-US;}
111
201
  p.MsoListParagraph, li.MsoListParagraph, div.MsoListParagraph
112
202
  {mso-style-priority:34;
113
203
  mso-style-unhide:no;
114
204
  mso-style-qformat:yes;
115
205
  margin-top:0cm;
116
206
  margin-right:0cm;
117
- margin-bottom:12.0pt;
207
+ margin-bottom:6.0pt;
118
208
  /* do not put in margin-left, it is specific to list level */
209
+ text-align:justify;
210
+ line-height:12.0pt;
119
211
  mso-pagination:widow-orphan;
212
+ tab-stops:20.15pt;
120
213
  font-size:$normalfontsize;
121
214
  font-family:$bodyfont;
122
215
  mso-ansi-language:EN-AU;
@@ -128,9 +221,12 @@ p.MsoListParagraphCxSpFirst, li.MsoListParagraphCxSpFirst, div.MsoListParagraphC
128
221
  mso-style-type:export-only;
129
222
  margin-top:0cm;
130
223
  margin-right:0cm;
131
- margin-bottom:12.0pt;
224
+ margin-bottom:0cm;
132
225
  /* do not put in margin-left, it is specific to list level */
226
+ text-align:justify;
227
+ line-height:12.0pt;
133
228
  mso-pagination:widow-orphan;
229
+ tab-stops:20.15pt;
134
230
  font-size:$normalfontsize;
135
231
  font-family:$bodyfont;
136
232
  mso-ansi-language:EN-AU;
@@ -142,9 +238,12 @@ p.MsoListParagraphCxSpMiddle, li.MsoListParagraphCxSpMiddle, div.MsoListParagrap
142
238
  mso-style-type:export-only;
143
239
  margin-top:0cm;
144
240
  margin-right:0cm;
145
- margin-bottom:12.0pt;
241
+ margin-bottom:0cm;
146
242
  /* do not put in margin-left, it is specific to list level */
243
+ text-align:justify;
244
+ line-height:12.0pt;
147
245
  mso-pagination:widow-orphan;
246
+ tab-stops:20.15pt;
148
247
  font-size:$normalfontsize;
149
248
  font-family:$bodyfont;
150
249
  mso-ansi-language:EN-AU;
@@ -156,9 +255,12 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
156
255
  mso-style-type:export-only;
157
256
  margin-top:0cm;
158
257
  margin-right:0cm;
159
- margin-bottom:12.0pt;
258
+ margin-bottom:6.0pt;
160
259
  /* do not put in margin-left, it is specific to list level */
260
+ text-align:justify;
261
+ line-height:12.0pt;
161
262
  mso-pagination:widow-orphan;
263
+ tab-stops:20.15pt;
162
264
  font-size:$normalfontsize;
163
265
  font-family:$bodyfont;
164
266
  mso-ansi-language:EN-AU;
@@ -174,7 +276,7 @@ h1
174
276
  mso-style-next:Normal;
175
277
  margin-top:13.5pt;
176
278
  margin-right:0cm;
177
- margin-bottom:12.0pt;
279
+ margin-bottom:6.0pt;
178
280
  margin-left:0cm;
179
281
  text-indent:0cm;
180
282
  line-height:13.5pt;
@@ -187,9 +289,10 @@ h1
187
289
  {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
188
290
  font-style: italic ;
189
291
  font-size:$normalfontsize;
190
- font-weight: normal ;
292
+ font-weight: normal;
191
293
  {% else %}
192
294
  font-size:13.0pt;
295
+ font-weight: bold;
193
296
  {% endif %}
194
297
  mso-bidi-font-size:$normalfontsize;
195
298
  font-family:$headerfont;
@@ -211,7 +314,7 @@ h1.Annex
211
314
  mso-style-next:Normal;
212
315
  margin-top:13.5pt;
213
316
  margin-right:0cm;
214
- margin-bottom:12.0pt;
317
+ margin-bottom:6.0pt;
215
318
  margin-left:0cm;
216
319
  text-indent:0cm;
217
320
  line-height:13.5pt;
@@ -240,7 +343,7 @@ h1.Annex
240
343
  mso-style-next:Normal;
241
344
  margin-top:3.0pt;
242
345
  margin-right:0cm;
243
- margin-bottom:12.0pt;
346
+ margin-bottom:6.0pt;
244
347
  margin-left:0cm;
245
348
  text-indent:0cm;
246
349
  line-height:12.5pt;
@@ -275,7 +378,7 @@ h2
275
378
  mso-style-next:Normal;
276
379
  margin-top:3.0pt;
277
380
  margin-right:0cm;
278
- margin-bottom:12.0pt;
381
+ margin-bottom:6.0pt;
279
382
  margin-left:0cm;
280
383
  text-indent:0cm;
281
384
  line-height:12.0pt;
@@ -309,7 +412,7 @@ h3 {mso-list:l1 level3 lfo6;
309
412
  mso-style-next:Normal;
310
413
  margin-top:3.0pt;
311
414
  margin-right:0cm;
312
- margin-bottom:12.0pt;
415
+ margin-bottom:6.0pt;
313
416
  margin-left:0cm;
314
417
  text-indent:0cm;
315
418
  line-height:12.0pt;
@@ -341,7 +444,7 @@ h4 {mso-list:l1 level4 lfo6;
341
444
  mso-style-next:Normal;
342
445
  margin-top:3.0pt;
343
446
  margin-right:0cm;
344
- margin-bottom:12.0pt;
447
+ margin-bottom:6.0pt;
345
448
  margin-left:0cm;
346
449
  text-indent:0cm;
347
450
  line-height:12.0pt;
@@ -373,7 +476,7 @@ h6
373
476
  mso-style-next:Normal;
374
477
  margin-top:3.0pt;
375
478
  margin-right:0cm;
376
- margin-bottom:12.0pt;
479
+ margin-bottom:6.0pt;
377
480
  margin-left:0cm;
378
481
  text-indent:0cm;
379
482
  line-height:12.0pt;
@@ -404,7 +507,6 @@ p.MsoToc1, li.MsoToc1, div.MsoToc1
404
507
  margin-right:25.0pt;
405
508
  margin-bottom:0cm;
406
509
  margin-left:36.0pt;
407
- margin-bottom:.0001pt;
408
510
  text-indent:-36.0pt;
409
511
  line-height:12.0pt;
410
512
  mso-pagination:widow-orphan;
@@ -427,7 +529,6 @@ p.MsoToc2, li.MsoToc2, div.MsoToc2
427
529
  margin-right:25.0pt;
428
530
  margin-bottom:0cm;
429
531
  margin-left:36.0pt;
430
- margin-bottom:.0001pt;
431
532
  text-indent:-36.0pt;
432
533
  line-height:12.0pt;
433
534
  mso-pagination:widow-orphan;
@@ -450,7 +551,6 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3
450
551
  margin-right:25.0pt;
451
552
  margin-bottom:0cm;
452
553
  margin-left:36.0pt;
453
- margin-bottom:.0001pt;
454
554
  text-indent:-36.0pt;
455
555
  line-height:12.0pt;
456
556
  mso-pagination:widow-orphan;
@@ -546,6 +646,26 @@ p.MsoFooterLandscape, li.MsoFooterLandscape, div.MsoFooterLandscape
546
646
  span.MsoFootnoteReference
547
647
  {mso-style-priority:99;
548
648
  vertical-align:super;}
649
+ p.MsoCaption, li.MsoCaption, div.MsoCaption
650
+ {mso-style-priority:35;
651
+ mso-style-qformat:yes;
652
+ mso-style-next:Normal;
653
+ margin-top:0cm;
654
+ margin-right:0cm;
655
+ margin-bottom:10.0pt;
656
+ margin-left:0cm;
657
+ text-align:justify;
658
+ mso-pagination:widow-orphan;
659
+ tab-stops:20.15pt;
660
+ font-size:9.0pt;
661
+ font-family:$bodyfont;
662
+ mso-fareast-font-family:Calibri;
663
+ mso-bidi-font-family:"Times New Roman";
664
+ color:#44546A;
665
+ mso-themecolor:text2;
666
+ mso-ansi-language:EN-GB;
667
+ mso-fareast-language:EN-US;
668
+ font-style:italic;}
549
669
  p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText
550
670
  {mso-style-noshow:yes;
551
671
  mso-style-priority:99;
@@ -576,6 +696,7 @@ p.MsoBodyText, li.MsoBodyText, div.MsoBodyText
576
696
  text-align:justify;
577
697
  line-height:12.0pt;
578
698
  mso-pagination:widow-orphan;
699
+ tab-stops:20.15pt;
579
700
  font-size:$normalfontsize;
580
701
  font-family:$bodyfont;
581
702
  mso-fareast-font-family:"SimSun",serif;
@@ -595,14 +716,53 @@ a:visited, span.MsoHyperlinkFollowed
595
716
  mso-themecolor:followedhyperlink;
596
717
  text-decoration:underline;
597
718
  text-underline:single;
598
- color:purple;}
719
+ color:#954F72;}
720
+ p
721
+ {mso-style-noshow:yes;
722
+ mso-style-priority:99;
723
+ mso-margin-top-alt:auto;
724
+ margin-right:0cm;
725
+ mso-margin-bottom-alt:auto;
726
+ mso-pagination:widow-orphan;
727
+ font-size:$normalfontsize;
728
+ font-family:$bodyfont;
729
+ mso-fareast-font-family:"Times New Roman";
730
+ mso-ansi-language:EN-US;
731
+ mso-fareast-language:EN-US;}
732
+ p.MsoAcetate, li.MsoAcetate, div.MsoAcetate
733
+ {mso-style-noshow:yes;
734
+ mso-style-priority:99;
735
+ mso-style-link:"Balloon Text Char";
736
+ margin:0cm;
737
+ text-align:justify;
738
+ mso-pagination:widow-orphan;
739
+ tab-stops:20.15pt;
740
+ font-size:9.0pt;
741
+ font-family:"Segoe UI",sans-serif;
742
+ mso-fareast-font-family:Calibri;
743
+ mso-ansi-language:EN-GB;
744
+ mso-fareast-language:EN-US;}
745
+ span.Char1
746
+ {mso-style-name:"Balloon Text Char";
747
+ mso-style-noshow:yes;
748
+ mso-style-priority:99;
749
+ mso-style-unhide:no;
750
+ mso-style-locked:yes;
751
+ mso-style-link:"Balloon Text";
752
+ mso-ansi-font-size:9.0pt;
753
+ mso-bidi-font-size:9.0pt;
754
+ font-family:"Segoe UI",sans-serif;
755
+ mso-ascii-font-family:"Segoe UI";
756
+ mso-hansi-font-family:"Segoe UI";
757
+ mso-bidi-font-family:"Segoe UI";
758
+ mso-ansi-language:EN-GB;}
599
759
  span.MsoPlaceholderText
600
760
  {mso-style-noshow:yes;
601
761
  mso-style-priority:99;
602
762
  mso-style-unhide:no;
603
763
  mso-style-parent:"";
604
764
  color:gray;}
605
- span.Heading1Char
765
+ span.Heading1Char, span.1Char
606
766
  {mso-style-name:"Heading 1 Char";
607
767
  mso-style-priority:1;
608
768
  mso-style-unhide:no;
@@ -621,7 +781,7 @@ span.Heading1Char
621
781
  font-weight:bold;
622
782
  {% endif %}
623
783
  mso-bidi-font-weight:normal;}
624
- span.Heading2Char
784
+ span.Heading2Char, span.2Char
625
785
  {mso-style-name:"Heading 2 Char";
626
786
  mso-style-priority:2;
627
787
  mso-style-unhide:no;
@@ -637,7 +797,7 @@ span.Heading2Char
637
797
  mso-fareast-language:JA;
638
798
  font-weight:bold;
639
799
  mso-bidi-font-weight:normal;}
640
- span.Heading3Char
800
+ span.Heading3Char, span.3Char
641
801
  {mso-style-name:"Heading 3 Char";
642
802
  mso-style-priority:3;
643
803
  mso-style-unhide:no;
@@ -653,7 +813,7 @@ span.Heading3Char
653
813
  mso-fareast-language:JA;
654
814
  font-weight:bold;
655
815
  mso-bidi-font-weight:normal;}
656
- span.Heading4Char
816
+ span.Heading4Char, span.4Char
657
817
  {mso-style-name:"Heading 4 Char";
658
818
  mso-style-priority:4;
659
819
  mso-style-unhide:no;
@@ -669,7 +829,7 @@ span.Heading4Char
669
829
  mso-fareast-language:JA;
670
830
  font-weight:bold;
671
831
  mso-bidi-font-weight:normal;}
672
- span.Heading5Char
832
+ span.Heading5Char, span.5Char
673
833
  {mso-style-name:"Heading 5 Char";
674
834
  mso-style-priority:5;
675
835
  mso-style-unhide:no;
@@ -685,7 +845,7 @@ span.Heading5Char
685
845
  mso-fareast-language:JA;
686
846
  font-weight:bold;
687
847
  mso-bidi-font-weight:normal;}
688
- span.Heading6Char
848
+ span.Heading6Char, span.6Char
689
849
  {mso-style-name:"Heading 6 Char";
690
850
  mso-style-priority:6;
691
851
  mso-style-unhide:no;
@@ -708,7 +868,7 @@ p.a2, li.a2, div.a2
708
868
  mso-style-next:Normal;
709
869
  margin-top:13.5pt;
710
870
  margin-right:0cm;
711
- margin-bottom:12.0pt;
871
+ margin-bottom:6.0pt;
712
872
  margin-left:0cm;
713
873
  text-indent:0cm;
714
874
  line-height:13.5pt;
@@ -733,7 +893,7 @@ p.a3, li.a3, div.a3
733
893
  mso-style-next:Normal;
734
894
  margin-top:3.0pt;
735
895
  margin-right:0cm;
736
- margin-bottom:12.0pt;
896
+ margin-bottom:6.0pt;
737
897
  margin-left:0cm;
738
898
  text-indent:0cm;
739
899
  line-height:12.5pt;
@@ -758,7 +918,7 @@ p.a4, li.a4, div.a4
758
918
  mso-style-next:Normal;
759
919
  margin-top:3.0pt;
760
920
  margin-right:0cm;
761
- margin-bottom:12.0pt;
921
+ margin-bottom:6.0pt;
762
922
  margin-left:0cm;
763
923
  text-indent:0cm;
764
924
  line-height:12.0pt;
@@ -782,7 +942,7 @@ p.a5, li.a5, div.a5
782
942
  mso-style-next:Normal;
783
943
  margin-top:3.0pt;
784
944
  margin-right:0cm;
785
- margin-bottom:12.0pt;
945
+ margin-bottom:6.0pt;
786
946
  margin-left:0cm;
787
947
  text-indent:0cm;
788
948
  line-height:12.0pt;
@@ -806,7 +966,7 @@ p.a6, li.a6, div.a6
806
966
  mso-style-next:Normal;
807
967
  margin-top:3.0pt;
808
968
  margin-right:0cm;
809
- margin-bottom:12.0pt;
969
+ margin-bottom:6.0pt;
810
970
  margin-left:0cm;
811
971
  text-indent:0cm;
812
972
  line-height:12.0pt;
@@ -822,7 +982,7 @@ p.a6, li.a6, div.a6
822
982
  mso-ansi-language:EN-GB;
823
983
  mso-fareast-language:JA;
824
984
  font-weight:bold;}
825
- span.FooterChar
985
+ span.FooterChar, span.Char
826
986
  {mso-style-name:"Footer Char";
827
987
  mso-style-noshow:yes;
828
988
  mso-style-priority:99;
@@ -833,7 +993,7 @@ span.FooterChar
833
993
  mso-ansi-font-size:$normalfontsize;
834
994
  mso-bidi-font-size:$normalfontsize;
835
995
  mso-ansi-language:EN-GB;}
836
- span.HeaderChar
996
+ span.HeaderChar, span.Char0
837
997
  {mso-style-name:"Header Char";
838
998
  mso-style-noshow:yes;
839
999
  mso-style-priority:99;
@@ -846,7 +1006,7 @@ span.HeaderChar
846
1006
  mso-ansi-language:EN-GB;
847
1007
  font-weight:bold;
848
1008
  mso-bidi-font-weight:normal;}
849
- span.BodyTextChar
1009
+ span.BodyTextChar, span.Char3
850
1010
  {mso-style-name:"Body Text Char";
851
1011
  mso-style-noshow:yes;
852
1012
  mso-style-priority:99;
@@ -912,7 +1072,7 @@ p.Tablebody, li.Tablebody, div.Tablebody
912
1072
  margin-right:0cm;
913
1073
  margin-bottom:3.0pt;
914
1074
  margin-left:0cm;
915
- line-height:10.5pt;
1075
+ line-height:12.0pt;
916
1076
  mso-pagination:widow-orphan;
917
1077
  font-size:$smallerfontsize;
918
1078
  mso-bidi-font-size:$normalfontsize;
@@ -923,6 +1083,8 @@ p.Tablebody, li.Tablebody, div.Tablebody
923
1083
  .MsoChpDefault
924
1084
  {mso-style-type:export-only;
925
1085
  mso-default-props:yes;
1086
+ font-family:$bodyfont;
1087
+ font-size:10.0pt;
926
1088
  mso-ascii-font-family:$bodyfont;
927
1089
  mso-fareast-font-family:"SimSun",serif;
928
1090
  mso-hansi-font-family:$bodyfont;}