metanorma-iec 1.3.12 → 1.4.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (24) hide show
  1. checksums.yaml +4 -4
  2. data/lib/asciidoctor/iec/basicdoc.rng +21 -4
  3. data/lib/asciidoctor/iec/front.rb +0 -4
  4. data/lib/asciidoctor/iec/isodoc.rng +420 -76
  5. data/lib/asciidoctor/iec/isostandard.rng +6 -22
  6. data/lib/asciidoctor/iec/reqt.rng +23 -2
  7. data/lib/isodoc/iec/base_convert.rb +2 -2
  8. data/lib/isodoc/iec/html/isodoc.css +5 -3
  9. data/lib/isodoc/iec/html/isodoc.scss +5 -3
  10. data/lib/isodoc/iec/html/wordstyle.css +24 -0
  11. data/lib/isodoc/iec/html/wordstyle.scss +24 -0
  12. data/lib/isodoc/iec/iec.international-standard.xsl +48 -13
  13. data/lib/isodoc/iec/word_convert.rb +1 -1
  14. data/lib/metanorma/iec/version.rb +1 -1
  15. data/metanorma-iec.gemspec +1 -1
  16. data/spec/asciidoctor/base_spec.rb +0 -2
  17. data/spec/asciidoctor/blocks_spec.rb +2 -75
  18. data/spec/asciidoctor/cleanup_spec.rb +2 -122
  19. data/spec/asciidoctor/iev_spec.rb +4 -4
  20. data/spec/asciidoctor/inline_spec.rb +0 -45
  21. data/spec/asciidoctor/section_spec.rb +4 -4
  22. data/spec/isodoc/iev_spec.rb +3 -3
  23. data/spec/isodoc/terms_spec.rb +2 -2
  24. metadata +5 -5
data/lib/asciidoctor/iec/isostandard.rng CHANGED
@@ -142,14 +142,9 @@
142
142
  </optional>
143
143
  <choice>
144
144
  <choice>
145
- <group>
146
- <oneOrMore>
147
- <ref name="BasicBlock"/>
148
- </oneOrMore>
149
- <zeroOrMore>
150
- <ref name="note"/>
151
- </zeroOrMore>
152
- </group>
145
+ <oneOrMore>
146
+ <ref name="BasicBlock"/>
147
+ </oneOrMore>
153
148
  <ref name="amend"/>
154
149
  </choice>
155
150
  <oneOrMore>
@@ -225,9 +220,6 @@
225
220
  -->
226
221
  <ref name="BasicBlock"/>
227
222
  </zeroOrMore>
228
- <zeroOrMore>
229
- <ref name="note"/>
230
- </zeroOrMore>
231
223
  <zeroOrMore>
232
224
  <ref name="clause-hanging-paragraph-with-footnote"/>
233
225
  </zeroOrMore>
@@ -351,14 +343,9 @@
351
343
  <ref name="section-title"/>
352
344
  </optional>
353
345
  <choice>
354
- <group>
355
- <zeroOrMore>
356
- <ref name="BasicBlock"/>
357
- </zeroOrMore>
358
- <zeroOrMore>
359
- <ref name="note"/>
360
- </zeroOrMore>
361
- </group>
346
+ <zeroOrMore>
347
+ <ref name="BasicBlock"/>
348
+ </zeroOrMore>
362
349
  <oneOrMore>
363
350
  <ref name="content-subsection"/>
364
351
  </oneOrMore>
@@ -475,9 +462,6 @@
475
462
  <!-- allow hanging paragraphs in annexes: they introduce lists -->
476
463
  <ref name="BasicBlock"/>
477
464
  </zeroOrMore>
478
- <zeroOrMore>
479
- <ref name="note"/>
480
- </zeroOrMore>
481
465
  <zeroOrMore>
482
466
  <ref name="clause-hanging-paragraph-with-footnote"/>
483
467
  </zeroOrMore>
