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/isodoc.scss CHANGED
@@ -66,25 +66,259 @@ p.NormRef, li.NormRef, div.NormRef
66
66
  mso-fareast-font-family:"SimSun",serif;
67
67
  mso-bidi-font-family:$bodyfont;
68
68
  mso-ansi-language:EN-GB;}
69
- p.FigureTitle
70
- {mso-style-unhide:no;
69
+ p.FigureTitle, li.FigureTitle, div.FigureTitle
70
+ {mso-style-name:"Figure Title";
71
+ mso-style-unhide:no;
71
72
  mso-style-qformat:yes;
72
73
  mso-style-parent:"";
74
+ mso-style-parent:"List Paragraph";
75
+ mso-style-link:"Figure Title Char";
73
76
  margin-top:0cm;
74
77
  margin-right:0cm;
75
78
  margin-bottom:6.0pt;
76
- margin-left:0cm;
79
+ margin-left:36.0pt;
80
+ mso-add-space:auto;
77
81
  text-align:center;
82
+ text-indent:-30.35pt;
78
83
  line-height:12.0pt;
79
- page-break-before:avoid;
80
84
  mso-pagination:widow-orphan;
85
+ /*mso-list:l9 level1 lfo17;*/
81
86
  tab-stops:20.15pt;
82
87
  font-size:$normalfontsize;
83
88
  font-family:$bodyfont;
84
- font-weight:bold;
89
+ font-weight:bold;
85
90
  mso-fareast-font-family:"SimSun",serif;
86
91
  mso-bidi-font-family:$bodyfont;
87
92
  mso-ansi-language:EN-GB;}
93
+ p.FigureTitleCxSpFirst, li.FigureTitleCxSpFirst, div.FigureTitleCxSpFirst
94
+ {mso-style-name:"Figure TitleCxSpFirst";
95
+ mso-style-unhide:no;
96
+ mso-style-qformat:yes;
97
+ mso-style-parent:"List Paragraph";
98
+ mso-style-link:"Figure Title Char";
99
+ mso-style-type:export-only;
100
+ margin-top:0cm;
101
+ margin-right:0cm;
102
+ margin-bottom:0cm;
103
+ margin-left:36.0pt;
104
+ mso-add-space:auto;
105
+ text-align:center;
106
+ text-indent:-30.35pt;
107
+ line-height:12.0pt;
108
+ mso-pagination:widow-orphan;
109
+ /*mso-list:l9 level1 lfo17;*/
110
+ tab-stops:20.15pt;
111
+ font-size:$normalfontsize;
112
+ font-family:$bodyfont;
113
+ mso-fareast-font-family:Calibri;
114
+ mso-bidi-font-family:"Times New Roman";
115
+ mso-ansi-language:EN-GB;
116
+ mso-fareast-language:EN-US;
117
+ font-weight:bold;}
118
+ p.FigureTitleCxSpMiddle, li.FigureTitleCxSpMiddle, div.FigureTitleCxSpMiddle
119
+ {mso-style-name:"Figure TitleCxSpMiddle";
120
+ mso-style-unhide:no;
121
+ mso-style-qformat:yes;
122
+ mso-style-parent:"List Paragraph";
123
+ mso-style-link:"Figure Title Char";
124
+ mso-style-type:export-only;
125
+ margin-top:0cm;
126
+ margin-right:0cm;
127
+ margin-bottom:0cm;
128
+ margin-left:36.0pt;
129
+ mso-add-space:auto;
130
+ text-align:center;
131
+ text-indent:-30.35pt;
132
+ line-height:12.0pt;
133
+ mso-pagination:widow-orphan;
134
+ /*mso-list:l9 level1 lfo17;*/
135
+ tab-stops:20.15pt;
136
+ font-size:$normalfontsize;
137
+ font-family:$bodyfont;
138
+ mso-fareast-font-family:Calibri;
139
+ mso-bidi-font-family:"Times New Roman";
140
+ mso-ansi-language:EN-GB;
141
+ mso-fareast-language:EN-US;
142
+ font-weight:bold;}
143
+ p.FigureTitleCxSpLast, li.FigureTitleCxSpLast, div.FigureTitleCxSpLast
144
+ {mso-style-name:"Figure TitleCxSpLast";
145
+ mso-style-unhide:no;
146
+ mso-style-qformat:yes;
147
+ mso-style-parent:"List Paragraph";
148
+ mso-style-link:"Figure Title Char";
149
+ mso-style-type:export-only;
150
+ margin-top:0cm;
151
+ margin-right:0cm;
152
+ margin-bottom:6.0pt;
153
+ margin-left:36.0pt;
154
+ mso-add-space:auto;
155
+ text-align:center;
156
+ text-indent:-30.35pt;
157
+ line-height:12.0pt;
158
+ mso-pagination:widow-orphan;
159
+ /*mso-list:l9 level1 lfo17;*/
160
+ tab-stops:20.15pt;
161
+ font-size:$normalfontsize;
162
+ font-family:$bodyfont;
163
+ mso-fareast-font-family:Calibri;
164
+ mso-bidi-font-family:"Times New Roman";
165
+ mso-ansi-language:EN-GB;
166
+ mso-fareast-language:EN-US;
167
+ font-weight:bold;}
168
+ span.NoteChar
169
+ {mso-style-name:"Note Char";
170
+ mso-style-unhide:no;
171
+ mso-style-locked:yes;
172
+ mso-style-link:Note;
173
+ mso-ansi-language:EN-GB;}
174
+ p.AnnexFigureTitle, li.AnnexFigureTitle, div.AnnexFigureTitle
175
+ {mso-style-name:"Annex Figure Title";
176
+ mso-style-unhide:no;
177
+ mso-style-qformat:yes;
178
+ mso-style-link:"Annex Figure Title Char";
179
+ margin-top:0cm;
180
+ margin-right:0cm;
181
+ margin-bottom:6.0pt;
182
+ margin-left:17.0pt;
183
+ text-align:center;
184
+ text-indent:-11.35pt;
185
+ line-height:12.0pt;
186
+ mso-pagination:widow-orphan;
187
+ /* mso-list:l6 level1 lfo13; */
188
+ tab-stops:list 5.65pt left 20.15pt;
189
+ font-size:$normalfontsize;
190
+ font-family:$bodyfont;
191
+ mso-fareast-font-family:Calibri;
192
+ mso-bidi-font-family:"Times New Roman";
193
+ mso-ansi-language:EN-GB;
194
+ mso-fareast-language:EN-US;
195
+ font-weight:bold;}
196
+ p.AnnexTableTitle, li.AnnexTableTitle, div.AnnexTableTitle
197
+ {mso-style-name:"Annex Table Title";
198
+ mso-style-unhide:no;
199
+ mso-style-qformat:yes;
200
+ mso-style-parent:"Παράγραφος λίστας";
201
+ mso-style-link:"Annex Table Title Char";
202
+ margin-top:0cm;
203
+ margin-right:0cm;
204
+ margin-bottom:6.0pt;
205
+ margin-left:0cm;
206
+ mso-add-space:auto;
207
+ text-align:center;
208
+ text-indent:0cm;
209
+ line-height:12.0pt;
210
+ page-break-before:always;
211
+ mso-pagination:widow-orphan;
212
+ page-break-after:avoid;
213
+ /* mso-list:l4 level1 lfo15; */
214
+ tab-stops:list 0cm left 20.15pt;
215
+ font-size:$normalfontsize;
216
+ font-family:$bodyfont;
217
+ mso-fareast-font-family:Calibri;
218
+ mso-bidi-font-family:"Times New Roman";
219
+ mso-ansi-language:EN-GB;
220
+ mso-fareast-language:EN-US;
221
+ font-weight:bold;
222
+ mso-bidi-font-weight:normal;}
223
+ p.AnnexTableTitleCxSpFirst, li.AnnexTableTitleCxSpFirst, div.AnnexTableTitleCxSpFirst
224
+ {mso-style-name:"Annex Table TitleCxSpFirst";
225
+ mso-style-unhide:no;
226
+ mso-style-qformat:yes;
227
+ mso-style-parent:"List Paragraph";
228
+ mso-style-link:"Annex Table Title Char";
229
+ mso-style-type:export-only;
230
+ margin:0cm;
231
+ mso-add-space:auto;
232
+ text-align:center;
233
+ text-indent:0cm;
234
+ line-height:12.0pt;
235
+ page-break-before:always;
236
+ mso-pagination:widow-orphan;
237
+ page-break-after:avoid;
238
+ /* mso-list:l4 level1 lfo15; */
239
+ tab-stops:list 0cm left 20.15pt;
240
+ font-size:$normalfontsize;
241
+ font-family:$bodyfont;
242
+ mso-fareast-font-family:Calibri;
243
+ mso-bidi-font-family:"Times New Roman";
244
+ mso-ansi-language:EN-GB;
245
+ mso-fareast-language:EN-US;
246
+ font-weight:bold;
247
+ mso-bidi-font-weight:normal;}
248
+ p.AnnexTableTitleCxSpMiddle, li.AnnexTableTitleCxSpMiddle, div.AnnexTableTitleCxSpMiddle
249
+ {mso-style-name:"Annex Table TitleCxSpMiddle";
250
+ mso-style-unhide:no;
251
+ mso-style-qformat:yes;
252
+ mso-style-parent:"List Paragraph";
253
+ mso-style-link:"Annex Table Title Char";
254
+ mso-style-type:export-only;
255
+ margin:0cm;
256
+ mso-add-space:auto;
257
+ text-align:center;
258
+ text-indent:0cm;
259
+ line-height:12.0pt;
260
+ page-break-before:always;
261
+ mso-pagination:widow-orphan;
262
+ page-break-after:avoid;
263
+ /* mso-list:l4 level1 lfo15; */
264
+ tab-stops:list 0cm left 20.15pt;
265
+ font-size:$normalfontsize;
266
+ font-family:$bodyfont;
267
+ mso-fareast-font-family:Calibri;
268
+ mso-bidi-font-family:"Times New Roman";
269
+ mso-ansi-language:EN-GB;
270
+ mso-fareast-language:EN-US;
271
+ font-weight:bold;
272
+ mso-bidi-font-weight:normal;}
273
+ p.AnnexTableTitleCxSpLast, li.AnnexTableTitleCxSpLast, div.AnnexTableTitleCxSpLast
274
+ {mso-style-name:"Annex Table TitleCxSpLast";
275
+ mso-style-unhide:no;
276
+ mso-style-qformat:yes;
277
+ mso-style-parent:"List Paragraph";
278
+ mso-style-link:"Annex Table Title Char";
279
+ mso-style-type:export-only;
280
+ margin-top:0cm;
281
+ margin-right:0cm;
282
+ margin-bottom:6.0pt;
283
+ margin-left:0cm;
284
+ mso-add-space:auto;
285
+ text-align:center;
286
+ text-indent:0cm;
287
+ line-height:12.0pt;
288
+ page-break-before:always;
289
+ mso-pagination:widow-orphan;
290
+ page-break-after:avoid;
291
+ /* mso-list:l4 level1 lfo15; */
292
+ tab-stops:list 0cm left 20.15pt;
293
+ font-size:$normalfontsize;
294
+ font-family:$bodyfont;
295
+ mso-fareast-font-family:Calibri;
296
+ mso-bidi-font-family:"Times New Roman";
297
+ mso-ansi-language:EN-GB;
298
+ mso-fareast-language:EN-US;
299
+ font-weight:bold;
300
+ mso-bidi-font-weight:normal;}
301
+ span.Char2
302
+ {mso-style-name:"List Paragraph Char";
303
+ mso-style-noshow:yes;
304
+ mso-style-priority:34;
305
+ mso-style-unhide:no;
306
+ mso-style-locked:yes;
307
+ mso-style-link:"List Paragraph";
308
+ mso-ansi-font-size:11.0pt;
309
+ mso-bidi-font-size:11.0pt;
310
+ mso-ansi-language:EN-GB;}
311
+ span.AnnexTableTitleChar
312
+ {mso-style-name:"Annex Table Title Char";
313
+ mso-style-unhide:no;
314
+ mso-style-locked:yes;
315
+ mso-style-parent:"List Paragraph Char";
316
+ mso-style-link:"Annex Table Title";
317
+ mso-ansi-font-size:11.0pt;
318
+ mso-bidi-font-size:11.0pt;
319
+ mso-ansi-language:EN-GB;
320
+ font-weight:bold;
321
+ mso-bidi-font-weight:normal;}
88
322
  p.AdmonitionTitle, p.RecommendationTitle
89
323
  {mso-style-unhide:no;
90
324
  mso-style-qformat:yes;
@@ -123,18 +357,21 @@ p.SourceTitle
123
357
  mso-fareast-font-family:"SimSun",serif;
124
358
  mso-bidi-font-family:$bodyfont;
125
359
  mso-ansi-language:EN-GB;}
126
- p.TableTitle
360
+ p.Tabletitle, li.Tabletitle, div.Tabletitle
127
361
  {mso-style-unhide:no;
128
362
  mso-style-qformat:yes;
129
363
  mso-style-parent:"";
130
364
  margin-top:0cm;
131
365
  margin-right:0cm;
132
366
  margin-bottom:6.0pt;
133
- margin-left:0cm;
367
+ margin-left:36.0pt;
134
368
  text-align:center;
369
+ text-indent:-18.0pt;
370
+ line-height:12.0pt;
135
371
  page-break-after:avoid;
136
372
  line-height:12.0pt;
137
373
  mso-pagination:widow-orphan;
374
+ /* mso-list:l8 level1 lfo16; */
138
375
  tab-stops:20.15pt;
139
376
  font-size:$normalfontsize;
140
377
  font-weight:bold;
@@ -142,6 +379,110 @@ p.TableTitle
142
379
  mso-fareast-font-family:"SimSun",serif;
143
380
  mso-bidi-font-family:$bodyfont;
144
381
  mso-ansi-language:EN-GB;}
382
+ p.TabletitleCxSpFirst, li.TabletitleCxSpFirst, div.TabletitleCxSpFirst
383
+ {mso-style-name:"Table titleCxSpFirst";
384
+ mso-style-unhide:no;
385
+ mso-style-qformat:yes;
386
+ mso-style-parent:"List Paragraph";
387
+ mso-style-link:"Table title Char";
388
+ mso-style-type:export-only;
389
+ margin-top:0cm;
390
+ margin-right:0cm;
391
+ margin-bottom:0cm;
392
+ margin-left:36.0pt;
393
+ mso-add-space:auto;
394
+ text-align:center;
395
+ text-indent:-18.0pt;
396
+ line-height:12.0pt;
397
+ mso-pagination:widow-orphan;
398
+ mso-list:l8 level1 lfo16;
399
+ tab-stops:20.15pt;
400
+ font-size:$normalfontsize;
401
+ font-family:$bodyfont;
402
+ mso-fareast-font-family:Calibri;
403
+ mso-bidi-font-family:"Times New Roman";
404
+ mso-ansi-language:FR-CH;
405
+ mso-fareast-language:EN-US;
406
+ font-weight:bold;}
407
+ p.TabletitleCxSpMiddle, li.TabletitleCxSpMiddle, div.TabletitleCxSpMiddle
408
+ {mso-style-name:"Table titleCxSpMiddle";
409
+ mso-style-unhide:no;
410
+ mso-style-qformat:yes;
411
+ mso-style-parent:"List Paragraph";
412
+ mso-style-link:"Table title Char";
413
+ mso-style-type:export-only;
414
+ margin-top:0cm;
415
+ margin-right:0cm;
416
+ margin-bottom:0cm;
417
+ margin-left:36.0pt;
418
+ mso-add-space:auto;
419
+ text-align:center;
420
+ text-indent:-18.0pt;
421
+ line-height:12.0pt;
422
+ mso-pagination:widow-orphan;
423
+ mso-list:l8 level1 lfo16;
424
+ tab-stops:20.15pt;
425
+ font-size:$normalfontsize;
426
+ font-family:$bodyfont;
427
+ mso-fareast-font-family:Calibri;
428
+ mso-bidi-font-family:"Times New Roman";
429
+ mso-ansi-language:FR-CH;
430
+ mso-fareast-language:EN-US;
431
+ font-weight:bold;}
432
+ p.TabletitleCxSpLast, li.TabletitleCxSpLast, div.TabletitleCxSpLast
433
+ {mso-style-name:"Table titleCxSpLast";
434
+ mso-style-unhide:no;
435
+ mso-style-qformat:yes;
436
+ mso-style-parent:"List Paragraph";
437
+ mso-style-link:"Table title Char";
438
+ mso-style-type:export-only;
439
+ margin-top:0cm;
440
+ margin-right:0cm;
441
+ margin-bottom:6.0pt;
442
+ margin-left:36.0pt;
443
+ mso-add-space:auto;
444
+ text-align:center;
445
+ text-indent:-18.0pt;
446
+ line-height:12.0pt;
447
+ mso-pagination:widow-orphan;
448
+ mso-list:l8 level1 lfo16;
449
+ tab-stops:20.15pt;
450
+ font-size:$normalfontsize;
451
+ font-family:$bodyfont;
452
+ mso-fareast-font-family:Calibri;
453
+ mso-bidi-font-family:"Times New Roman";
454
+ mso-ansi-language:FR-CH;
455
+ mso-fareast-language:EN-US;
456
+ font-weight:bold;}
457
+ span.FigureTitleChar
458
+ {mso-style-name:"Figure Title Char";
459
+ mso-style-unhide:no;
460
+ mso-style-locked:yes;
461
+ mso-style-parent:"List Paragraph Char";
462
+ mso-style-link:"Figure Title";
463
+ mso-ansi-font-size:11.0pt;
464
+ mso-bidi-font-size:11.0pt;
465
+ mso-ansi-language:EN-GB;
466
+ font-weight:bold;}
467
+ span.TabletitleChar
468
+ {mso-style-name:"Table title Char";
469
+ mso-style-unhide:no;
470
+ mso-style-locked:yes;
471
+ mso-style-parent:"List Paragraph Char";
472
+ mso-style-link:"Table title";
473
+ mso-ansi-font-size:11.0pt;
474
+ mso-bidi-font-size:11.0pt;
475
+ mso-ansi-language:FR-CH;
476
+ font-weight:bold;}
477
+ span.AnnexFigureTitleChar
478
+ {mso-style-name:"Annex Figure Title Char";
479
+ mso-style-unhide:no;
480
+ mso-style-locked:yes;
481
+ mso-style-link:"Annex Figure Title";
482
+ mso-ansi-font-size:11.0pt;
483
+ mso-bidi-font-size:11.0pt;
484
+ mso-ansi-language:EN-GB;
485
+ font-weight:bold;}
145
486
  p.Note, div.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote
146
487
  {mso-style-unhide:no;
147
488
  mso-style-qformat:yes;
@@ -191,6 +532,7 @@ p.ANNEX, li.ANNEX, div.ANNEX
191
532
  mso-bidi-font-weight:normal;}
192
533
  p.BiblioTitle, li.BiblioTitle, div.BiblioTitle
193
534
  {mso-style-name:"Biblio Title";
535
+ mso-style-priority:5;
194
536
  mso-style-noshow:yes;
195
537
  mso-style-unhide:no;
196
538
  margin-top:0cm;
@@ -214,9 +556,10 @@ p.Definition, li.Definition, div.Definition
214
556
  {mso-style-name:Definition;
215
557
  mso-style-priority:9;
216
558
  mso-style-unhide:no;
559
+ mso-style-link:"Definition Char";
217
560
  margin-top:0cm;
218
561
  margin-right:0cm;
219
- margin-bottom:12.0pt;
562
+ margin-bottom:6.0pt;
220
563
  margin-left:0cm;
221
564
  text-align:justify;
222
565
  line-height:12.0pt;
@@ -305,7 +648,6 @@ p.Terms, li.Terms, div.Terms
305
648
  mso-style-unhide:no;
306
649
  mso-style-next:Definition;
307
650
  margin:0cm;
308
- margin-bottom:.0001pt;
309
651
  line-height:12.0pt;
310
652
  mso-pagination:widow-orphan;
311
653
  page-break-after:avoid;
@@ -360,7 +702,6 @@ p.TermNum, li.TermNum, div.TermNum
360
702
  mso-style-unhide:no;
361
703
  mso-style-next:"Term\(s\)";
362
704
  margin:0cm;
363
- margin-bottom:.0001pt;
364
705
  line-height:12.0pt;
365
706
  mso-pagination:widow-orphan;
366
707
  page-break-after:avoid;
@@ -402,7 +743,9 @@ p.zzCopyright, li.zzCopyright, div.zzCopyright
402
743
  mso-style-unhide:no;
403
744
  mso-style-next:Normal;
404
745
  margin-top:0cm;
405
- margin-bottom:12.0pt;
746
+ margin-right:14.2pt;
747
+ margin-bottom:6.0pt;
748
+ margin-left:14.2pt;
406
749
  text-align:justify;
407
750
  line-height:12.0pt;
408
751
  mso-pagination:widow-orphan;
@@ -410,7 +753,7 @@ p.zzCopyright, li.zzCopyright, div.zzCopyright
410
753
  border:none;
411
754
  padding:0cm;
412
755
  mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt;
413
- font-size:10.0pt;
756
+ font-size:11.0pt;
414
757
  font-family:$bodyfont;
415
758
  mso-fareast-font-family:"SimSun",serif;
416
759
  mso-bidi-font-family:$bodyfont;
@@ -421,7 +764,9 @@ p.zzCopyright1
421
764
  mso-style-unhide:no;
422
765
  mso-style-next:Normal;
423
766
  margin-top:0cm;
424
- margin-bottom:12.0pt;
767
+ margin-right:14.2pt;
768
+ margin-bottom:6.0pt;
769
+ margin-left:14.2pt;
425
770
  text-align:justify;
426
771
  line-height:12.0pt;
427
772
  mso-pagination:widow-orphan;
@@ -429,7 +774,7 @@ p.zzCopyright1
429
774
  border:none;
430
775
  padding:0cm;
431
776
  mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt;
432
- font-size:10.0pt;
777
+ font-size:11.0pt;
433
778
  font-family:$bodyfont;
434
779
  mso-fareast-font-family:"SimSun",serif;
435
780
  mso-bidi-font-family:$bodyfont;
@@ -571,7 +916,6 @@ p.Code, li.Code, div.Code
571
916
  mso-style-unhide:no;
572
917
  mso-style-qformat:yes;
573
918
  margin:0cm;
574
- margin-bottom:.0001pt;
575
919
  line-height:10.0pt;
576
920
  mso-pagination:widow-orphan;
577
921
  tab-stops:20.15pt;
@@ -587,7 +931,7 @@ p.Formula, li.Formula, div.Formula
587
931
  mso-style-unhide:no;
588
932
  margin-top:0cm;
589
933
  margin-right:0cm;
590
- margin-bottom:$normalfontsize;
934
+ margin-bottom:11.0pt;
591
935
  margin-left:20.15pt;
592
936
  line-height:12.0pt;
593
937
  mso-pagination:widow-orphan;
@@ -597,6 +941,68 @@ p.Formula, li.Formula, div.Formula
597
941
  mso-fareast-font-family:"SimSun",serif;
598
942
  mso-bidi-font-family:$bodyfont;
599
943
  mso-ansi-language:EN-GB;}
944
+ p.ForewordText, li.ForewordText, div.ForewordText
945
+ {mso-style-name:"Foreword Text";
946
+ mso-style-unhide:no;
947
+ mso-style-link:"Foreword Text Char";
948
+ margin-top:0cm;
949
+ margin-right:0cm;
950
+ margin-bottom:6.0pt;
951
+ margin-left:0cm;
952
+ text-align:justify;
953
+ line-height:12.0pt;
954
+ mso-pagination:widow-orphan;
955
+ font-size:$normalfontsize;
956
+ font-family:$bodyfont;
957
+ mso-fareast-font-family:Calibri;
958
+ mso-bidi-font-family:"Times New Roman";
959
+ mso-fareast-language:EN-US;}
960
+ span.ForewordTextChar
961
+ {mso-style-name:"Foreword Text Char";
962
+ mso-style-unhide:no;
963
+ mso-style-locked:yes;
964
+ mso-style-parent:"";
965
+ mso-style-link:"Foreword Text";
966
+ mso-ansi-font-size:11.0pt;
967
+ mso-bidi-font-size:11.0pt;}
968
+ p.Source, li.Source, div.Source
969
+ {mso-style-name:Source;
970
+ mso-style-unhide:no;
971
+ mso-style-qformat:yes;
972
+ mso-style-parent:Definition;
973
+ mso-style-link:"Source Char";
974
+ margin-top:0cm;
975
+ margin-right:0cm;
976
+ margin-bottom:6.0pt;
977
+ margin-left:0cm;
978
+ text-align:justify;
979
+ line-height:12.0pt;
980
+ mso-pagination:widow-orphan;
981
+ tab-stops:20.15pt;
982
+ font-size:$normalfontsize;
983
+ font-family:$bodyfont;
984
+ mso-fareast-font-family:Calibri;
985
+ mso-bidi-font-family:"Times New Roman";
986
+ mso-ansi-language:EN-GB;
987
+ mso-fareast-language:EN-US;}
988
+ span.DefinitionChar
989
+ {mso-style-name:"Definition Char";
990
+ mso-style-priority:9;
991
+ mso-style-unhide:no;
992
+ mso-style-locked:yes;
993
+ mso-style-link:Definition;
994
+ mso-ansi-font-size:11.0pt;
995
+ mso-bidi-font-size:11.0pt;
996
+ mso-ansi-language:EN-GB;}
997
+ span.SourceChar
998
+ {mso-style-name:"Source Char";
999
+ mso-style-unhide:no;
1000
+ mso-style-locked:yes;
1001
+ mso-style-parent:"Definition Char";
1002
+ mso-style-link:Source;
1003
+ mso-ansi-font-size:11.0pt;
1004
+ mso-bidi-font-size:11.0pt;
1005
+ mso-ansi-language:EN-GB;}
600
1006
  table.dl
601
1007
  {margin-top:0cm;
602
1008
  margin-right:0cm;
@@ -820,26 +1226,53 @@ div.example {
820
1226
  text-indent:-70.9pt;
821
1227
  }
822
1228
  */
823
- p.example, li.example, div.example, td.example
1229
+ p.Example, li.Example, div.Example, td.Example
824
1230
  {
825
- mso-pagination:none;
826
- tab-stops:70.9pt;
1231
+ tab-stops:70.9pt;
827
1232
  font-size:$smallerfontsize;
828
1233
  font-family:$bodyfont;}
829
1234
 
830
- div.example, td.example {
1235
+ div.Example, td.Example {
831
1236
  margin:0in;
832
- margin-bottom:12.0pt;
1237
+ margin-bottom:6.0pt;
833
1238
  }
834
1239
 
835
- td.example p.MsoListParagraph {
1240
+ td.Example p.MsoListParagraph {
836
1241
  font-size: $smallerfontsize;
837
1242
  }
838
1243
 
839
- div.example p.MsoListParagraph {
1244
+ div.Example p.MsoListParagraph {
840
1245
  font-size: $smallerfontsize;
841
1246
  }
842
1247
 
1248
+ p.Example, li.Example, div.Example
1249
+ {mso-style-name:Example;
1250
+ mso-style-unhide:no;
1251
+ mso-style-qformat:yes;
1252
+ mso-style-link:"Example Char";
1253
+ margin-top:0cm;
1254
+ margin-right:0cm;
1255
+ margin-bottom:6.0pt;
1256
+ margin-left:0cm;
1257
+ text-align:justify;
1258
+ line-height:12.0pt;
1259
+ mso-pagination:widow-orphan;
1260
+ /* tab-stops:20.15pt; */
1261
+ font-size:$smallerfontsize;
1262
+ font-family:$bodyfont;
1263
+ mso-fareast-font-family:Calibri;
1264
+ mso-bidi-font-family:"Times New Roman";
1265
+ mso-ansi-language:EN-GB;
1266
+ mso-fareast-language:EN-US;}
1267
+ span.ExampleChar
1268
+ {mso-style-name:"Example Char";
1269
+ mso-style-unhide:no;
1270
+ mso-style-locked:yes;
1271
+ mso-style-link:Example;
1272
+ mso-ansi-language:EN-GB;}
1273
+
1274
+
1275
+
843
1276
  div.Note p.MsoListParagraph {
844
1277
  font-size: $smallerfontsize;
845
1278
  margin-left: 1.0cm;