data/lib/asciidoctor/iec/reqt.rng CHANGED
@@ -58,6 +58,14 @@
58
58
  <optional>
59
59
  <attribute name="type"/>
60
60
  </optional>
61
+ <optional>
62
+ <attribute name="tag"/>
63
+ </optional>
64
+ <optional>
65
+ <attribute name="multilingual-rendering">
66
+ <ref name="MultilingualRenderingType"/>
67
+ </attribute>
68
+ </optional>
61
69
  <optional>
62
70
  <ref name="reqtitle"/>
63
71
  </optional>
@@ -101,7 +109,9 @@
101
109
  </define>
102
110
  <define name="label">
103
111
  <element name="label">
104
- <text/>
112
+ <oneOrMore>
113
+ <ref name="TextElement"/>
114
+ </oneOrMore>
105
115
  </element>
106
116
  </define>
107
117
  <define name="subject">
@@ -175,8 +185,19 @@
175
185
  <data type="boolean"/>
176
186
  </attribute>
177
187
  </optional>
188
+ <optional>
189
+ <attribute name="tag"/>
190
+ </optional>
191
+ <optional>
192
+ <attribute name="multilingual-rendering">
193
+ <ref name="MultilingualRenderingType"/>
194
+ </attribute>
195
+ </optional>
178
196
  <oneOrMore>
179
- <ref name="BasicBlock"/>
197
+ <choice>
198
+ <ref name="BasicBlock"/>
199
+ <ref name="component"/>
200
+ </choice>
180
201
  </oneOrMore>
181
202
  </define>
182
203
  <define name="ObligationType">
data/lib/isodoc/iec/base_convert.rb CHANGED
@@ -56,10 +56,10 @@ module IsoDoc
56
56
  return super unless @is_iev
57
57
  end
58
58
 
59
- def biblio_list(f, div, biblio)
59
+ def biblio_list(elem, div, biblio)
60
60
  return super unless @is_iev
61
61
 
62
- f.children.each do |b|
62
+ elem.children.each do |b|
63
63
  parse(b, div) unless %w(title bibitem).include? b.name
64
64
  end
65
65
  end
data/lib/isodoc/iec/html/isodoc.css CHANGED
@@ -1,6 +1,7 @@
1
1
  /* IEC: CODE */
2
2
  p.Sourcecode, li.Sourcecode, div.Sourcecode, pre.Sourcecode {
3
3
  mso-style-unhide: no;
4
+ mso-style-name: "CODE";
4
5
  mso-style-unhide: no;
5
6
  margin-top: 5.0pt;
6
7
  margin-right: 0cm;
@@ -191,6 +192,7 @@ p.TableTitle {
191
192
  /* IEC: NOTE */
192
193
  p.Note, div.Note, li.Note {
193
194
  mso-style-unhide: no;
195
+ mso-style-name: "NOTE";
194
196
  mso-style-qformat: yes;
195
197
  mso-style-next: Normal;
196
198
  margin-top: 5.0pt;
@@ -304,7 +306,7 @@ p.TitlePageSubhead, li.TitlePageSubhead, div.TitlePageSubhead {
304
306
 
305
307
  /* IEC: TERM */
306
308
  p.Terms, li.Terms, div.Terms {
307
- mso-style-name: "Term\(s\)";
309
+ mso-style-name: "TERM";
308
310
  mso-style-unhide: no;
309
311
  mso-style-qformat: yes;
310
312
  mso-style-next: TERM-definition;
@@ -494,7 +496,7 @@ p.TABLE-col-heading, li.TABLE-col-heading, div.TABLE-col-heading {
494
496
  mso-style-name: TABLE-col-heading;
495
497
  mso-style-unhide: no;
496
498
  mso-style-qformat: yes;
497
- mso-style-parent: PARAGRAPH;
499
+ mso-style-parent: Normal;
498
500
  margin-top: 3.0pt;
499
501
  margin-right: 0cm;
500
502
  margin-bottom: 3.0pt;
@@ -515,7 +517,7 @@ p.TABLE-cell, li.TABLE-cell, div.TABLE-cell {
515
517
  mso-style-name: TABLE-cell;
516
518
  mso-style-unhide: no;
517
519
  mso-style-qformat: yes;
518
- mso-style-parent: PARAGRAPH;
520
+ mso-style-parent: Normal;
519
521
  margin-top: 3.0pt;
520
522
  margin-right: 0cm;
521
523
  margin-bottom: 3.0pt;
data/lib/isodoc/iec/html/isodoc.scss CHANGED
@@ -1,6 +1,7 @@
1
1
  /* IEC: CODE */
2
2
  p.Sourcecode, li.Sourcecode, div.Sourcecode, pre.Sourcecode
3
3
  {mso-style-unhide:no;
4
+ mso-style-name:"CODE";
4
5
  mso-style-unhide:no;
5
6
  margin-top:5.0pt;
6
7
  margin-right:0cm;
@@ -182,6 +183,7 @@ p.TableTitle
182
183
  /* IEC: NOTE */
183
184
  p.Note, div.Note, li.Note
184
185
  {mso-style-unhide:no;
186
+ mso-style-name:"NOTE";
185
187
  mso-style-qformat:yes;
186
188
  mso-style-next:Normal;
187
189
  margin-top:5.0pt;
@@ -293,7 +295,7 @@ p.TitlePageSubhead, li.TitlePageSubhead, div.TitlePageSubhead {
293
295
  }
294
296
  /* IEC: TERM */
295
297
  p.Terms, li.Terms, div.Terms
296
- {mso-style-name:"Term\(s\)";
298
+ {mso-style-name:"TERM";
297
299
  mso-style-unhide:no;
298
300
  mso-style-qformat:yes;
299
301
  mso-style-next:TERM-definition;
@@ -473,7 +475,7 @@ p.TABLE-col-heading, li.TABLE-col-heading, div.TABLE-col-heading
473
475
  {mso-style-name:TABLE-col-heading;
474
476
  mso-style-unhide:no;
475
477
  mso-style-qformat:yes;
476
- mso-style-parent:PARAGRAPH;
478
+ mso-style-parent:Normal;
477
479
  margin-top:3.0pt;
478
480
  margin-right:0cm;
479
481
  margin-bottom:3.0pt;
@@ -493,7 +495,7 @@ p.TABLE-cell, li.TABLE-cell, div.TABLE-cell
493
495
  {mso-style-name:TABLE-cell;
494
496
  mso-style-unhide:no;
495
497
  mso-style-qformat:yes;
496
- mso-style-parent:PARAGRAPH;
498
+ mso-style-parent:Normal;
497
499
  margin-top:3.0pt;
498
500
  margin-right:0cm;
499
501
  margin-bottom:3.0pt;
data/lib/isodoc/iec/html/wordstyle.css CHANGED
@@ -210,6 +210,7 @@ div.figure, p.figure {
210
210
  h1.main {
211
211
  mso-style-unhide: no;
212
212
  mso-style-qformat: yes;
213
+ mso-style-name: "Heading 1";
213
214
  mso-style-parent: Normal;
214
215
  mso-style-next: Normal;
215
216
  margin-top: {{normalfontsize}};
@@ -268,6 +269,7 @@ h1
268
269
  mso-style-unhide: no;
269
270
  mso-style-qformat: yes;
270
271
  mso-style-parent: "Heading 1";
272
+ mso-style-name: "Heading 2";
271
273
  mso-style-next: Normal;
272
274
  margin-top: 5.0pt;
273
275
  margin-right: 0cm;
@@ -294,6 +296,7 @@ h2 {
294
296
  .h3Annex, h3 {
295
297
  mso-style-unhide: no;
296
298
  mso-style-qformat: yes;
299
+ mso-style-name: "Heading 3";
297
300
  mso-style-parent: "Heading 2";
298
301
  mso-style-next: Normal;
299
302
  margin-top: 5.0pt;
@@ -321,6 +324,7 @@ h3 {
321
324
  .h4Annex, h4 {
322
325
  mso-style-unhide: no;
323
326
  mso-style-qformat: yes;
327
+ mso-style-name: "Heading 4";
324
328
  mso-style-parent: "Heading 3";
325
329
  mso-style-next: Normal;
326
330
  margin-top: 5.0pt;
@@ -348,6 +352,7 @@ h4 {
348
352
  .h5Annex, h5 {
349
353
  mso-style-unhide: no;
350
354
  mso-style-qformat: yes;
355
+ mso-style-name: "Heading 5";
351
356
  mso-style-parent: "Heading 4";
352
357
  mso-style-next: Normal;
353
358
  margin-top: 5.0pt;
@@ -375,6 +380,7 @@ h5 {
375
380
  h6 {
376
381
  mso-style-unhide: no;
377
382
  mso-style-qformat: yes;
383
+ mso-style-name: "Heading 6";
378
384
  mso-style-parent: "Heading 5";
379
385
  mso-style-next: Normal;
380
386
  margin-top: 5.0pt;
@@ -402,6 +408,7 @@ h6 {
402
408
  p.MsoHeading7, li.MsoHeading7, div.MsoHeading7 {
403
409
  mso-style-unhide: no;
404
410
  mso-style-qformat: yes;
411
+ mso-style-name: "Heading 7";
405
412
  mso-style-parent: "Heading 6";
406
413
  mso-style-next: Normal;
407
414
  margin-top: 5.0pt;
@@ -430,6 +437,7 @@ p.MsoHeading7 {
430
437
  p.MsoHeading8, li.MsoHeading8, div.MsoHeading8 {
431
438
  mso-style-unhide: no;
432
439
  mso-style-qformat: yes;
440
+ mso-style-name: "Heading 8";
433
441
  mso-style-parent: "Heading 7";
434
442
  mso-style-next: Normal;
435
443
  margin-top: 5.0pt;
@@ -458,6 +466,7 @@ p.MsoHeading8 {
458
466
  p.MsoHeading9, li.MsoHeading9, div.MsoHeading9 {
459
467
  mso-style-unhide: no;
460
468
  mso-style-qformat: yes;
469
+ mso-style-name: "Heading 9";
461
470
  mso-style-parent: "Heading 8";
462
471
  mso-style-next: Normal;
463
472
  margin-top: 5.0pt;
@@ -486,6 +495,7 @@ p.MsoHeading9 {
486
495
  p.MsoToc1, li.MsoToc1, div.MsoToc1 {
487
496
  mso-style-priority: 39;
488
497
  mso-style-unhide: no;
498
+ mso-style-name: "TOC 1";
489
499
  margin-top: 0cm;
490
500
  margin-right: 34.0pt;
491
501
  margin-bottom: 5.0pt;
@@ -507,6 +517,7 @@ p.MsoToc1, li.MsoToc1, div.MsoToc1 {
507
517
  p.MsoToc2, li.MsoToc2, div.MsoToc2 {
508
518
  mso-style-priority: 39;
509
519
  mso-style-unhide: no;
520
+ mso-style-name: "TOC 2";
510
521
  mso-style-parent: "TOC 1";
511
522
  margin-top: 0cm;
512
523
  margin-right: 34.0pt;
@@ -529,6 +540,7 @@ p.MsoToc2, li.MsoToc2, div.MsoToc2 {
529
540
  p.MsoToc3, li.MsoToc3, div.MsoToc3 {
530
541
  mso-style-priority: 39;
531
542
  mso-style-unhide: no;
543
+ mso-style-name: "TOC 3";
532
544
  mso-style-parent: "TOC 2";
533
545
  margin-top: 0cm;
534
546
  margin-right: 34.0pt;
@@ -551,6 +563,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3 {
551
563
  p.MsoToc4, li.MsoToc4, div.MsoToc4 {
552
564
  mso-style-noshow: yes;
553
565
  mso-style-unhide: no;
566
+ mso-style-name: "TOC 4";
554
567
  mso-style-parent: "TOC 3";
555
568
  margin-top: 0cm;
556
569
  margin-right: 34.0pt;
@@ -573,6 +586,7 @@ p.MsoToc4, li.MsoToc4, div.MsoToc4 {
573
586
  p.MsoToc5, li.MsoToc5, div.MsoToc5 {
574
587
  mso-style-noshow: yes;
575
588
  mso-style-unhide: no;
589
+ mso-style-name: "TOC 5";
576
590
  mso-style-parent: "TOC 4";
577
591
  margin-top: 0cm;
578
592
  margin-right: 34.0pt;
@@ -595,6 +609,7 @@ p.MsoToc5, li.MsoToc5, div.MsoToc5 {
595
609
  p.MsoToc6, li.MsoToc6, div.MsoToc6 {
596
610
  mso-style-noshow: yes;
597
611
  mso-style-unhide: no;
612
+ mso-style-name: "TOC 6";
598
613
  mso-style-parent: "TOC 5";
599
614
  margin-top: 0cm;
600
615
  margin-right: 34.0pt;
@@ -617,6 +632,7 @@ p.MsoToc6, li.MsoToc6, div.MsoToc6 {
617
632
  p.MsoToc7, li.MsoToc7, div.MsoToc7 {
618
633
  mso-style-noshow: yes;
619
634
  mso-style-unhide: no;
635
+ mso-style-name: "TOC 7";
620
636
  mso-style-parent: "TOC 6";
621
637
  margin-top: 0cm;
622
638
  margin-right: 34.0pt;
@@ -639,6 +655,7 @@ p.MsoToc7, li.MsoToc7, div.MsoToc7 {
639
655
  p.MsoToc8, li.MsoToc8, div.MsoToc8 {
640
656
  mso-style-noshow: yes;
641
657
  mso-style-unhide: no;
658
+ mso-style-name: "TOC 8";
642
659
  mso-style-parent: "TOC 7";
643
660
  margin-top: 0cm;
644
661
  margin-right: 34.0pt;
@@ -661,6 +678,7 @@ p.MsoToc8, li.MsoToc8, div.MsoToc8 {
661
678
  p.MsoToc9, li.MsoToc9, div.MsoToc9 {
662
679
  mso-style-noshow: yes;
663
680
  mso-style-unhide: no;
681
+ mso-style-name: "TOC 9";
664
682
  mso-style-parent: "TOC 8";
665
683
  margin-top: 0cm;
666
684
  margin-right: 34.0pt;
@@ -682,6 +700,7 @@ p.MsoToc9, li.MsoToc9, div.MsoToc9 {
682
700
 
683
701
  p.MsoHeader, li.MsoHeader, div.MsoHeader {
684
702
  mso-style-unhide: no;
703
+ mso-style-name: "Header";
685
704
  margin: 0cm;
686
705
  margin-bottom: .0001pt;
687
706
  text-align: justify;
@@ -750,6 +769,7 @@ span.MsoFootnoteReference {
750
769
  mso-style-noshow: yes;
751
770
  mso-style-unhide: no;
752
771
  mso-style-parent: "";
772
+ mso-style-name: "Footnote Reference";
753
773
  mso-ansi-font-size: 8.0pt;
754
774
  mso-bidi-font-size: 8.0pt;
755
775
  font-family: {{bodyfont}};
@@ -763,6 +783,7 @@ span.MsoFootnoteReference {
763
783
  p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText {
764
784
  mso-style-noshow: yes;
765
785
  mso-style-unhide: no;
786
+ mso-style-name: "MsoFootnoteText";
766
787
  margin-top: 0cm;
767
788
  margin-right: 0cm;
768
789
  margin-bottom: 5.0pt;
@@ -782,6 +803,7 @@ a:link, span.MsoHyperlink {
782
803
  mso-style-priority: 99;
783
804
  mso-style-unhide: no;
784
805
  mso-style-parent: "";
806
+ mso-style-name: "Hyperlink";
785
807
  color: windowtext;
786
808
  text-decoration: none;
787
809
  text-underline: none; }
@@ -1058,6 +1080,7 @@ span.BodyTextChar {
1058
1080
  p.MsoCommentText, li.MsoCommentText, div.MsoCommentText {
1059
1081
  mso-style-noshow: yes;
1060
1082
  mso-style-priority: 99;
1083
+ mso-style-name: "Comment Text";
1061
1084
  mso-style-link: "Comment Text Char";
1062
1085
  margin-top: 0cm;
1063
1086
  margin-right: 0cm;
@@ -1130,6 +1153,7 @@ p.Tablebody, li.Tablebody, div.Tablebody {
1130
1153
  p.MsoList, li.MsoList, div.MsoList {
1131
1154
  mso-style-unhide: no;
1132
1155
  mso-style-qformat: yes;
1156
+ mso-style-name: "List";
1133
1157
  margin-top: 0cm;
1134
1158
  margin-right: 0cm;
1135
1159
  margin-bottom: 5.0pt;
data/lib/isodoc/iec/html/wordstyle.scss CHANGED
@@ -193,6 +193,7 @@ div.figure, p.figure
193
193
  h1.main
194
194
  {mso-style-unhide:no;
195
195
  mso-style-qformat:yes;
196
+ mso-style-name:"Heading 1";
196
197
  mso-style-parent:Normal;
197
198
  mso-style-next:Normal;
198
199
  margin-top:$normalfontsize;
@@ -249,6 +250,7 @@ h1
249
250
  {mso-style-unhide:no;
250
251
  mso-style-qformat:yes;
251
252
  mso-style-parent:"Heading 1";
253
+ mso-style-name:"Heading 2";
252
254
  mso-style-next:Normal;
253
255
  margin-top:5.0pt;
254
256
  margin-right:0cm;
@@ -274,6 +276,7 @@ h2
274
276
  .h3Annex, h3
275
277
  {mso-style-unhide:no;
276
278
  mso-style-qformat:yes;
279
+ mso-style-name:"Heading 3";
277
280
  mso-style-parent:"Heading 2";
278
281
  mso-style-next:Normal;
279
282
  margin-top:5.0pt;
@@ -299,6 +302,7 @@ h3 {mso-list:l26 level3 lfo40;
299
302
  .h4Annex, h4
300
303
  {mso-style-unhide:no;
301
304
  mso-style-qformat:yes;
305
+ mso-style-name:"Heading 4";
302
306
  mso-style-parent:"Heading 3";
303
307
  mso-style-next:Normal;
304
308
  margin-top:5.0pt;
@@ -324,6 +328,7 @@ h4 {mso-list:l26 level2 lfo40;
324
328
  .h5Annex, h5
325
329
  {mso-style-unhide:no;
326
330
  mso-style-qformat:yes;
331
+ mso-style-name:"Heading 5";
327
332
  mso-style-parent:"Heading 4";
328
333
  mso-style-next:Normal;
329
334
  margin-top:5.0pt;
@@ -349,6 +354,7 @@ h5 {mso-list:l26 level5 lfo40;
349
354
  h6
350
355
  {mso-style-unhide:no;
351
356
  mso-style-qformat:yes;
357
+ mso-style-name:"Heading 6";
352
358
  mso-style-parent:"Heading 5";
353
359
  mso-style-next:Normal;
354
360
  margin-top:5.0pt;
@@ -374,6 +380,7 @@ h6 {mso-list:l26 level6 lfo40;
374
380
  p.MsoHeading7, li.MsoHeading7, div.MsoHeading7
375
381
  {mso-style-unhide:no;
376
382
  mso-style-qformat:yes;
383
+ mso-style-name:"Heading 7";
377
384
  mso-style-parent:"Heading 6";
378
385
  mso-style-next:Normal;
379
386
  margin-top:5.0pt;
@@ -399,6 +406,7 @@ p.MsoHeading7 {mso-list:l26 level7 lfo40;}
399
406
  p.MsoHeading8, li.MsoHeading8, div.MsoHeading8
400
407
  {mso-style-unhide:no;
401
408
  mso-style-qformat:yes;
409
+ mso-style-name:"Heading 8";
402
410
  mso-style-parent:"Heading 7";
403
411
  mso-style-next:Normal;
404
412
  margin-top:5.0pt;
@@ -424,6 +432,7 @@ p.MsoHeading8 {mso-list:l26 level8 lfo40;}
424
432
  p.MsoHeading9, li.MsoHeading9, div.MsoHeading9
425
433
  {mso-style-unhide:no;
426
434
  mso-style-qformat:yes;
435
+ mso-style-name:"Heading 9";
427
436
  mso-style-parent:"Heading 8";
428
437
  mso-style-next:Normal;
429
438
  margin-top:5.0pt;
@@ -449,6 +458,7 @@ p.MsoHeading9 {mso-list:l26 level9 lfo40;}
449
458
  p.MsoToc1, li.MsoToc1, div.MsoToc1
450
459
  { mso-style-priority:39;
451
460
  mso-style-unhide:no;
461
+ mso-style-name:"TOC 1";
452
462
  margin-top:0cm;
453
463
  margin-right:34.0pt;
454
464
  margin-bottom:5.0pt;
@@ -469,6 +479,7 @@ p.MsoToc1, li.MsoToc1, div.MsoToc1
469
479
  p.MsoToc2, li.MsoToc2, div.MsoToc2
470
480
  {mso-style-priority:39;
471
481
  mso-style-unhide:no;
482
+ mso-style-name:"TOC 2";
472
483
  mso-style-parent:"TOC 1";
473
484
  margin-top:0cm;
474
485
  margin-right:34.0pt;
@@ -490,6 +501,7 @@ p.MsoToc2, li.MsoToc2, div.MsoToc2
490
501
  p.MsoToc3, li.MsoToc3, div.MsoToc3
491
502
  {mso-style-priority:39;
492
503
  mso-style-unhide:no;
504
+ mso-style-name:"TOC 3";
493
505
  mso-style-parent:"TOC 2";
494
506
  margin-top:0cm;
495
507
  margin-right:34.0pt;
@@ -511,6 +523,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3
511
523
  p.MsoToc4, li.MsoToc4, div.MsoToc4
512
524
  {mso-style-noshow:yes;
513
525
  mso-style-unhide:no;
526
+ mso-style-name:"TOC 4";
514
527
  mso-style-parent:"TOC 3";
515
528
  margin-top:0cm;
516
529
  margin-right:34.0pt;
@@ -532,6 +545,7 @@ p.MsoToc4, li.MsoToc4, div.MsoToc4
532
545
  p.MsoToc5, li.MsoToc5, div.MsoToc5
533
546
  {mso-style-noshow:yes;
534
547
  mso-style-unhide:no;
548
+ mso-style-name:"TOC 5";
535
549
  mso-style-parent:"TOC 4";
536
550
  margin-top:0cm;
537
551
  margin-right:34.0pt;
@@ -553,6 +567,7 @@ p.MsoToc5, li.MsoToc5, div.MsoToc5
553
567
  p.MsoToc6, li.MsoToc6, div.MsoToc6
554
568
  {mso-style-noshow:yes;
555
569
  mso-style-unhide:no;
570
+ mso-style-name:"TOC 6";
556
571
  mso-style-parent:"TOC 5";
557
572
  margin-top:0cm;
558
573
  margin-right:34.0pt;
@@ -574,6 +589,7 @@ p.MsoToc6, li.MsoToc6, div.MsoToc6
574
589
  p.MsoToc7, li.MsoToc7, div.MsoToc7
575
590
  {mso-style-noshow:yes;
576
591
  mso-style-unhide:no;
592
+ mso-style-name:"TOC 7";
577
593
  mso-style-parent:"TOC 6";
578
594
  margin-top:0cm;
579
595
  margin-right:34.0pt;
@@ -595,6 +611,7 @@ p.MsoToc7, li.MsoToc7, div.MsoToc7
595
611
  p.MsoToc8, li.MsoToc8, div.MsoToc8
596
612
  {mso-style-noshow:yes;
597
613
  mso-style-unhide:no;
614
+ mso-style-name:"TOC 8";
598
615
  mso-style-parent:"TOC 7";
599
616
  margin-top:0cm;
600
617
  margin-right:34.0pt;
@@ -616,6 +633,7 @@ p.MsoToc8, li.MsoToc8, div.MsoToc8
616
633
  p.MsoToc9, li.MsoToc9, div.MsoToc9
617
634
  {mso-style-noshow:yes;
618
635
  mso-style-unhide:no;
636
+ mso-style-name:"TOC 9";
619
637
  mso-style-parent:"TOC 8";
620
638
  margin-top:0cm;
621
639
  margin-right:34.0pt;
@@ -636,6 +654,7 @@ p.MsoToc9, li.MsoToc9, div.MsoToc9
636
654
  mso-no-proof:yes;}
637
655
  p.MsoHeader, li.MsoHeader, div.MsoHeader
638
656
  {mso-style-unhide:no;
657
+ mso-style-name:"Header";
639
658
  margin:0cm;
640
659
  margin-bottom:.0001pt;
641
660
  text-align:justify;
@@ -700,6 +719,7 @@ span.MsoFootnoteReference
700
719
  {mso-style-noshow:yes;
701
720
  mso-style-unhide:no;
702
721
  mso-style-parent:"";
722
+ mso-style-name:"Footnote Reference";
703
723
  mso-ansi-font-size:8.0pt;
704
724
  mso-bidi-font-size:8.0pt;
705
725
  font-family:$bodyfont;
@@ -712,6 +732,7 @@ span.MsoFootnoteReference
712
732
  p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText
713
733
  {mso-style-noshow:yes;
714
734
  mso-style-unhide:no;
735
+ mso-style-name:"MsoFootnoteText";
715
736
  margin-top:0cm;
716
737
  margin-right:0cm;
717
738
  margin-bottom:5.0pt;
@@ -730,6 +751,7 @@ a:link, span.MsoHyperlink
730
751
  {mso-style-priority:99;
731
752
  mso-style-unhide:no;
732
753
  mso-style-parent:"";
754
+ mso-style-name:"Hyperlink";
733
755
  color:windowtext;
734
756
  text-decoration:none;
735
757
  text-underline:none;}
@@ -990,6 +1012,7 @@ span.BodyTextChar
990
1012
  p.MsoCommentText, li.MsoCommentText, div.MsoCommentText
991
1013
  {mso-style-noshow:yes;
992
1014
  mso-style-priority:99;
1015
+ mso-style-name:"Comment Text";
993
1016
  mso-style-link:"Comment Text Char";
994
1017
  margin-top:0cm;
995
1018
  margin-right:0cm;
@@ -1057,6 +1080,7 @@ p.Tablebody, li.Tablebody, div.Tablebody
1057
1080
  p.MsoList, li.MsoList, div.MsoList
1058
1081
  {mso-style-unhide:no;
1059
1082
  mso-style-qformat:yes;
1083
+ mso-style-name:"List";
1060
1084
  margin-top:0cm;
1061
1085
  margin-right:0cm;
1062
1086
  margin-bottom:5.0pt;