metanorma-nist 1.2.5 → 1.2.10
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/workflows/rake.yml +62 -0
- data/.github/workflows/release.yml +36 -0
- data/README.adoc +23 -7
- data/lib/asciidoctor/nist/basicdoc.rng +50 -3
- data/lib/asciidoctor/nist/boilerplate.rb +3 -1
- data/lib/asciidoctor/nist/cleanup.rb +2 -1
- data/lib/asciidoctor/nist/converter.rb +3 -0
- data/lib/asciidoctor/nist/front.rb +36 -45
- data/lib/asciidoctor/nist/front_id.rb +18 -7
- data/lib/asciidoctor/nist/isodoc.rng +36 -43
- data/lib/asciidoctor/nist/nist.rng +1 -0
- data/lib/asciidoctor/nist/validate.rb +17 -6
- data/lib/isodoc/nist/base_convert.rb +2 -3
- data/lib/isodoc/nist/fonts_manifest.yaml +4 -0
- data/lib/isodoc/nist/html/header_cswp.html +2 -3
- data/lib/isodoc/nist/html/htmlstyle.css +225 -221
- data/lib/isodoc/nist/html/htmlstyle.scss +5 -6
- data/lib/isodoc/nist/html/nist.css +49 -50
- data/lib/isodoc/nist/html/nist.scss +49 -50
- data/lib/isodoc/nist/html/nist_cswp.css +48 -49
- data/lib/isodoc/nist/html/nist_cswp.scss +48 -49
- data/lib/isodoc/nist/html/wordstyle.css +42 -42
- data/lib/isodoc/nist/html/wordstyle.scss +42 -42
- data/lib/isodoc/nist/html/wordstyle_cswp.css +52 -52
- data/lib/isodoc/nist/html/wordstyle_cswp.scss +52 -52
- data/lib/isodoc/nist/html_convert.rb +12 -1
- data/lib/isodoc/nist/metadata.rb +28 -40
- data/lib/isodoc/nist/metadata_id.rb +3 -7
- data/lib/isodoc/nist/nist.cswp.xsl +329 -156
- data/lib/isodoc/nist/nist.sp.xsl +326 -192
- data/lib/isodoc/nist/presentation_xml_convert.rb +30 -10
- data/lib/isodoc/nist/refs.rb +6 -20
- data/lib/isodoc/nist/render.rb +42 -40
- data/lib/isodoc/nist/render_dates.rb +8 -9
- data/lib/isodoc/nist/word_convert.rb +9 -3
- data/lib/metanorma/nist/processor.rb +14 -8
- data/lib/metanorma/nist/version.rb +1 -1
- data/metanorma-nist.gemspec +2 -2
- metadata +9 -9
- data/.github/workflows/macos.yml +0 -38
- data/.github/workflows/ubuntu.yml +0 -56
- data/.github/workflows/windows.yml +0 -40
@@ -79,9 +79,9 @@ p.MsoNormal, li.MsoNormal, div.MsoNormal {
|
|
79
79
|
mso-style-qformat: yes;
|
80
80
|
mso-style-parent: "";
|
81
81
|
margin: 0cm;
|
82
|
-
margin-bottom:
|
82
|
+
margin-bottom: {{normalfontsize}};
|
83
83
|
mso-pagination: widow-orphan;
|
84
|
-
font-size:
|
84
|
+
font-size: {{normalfontsize}};
|
85
85
|
font-family: {{bodyfont}};
|
86
86
|
mso-fareast-font-family: "Times New Roman";
|
87
87
|
mso-ansi-language: EN-US;
|
@@ -93,11 +93,11 @@ p.MsoListParagraph, li.MsoListParagraph, div.MsoListParagraph {
|
|
93
93
|
mso-style-qformat: yes;
|
94
94
|
margin-top: 0cm;
|
95
95
|
margin-right: 0cm;
|
96
|
-
margin-bottom:
|
96
|
+
margin-bottom: {{normalfontsize}};
|
97
97
|
/* do not put in margin-left, it is specific to list level */
|
98
98
|
mso-add-space: auto;
|
99
99
|
mso-pagination: widow-orphan;
|
100
|
-
font-size:
|
100
|
+
font-size: {{normalfontsize}};
|
101
101
|
font-family: {{bodyfont}};
|
102
102
|
mso-ansi-language: EN-AU;
|
103
103
|
mso-fareast-language: EN-US; }
|
@@ -109,11 +109,11 @@ p.MsoListParagraphCxSpFirst, li.MsoListParagraphCxSpFirst, div.MsoListParagraphC
|
|
109
109
|
mso-style-type: export-only;
|
110
110
|
margin-top: 0cm;
|
111
111
|
margin-right: 0cm;
|
112
|
-
margin-bottom:
|
112
|
+
margin-bottom: {{normalfontsize}};
|
113
113
|
/* do not put in margin-left, it is specific to list level */
|
114
114
|
mso-add-space: auto;
|
115
115
|
mso-pagination: widow-orphan;
|
116
|
-
font-size:
|
116
|
+
font-size: {{normalfontsize}};
|
117
117
|
font-family: {{bodyfont}};
|
118
118
|
mso-ansi-language: EN-AU;
|
119
119
|
mso-fareast-language: EN-US; }
|
@@ -125,11 +125,11 @@ p.MsoListParagraphCxSpMiddle, li.MsoListParagraphCxSpMiddle, div.MsoListParagrap
|
|
125
125
|
mso-style-type: export-only;
|
126
126
|
margin-top: 0cm;
|
127
127
|
margin-right: 0cm;
|
128
|
-
margin-bottom:
|
128
|
+
margin-bottom: {{normalfontsize}};
|
129
129
|
/* do not put in margin-left, it is specific to list level */
|
130
130
|
mso-add-space: auto;
|
131
131
|
mso-pagination: widow-orphan;
|
132
|
-
font-size:
|
132
|
+
font-size: {{normalfontsize}};
|
133
133
|
font-family: {{bodyfont}};
|
134
134
|
mso-ansi-language: EN-AU;
|
135
135
|
mso-fareast-language: EN-US; }
|
@@ -141,11 +141,11 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
|
|
141
141
|
mso-style-type: export-only;
|
142
142
|
margin-top: 0cm;
|
143
143
|
margin-right: 0cm;
|
144
|
-
margin-bottom:
|
144
|
+
margin-bottom: {{normalfontsize}};
|
145
145
|
/* do not put in margin-left, it is specific to list level */
|
146
146
|
mso-add-space: auto;
|
147
147
|
mso-pagination: widow-orphan;
|
148
|
-
font-size:
|
148
|
+
font-size: {{normalfontsize}};
|
149
149
|
font-family: {{bodyfont}};
|
150
150
|
mso-ansi-language: EN-AU;
|
151
151
|
mso-fareast-language: EN-US; }
|
@@ -156,7 +156,7 @@ p.MsoCommentText, li.MsoCommentText, div.MsoCommentText {
|
|
156
156
|
margin: 0cm;
|
157
157
|
margin-bottom: .0001pt;
|
158
158
|
mso-pagination: widow-orphan;
|
159
|
-
font-size:
|
159
|
+
font-size: {{footnotefontsize}};
|
160
160
|
font-family: {{bodyfont}};
|
161
161
|
mso-fareast-font-family: "Times New Roman";
|
162
162
|
mso-ansi-language: EN-US;
|
@@ -168,7 +168,7 @@ p.MsoHeader, li.MsoHeader, div.MsoHeader {
|
|
168
168
|
margin-bottom: .0001pt;
|
169
169
|
mso-pagination: widow-orphan;
|
170
170
|
tab-stops: right 482.0pt;
|
171
|
-
font-size:
|
171
|
+
font-size: {{normalfontsize}};
|
172
172
|
font-family: {{headerfont}};
|
173
173
|
mso-fareast-font-family: "Times New Roman";
|
174
174
|
mso-ansi-language: EN-US;
|
@@ -180,7 +180,7 @@ p.MsoHeaderLandscape, li.MsoHeaderLandscape, div.MsoHeaderLandscape {
|
|
180
180
|
margin-bottom: .0001pt;
|
181
181
|
mso-pagination: widow-orphan;
|
182
182
|
tab-stops: right 9.0in;
|
183
|
-
font-size:
|
183
|
+
font-size: {{normalfontsize}};
|
184
184
|
font-family: {{headerfont}};
|
185
185
|
mso-fareast-font-family: "Times New Roman";
|
186
186
|
mso-ansi-language: EN-US;
|
@@ -192,7 +192,7 @@ p.MsoFooter, li.MsoFooter, div.MsoFooter {
|
|
192
192
|
margin-bottom: .0001pt;
|
193
193
|
mso-pagination: widow-orphan;
|
194
194
|
tab-stops: center 3.25in;
|
195
|
-
font-size:
|
195
|
+
font-size: {{normalfontsize}};
|
196
196
|
font-family: {{bodyfont}};
|
197
197
|
mso-fareast-font-family: "Times New Roman";
|
198
198
|
mso-ansi-language: EN-US;
|
@@ -204,7 +204,7 @@ p.MsoFooterLandscape, li.MsoFooterLandscape, div.MsoFooterLandscape {
|
|
204
204
|
margin-bottom: .0001pt;
|
205
205
|
mso-pagination: widow-orphan;
|
206
206
|
tab-stops: center 4.5in;
|
207
|
-
font-size:
|
207
|
+
font-size: {{normalfontsize}};
|
208
208
|
font-family: {{bodyfont}};
|
209
209
|
mso-fareast-font-family: "Times New Roman";
|
210
210
|
mso-ansi-language: EN-US;
|
@@ -225,7 +225,7 @@ p.MsoBodyText, li.MsoBodyText, div.MsoBodyText {
|
|
225
225
|
margin-left: 0cm;
|
226
226
|
margin-bottom: .0001pt;
|
227
227
|
mso-pagination: widow-orphan;
|
228
|
-
font-size:
|
228
|
+
font-size: {{normalfontsize}};
|
229
229
|
font-family: {{bodyfont}};
|
230
230
|
mso-fareast-font-family: "Times New Roman";
|
231
231
|
mso-bidi-font-family: "Times New Roman";
|
@@ -333,7 +333,7 @@ p.MsoCommentSubject, li.MsoCommentSubject, div.MsoCommentSubject {
|
|
333
333
|
margin: 0cm;
|
334
334
|
margin-bottom: .0001pt;
|
335
335
|
mso-pagination: widow-orphan;
|
336
|
-
font-size:
|
336
|
+
font-size: {{footnotefontsize}};
|
337
337
|
font-family: {{bodyfont}};
|
338
338
|
mso-fareast-font-family: "Times New Roman";
|
339
339
|
mso-ansi-language: EN-US;
|
@@ -377,7 +377,7 @@ h1 {
|
|
377
377
|
mso-style-next: Normal;
|
378
378
|
margin-top: 0in;
|
379
379
|
margin-right: 0in;
|
380
|
-
margin-bottom:
|
380
|
+
margin-bottom: {{normalfontsize}};
|
381
381
|
margin-left: .4in;
|
382
382
|
text-align: justify;
|
383
383
|
text-indent: -.4in;
|
@@ -393,7 +393,7 @@ h1 {
|
|
393
393
|
mso-border-alt: solid windowtext .5pt;
|
394
394
|
padding: 0in;
|
395
395
|
mso-padding-alt: 1.0pt 4.0pt 1.0pt 4.0pt;
|
396
|
-
font-size:
|
396
|
+
font-size: {{normalfontsize}};
|
397
397
|
mso-bidi-font-size: 10.0pt;
|
398
398
|
font-family: {{headerfont}};
|
399
399
|
mso-fareast-font-family: {{headerfont}};
|
@@ -411,7 +411,7 @@ h1 {
|
|
411
411
|
mso-style-next: Normal;
|
412
412
|
margin-top: 0in;
|
413
413
|
margin-right: 0in;
|
414
|
-
margin-bottom:
|
414
|
+
margin-bottom: {{normalfontsize}};
|
415
415
|
margin-left: .4in;
|
416
416
|
text-align: center;
|
417
417
|
text-indent: -.4in;
|
@@ -426,7 +426,7 @@ h1 {
|
|
426
426
|
mso-border-alt: none;
|
427
427
|
padding: 0in;
|
428
428
|
mso-padding-alt: 1.0pt 4.0pt 1.0pt 4.0pt;
|
429
|
-
font-size:
|
429
|
+
font-size: {{normalfontsize}};
|
430
430
|
mso-bidi-font-size: 10.0pt;
|
431
431
|
font-family: {{headerfont}};
|
432
432
|
mso-fareast-font-family: {{headerfont}};
|
@@ -456,7 +456,7 @@ h1.NormalTitle {
|
|
456
456
|
mso-style-next: Normal;
|
457
457
|
margin-top: 3.0pt;
|
458
458
|
margin-right: 0cm;
|
459
|
-
margin-bottom:
|
459
|
+
margin-bottom: {{normalfontsize}};
|
460
460
|
margin-left: 0cm;
|
461
461
|
text-indent: 0cm;
|
462
462
|
line-height: 12.5pt;
|
@@ -464,7 +464,7 @@ h1.NormalTitle {
|
|
464
464
|
page-break-after: avoid;
|
465
465
|
mso-hyphenate: none;
|
466
466
|
tab-stops: 27.0pt 35.0pt;
|
467
|
-
font-size:
|
467
|
+
font-size: {{normalfontsize}};
|
468
468
|
mso-bidi-font-size: 11.0pt;
|
469
469
|
font-family: {{headerfont}};
|
470
470
|
font-weight: bold;
|
@@ -489,7 +489,7 @@ h2 {
|
|
489
489
|
mso-style-next: Normal;
|
490
490
|
mso-margin-top-alt: auto;
|
491
491
|
margin-right: 0in;
|
492
|
-
margin-bottom:
|
492
|
+
margin-bottom: {{normalfontsize}};
|
493
493
|
margin-left: .4in;
|
494
494
|
text-align: justify;
|
495
495
|
text-indent: -.4in;
|
@@ -520,7 +520,7 @@ h3 {
|
|
520
520
|
mso-style-next: Normal;
|
521
521
|
mso-margin-top-alt: auto;
|
522
522
|
margin-right: 0in;
|
523
|
-
margin-bottom:
|
523
|
+
margin-bottom: {{normalfontsize}};
|
524
524
|
margin-left: 0in;
|
525
525
|
text-align: left;
|
526
526
|
text-indent: 0in;
|
@@ -551,7 +551,7 @@ h3 {
|
|
551
551
|
mso-style-next: Normal;
|
552
552
|
mso-margin-top-alt: auto;
|
553
553
|
margin-right: 0in;
|
554
|
-
margin-bottom:
|
554
|
+
margin-bottom: {{normalfontsize}};
|
555
555
|
margin-left: 0in;
|
556
556
|
text-align: left;
|
557
557
|
text-indent: 0in;
|
@@ -581,7 +581,7 @@ h4 {
|
|
581
581
|
mso-style-next: Normal;
|
582
582
|
mso-margin-top-alt: auto;
|
583
583
|
margin-right: 0in;
|
584
|
-
margin-bottom:
|
584
|
+
margin-bottom: {{normalfontsize}};
|
585
585
|
margin-left: .6in;
|
586
586
|
text-align: left;
|
587
587
|
text-indent: -.6in;
|
@@ -612,7 +612,7 @@ h4 {
|
|
612
612
|
mso-style-next: Normal;
|
613
613
|
mso-margin-top-alt: auto;
|
614
614
|
margin-right: 0in;
|
615
|
-
margin-bottom:
|
615
|
+
margin-bottom: {{normalfontsize}};
|
616
616
|
margin-left: .6in;
|
617
617
|
text-align: left;
|
618
618
|
text-indent: -.6in;
|
@@ -642,7 +642,7 @@ h5 {
|
|
642
642
|
mso-style-next: Normal;
|
643
643
|
mso-margin-top-alt: auto;
|
644
644
|
margin-right: 0in;
|
645
|
-
margin-bottom:
|
645
|
+
margin-bottom: {{normalfontsize}};
|
646
646
|
margin-left: .7in;
|
647
647
|
text-align: left;
|
648
648
|
text-indent: -.7in;
|
@@ -673,7 +673,7 @@ h5 {
|
|
673
673
|
mso-style-next: Normal;
|
674
674
|
mso-margin-top-alt: auto;
|
675
675
|
margin-right: 0in;
|
676
|
-
margin-bottom:
|
676
|
+
margin-bottom: {{normalfontsize}};
|
677
677
|
margin-left: .7in;
|
678
678
|
text-align: left;
|
679
679
|
text-indent: -.7in;
|
@@ -704,7 +704,7 @@ h6 {
|
|
704
704
|
mso-style-next: Normal;
|
705
705
|
margin-top: 0in;
|
706
706
|
margin-right: 0in;
|
707
|
-
margin-bottom:
|
707
|
+
margin-bottom: {{normalfontsize}};
|
708
708
|
margin-left: 116.1pt;
|
709
709
|
text-align: justify;
|
710
710
|
text-indent: -.8in;
|
@@ -738,7 +738,7 @@ h6 {
|
|
738
738
|
mso-style-next: Normal;
|
739
739
|
margin-top: 0in;
|
740
740
|
margin-right: 0in;
|
741
|
-
margin-bottom:
|
741
|
+
margin-bottom: {{normalfontsize}};
|
742
742
|
margin-left: 116.1pt;
|
743
743
|
text-align: justify;
|
744
744
|
text-indent: -.8in;
|
@@ -768,14 +768,14 @@ p.TOCTitle, li.TOCTitle, div.TOCTitle {
|
|
768
768
|
mso-style-unhide: no;
|
769
769
|
margin-top: 0in;
|
770
770
|
margin-right: 0in;
|
771
|
-
margin-bottom:
|
771
|
+
margin-bottom: {{normalfontsize}};
|
772
772
|
margin-left: 0in;
|
773
773
|
text-align: center;
|
774
774
|
page-break-after: avoid;
|
775
775
|
mso-pagination: none;
|
776
776
|
mso-hyphenate: none;
|
777
777
|
mso-layout-grid-align: none;
|
778
|
-
font-size:
|
778
|
+
font-size: {{normalfontsize}};
|
779
779
|
mso-bidi-font-size: 10.0pt;
|
780
780
|
font-weight: bold;
|
781
781
|
font-family: {{headerfont}};
|
@@ -861,13 +861,13 @@ p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText {
|
|
861
861
|
mso-style-link: "Footnote Text Char";
|
862
862
|
margin-top: 0cm;
|
863
863
|
margin-right: 0cm;
|
864
|
-
margin-bottom:
|
864
|
+
margin-bottom: {{normalfontsize}};
|
865
865
|
margin-left: 0cm;
|
866
866
|
text-align: justify;
|
867
|
-
line-height:
|
867
|
+
line-height: {{normalfontsize}};
|
868
868
|
mso-pagination: widow-orphan;
|
869
869
|
tab-stops: 20.15pt;
|
870
|
-
font-size:
|
870
|
+
font-size: {{footnotefontsize}};
|
871
871
|
font-family: {{bodyfont}};
|
872
872
|
mso-fareast-font-family: {{bodyfont}};
|
873
873
|
mso-bidi-font-family: {{bodyfont}};
|
@@ -884,9 +884,9 @@ p.MsoBodyText, li.MsoBodyText, div.MsoBodyText {
|
|
884
884
|
margin-bottom: 6.0pt;
|
885
885
|
margin-left: 0cm;
|
886
886
|
text-align: justify;
|
887
|
-
line-height:
|
887
|
+
line-height: {{normalfontsize}};
|
888
888
|
mso-pagination: widow-orphan;
|
889
|
-
font-size:
|
889
|
+
font-size: {{normalfontsize}};
|
890
890
|
font-family: {{bodyfont}};
|
891
891
|
mso-fareast-font-family: {{bodyfont}};
|
892
892
|
mso-bidi-font-family: {{bodyfont}};
|
@@ -899,7 +899,7 @@ span.Heading1Char {
|
|
899
899
|
mso-style-locked: yes;
|
900
900
|
mso-style-parent: "";
|
901
901
|
mso-style-link: "Heading 1";
|
902
|
-
mso-ansi-font-size:
|
902
|
+
mso-ansi-font-size: {{normalfontsize}};
|
903
903
|
font-family: {{headerfont}};
|
904
904
|
mso-ascii-font-family: Cambria;
|
905
905
|
mso-fareast-font-family: {{headerfont}};
|
@@ -916,7 +916,7 @@ span.Heading2Char {
|
|
916
916
|
mso-style-locked: yes;
|
917
917
|
mso-style-parent: "";
|
918
918
|
mso-style-link: "Heading 2";
|
919
|
-
mso-ansi-font-size:
|
919
|
+
mso-ansi-font-size: {{normalfontsize}};
|
920
920
|
font-family: {{headerfont}};
|
921
921
|
mso-ascii-font-family: Cambria;
|
922
922
|
mso-fareast-font-family: {{headerfont}};
|
@@ -1508,7 +1508,7 @@ table.MsoNormalTable {
|
|
1508
1508
|
mso-para-margin: 0cm;
|
1509
1509
|
mso-para-margin-bottom: .0001pt;
|
1510
1510
|
mso-pagination: widow-orphan;
|
1511
|
-
font-size:
|
1511
|
+
font-size: {{smallerfontsize}};
|
1512
1512
|
font-family: {{bodyfont}}; }
|
1513
1513
|
|
1514
1514
|
ol {
|
@@ -69,9 +69,9 @@ p.MsoNormal, li.MsoNormal, div.MsoNormal
|
|
69
69
|
mso-style-qformat:yes;
|
70
70
|
mso-style-parent:"";
|
71
71
|
margin:0cm;
|
72
|
-
margin-bottom
|
72
|
+
margin-bottom:$normalfontsize;
|
73
73
|
mso-pagination:widow-orphan;
|
74
|
-
font-size
|
74
|
+
font-size:$normalfontsize;
|
75
75
|
font-family:$bodyfont;
|
76
76
|
mso-fareast-font-family:"Times New Roman";
|
77
77
|
mso-ansi-language:EN-US;
|
@@ -82,11 +82,11 @@ p.MsoListParagraph, li.MsoListParagraph, div.MsoListParagraph
|
|
82
82
|
mso-style-qformat:yes;
|
83
83
|
margin-top:0cm;
|
84
84
|
margin-right:0cm;
|
85
|
-
margin-bottom
|
85
|
+
margin-bottom:$normalfontsize;
|
86
86
|
/* do not put in margin-left, it is specific to list level */
|
87
87
|
mso-add-space:auto;
|
88
88
|
mso-pagination:widow-orphan;
|
89
|
-
font-size
|
89
|
+
font-size:$normalfontsize;
|
90
90
|
font-family:$bodyfont;
|
91
91
|
mso-ansi-language:EN-AU;
|
92
92
|
mso-fareast-language:EN-US;}
|
@@ -97,11 +97,11 @@ p.MsoListParagraphCxSpFirst, li.MsoListParagraphCxSpFirst, div.MsoListParagraphC
|
|
97
97
|
mso-style-type:export-only;
|
98
98
|
margin-top:0cm;
|
99
99
|
margin-right:0cm;
|
100
|
-
margin-bottom
|
100
|
+
margin-bottom:$normalfontsize;
|
101
101
|
/* do not put in margin-left, it is specific to list level */
|
102
102
|
mso-add-space:auto;
|
103
103
|
mso-pagination:widow-orphan;
|
104
|
-
font-size
|
104
|
+
font-size:$normalfontsize;
|
105
105
|
font-family:$bodyfont;
|
106
106
|
mso-ansi-language:EN-AU;
|
107
107
|
mso-fareast-language:EN-US;}
|
@@ -112,11 +112,11 @@ p.MsoListParagraphCxSpMiddle, li.MsoListParagraphCxSpMiddle, div.MsoListParagrap
|
|
112
112
|
mso-style-type:export-only;
|
113
113
|
margin-top:0cm;
|
114
114
|
margin-right:0cm;
|
115
|
-
margin-bottom
|
115
|
+
margin-bottom:$normalfontsize;
|
116
116
|
/* do not put in margin-left, it is specific to list level */
|
117
117
|
mso-add-space:auto;
|
118
118
|
mso-pagination:widow-orphan;
|
119
|
-
font-size
|
119
|
+
font-size:$normalfontsize;
|
120
120
|
font-family:$bodyfont;
|
121
121
|
mso-ansi-language:EN-AU;
|
122
122
|
mso-fareast-language:EN-US;}
|
@@ -127,11 +127,11 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
|
|
127
127
|
mso-style-type:export-only;
|
128
128
|
margin-top:0cm;
|
129
129
|
margin-right:0cm;
|
130
|
-
margin-bottom
|
130
|
+
margin-bottom:$normalfontsize;
|
131
131
|
/* do not put in margin-left, it is specific to list level */
|
132
132
|
mso-add-space:auto;
|
133
133
|
mso-pagination:widow-orphan;
|
134
|
-
font-size
|
134
|
+
font-size:$normalfontsize;
|
135
135
|
font-family:$bodyfont;
|
136
136
|
mso-ansi-language:EN-AU;
|
137
137
|
mso-fareast-language:EN-US;}
|
@@ -142,7 +142,7 @@ p.MsoCommentText, li.MsoCommentText, div.MsoCommentText
|
|
142
142
|
margin:0cm;
|
143
143
|
margin-bottom:.0001pt;
|
144
144
|
mso-pagination:widow-orphan;
|
145
|
-
font-size
|
145
|
+
font-size:$footnotefontsize;
|
146
146
|
font-family:$bodyfont;
|
147
147
|
mso-fareast-font-family:"Times New Roman";
|
148
148
|
mso-ansi-language:EN-US;
|
@@ -153,7 +153,7 @@ p.MsoHeader, li.MsoHeader, div.MsoHeader
|
|
153
153
|
margin-bottom:.0001pt;
|
154
154
|
mso-pagination:widow-orphan;
|
155
155
|
tab-stops:right 482.0pt;
|
156
|
-
font-size
|
156
|
+
font-size:$normalfontsize;
|
157
157
|
font-family:$headerfont;
|
158
158
|
mso-fareast-font-family:"Times New Roman";
|
159
159
|
mso-ansi-language:EN-US;
|
@@ -164,7 +164,7 @@ p.MsoHeaderLandscape, li.MsoHeaderLandscape, div.MsoHeaderLandscape
|
|
164
164
|
margin-bottom:.0001pt;
|
165
165
|
mso-pagination:widow-orphan;
|
166
166
|
tab-stops:right 9.0in;
|
167
|
-
font-size
|
167
|
+
font-size:$normalfontsize;
|
168
168
|
font-family:$headerfont;
|
169
169
|
mso-fareast-font-family:"Times New Roman";
|
170
170
|
mso-ansi-language:EN-US;
|
@@ -175,7 +175,7 @@ p.MsoFooter, li.MsoFooter, div.MsoFooter
|
|
175
175
|
margin-bottom:.0001pt;
|
176
176
|
mso-pagination:widow-orphan;
|
177
177
|
tab-stops:center 3.25in;
|
178
|
-
font-size
|
178
|
+
font-size:$normalfontsize;
|
179
179
|
font-family:$bodyfont;
|
180
180
|
mso-fareast-font-family:"Times New Roman";
|
181
181
|
mso-ansi-language:EN-US;
|
@@ -186,7 +186,7 @@ p.MsoFooterLandscape, li.MsoFooterLandscape, div.MsoFooterLandscape
|
|
186
186
|
margin-bottom:.0001pt;
|
187
187
|
mso-pagination:widow-orphan;
|
188
188
|
tab-stops:center 4.5in;
|
189
|
-
font-size
|
189
|
+
font-size:$normalfontsize;
|
190
190
|
font-family:$bodyfont;
|
191
191
|
mso-fareast-font-family:"Times New Roman";
|
192
192
|
mso-ansi-language:EN-US;
|
@@ -205,7 +205,7 @@ p.MsoBodyText, li.MsoBodyText, div.MsoBodyText
|
|
205
205
|
margin-left:0cm;
|
206
206
|
margin-bottom:.0001pt;
|
207
207
|
mso-pagination:widow-orphan;
|
208
|
-
font-size
|
208
|
+
font-size:$normalfontsize;
|
209
209
|
font-family:$bodyfont;
|
210
210
|
mso-fareast-font-family:"Times New Roman";
|
211
211
|
mso-bidi-font-family:"Times New Roman";
|
@@ -306,7 +306,7 @@ p.MsoCommentSubject, li.MsoCommentSubject, div.MsoCommentSubject
|
|
306
306
|
margin:0cm;
|
307
307
|
margin-bottom:.0001pt;
|
308
308
|
mso-pagination:widow-orphan;
|
309
|
-
font-size
|
309
|
+
font-size:$footnotefontsize;
|
310
310
|
font-family:$bodyfont;
|
311
311
|
mso-fareast-font-family:"Times New Roman";
|
312
312
|
mso-ansi-language:EN-US;
|
@@ -345,7 +345,7 @@ h1
|
|
345
345
|
mso-style-next:Normal;
|
346
346
|
margin-top:0in;
|
347
347
|
margin-right:0in;
|
348
|
-
margin-bottom
|
348
|
+
margin-bottom:$normalfontsize;
|
349
349
|
margin-left:.4in;
|
350
350
|
text-align:justify;
|
351
351
|
text-indent:-.4in;
|
@@ -361,7 +361,7 @@ h1
|
|
361
361
|
mso-border-alt:solid windowtext .5pt;
|
362
362
|
padding:0in;
|
363
363
|
mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt;
|
364
|
-
font-size
|
364
|
+
font-size:$normalfontsize;
|
365
365
|
mso-bidi-font-size:10.0pt;
|
366
366
|
font-family:$headerfont;
|
367
367
|
mso-fareast-font-family:$headerfont;
|
@@ -378,7 +378,7 @@ h1
|
|
378
378
|
mso-style-next:Normal;
|
379
379
|
margin-top:0in;
|
380
380
|
margin-right:0in;
|
381
|
-
margin-bottom
|
381
|
+
margin-bottom:$normalfontsize;
|
382
382
|
margin-left:.4in;
|
383
383
|
text-align:center;
|
384
384
|
text-indent:-.4in;
|
@@ -393,7 +393,7 @@ h1
|
|
393
393
|
mso-border-alt:none;
|
394
394
|
padding:0in;
|
395
395
|
mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt;
|
396
|
-
font-size
|
396
|
+
font-size:$normalfontsize;
|
397
397
|
mso-bidi-font-size:10.0pt;
|
398
398
|
font-family:$headerfont;
|
399
399
|
mso-fareast-font-family:$headerfont;
|
@@ -427,7 +427,7 @@ h1.Annex {
|
|
427
427
|
mso-style-next:Normal;
|
428
428
|
margin-top:3.0pt;
|
429
429
|
margin-right:0cm;
|
430
|
-
margin-bottom
|
430
|
+
margin-bottom:$normalfontsize;
|
431
431
|
margin-left:0cm;
|
432
432
|
text-indent:0cm;
|
433
433
|
line-height:12.5pt;
|
@@ -435,7 +435,7 @@ h1.Annex {
|
|
435
435
|
page-break-after:avoid;
|
436
436
|
mso-hyphenate:none;
|
437
437
|
tab-stops:27.0pt 35.0pt;
|
438
|
-
font-size
|
438
|
+
font-size:$normalfontsize;
|
439
439
|
mso-bidi-font-size:11.0pt;
|
440
440
|
font-family:$headerfont;
|
441
441
|
font-weight:bold;
|
@@ -459,7 +459,7 @@ h2
|
|
459
459
|
mso-style-next:Normal;
|
460
460
|
mso-margin-top-alt:auto;
|
461
461
|
margin-right:0in;
|
462
|
-
margin-bottom
|
462
|
+
margin-bottom:$normalfontsize;
|
463
463
|
margin-left:.4in;
|
464
464
|
text-align:justify;
|
465
465
|
text-indent:-.4in;
|
@@ -489,7 +489,7 @@ h3
|
|
489
489
|
mso-style-next:Normal;
|
490
490
|
mso-margin-top-alt:auto;
|
491
491
|
margin-right:0in;
|
492
|
-
margin-bottom
|
492
|
+
margin-bottom:$normalfontsize;
|
493
493
|
margin-left:0in;
|
494
494
|
text-align:left;
|
495
495
|
text-indent:0in;
|
@@ -519,7 +519,7 @@ h3
|
|
519
519
|
mso-style-next:Normal;
|
520
520
|
mso-margin-top-alt:auto;
|
521
521
|
margin-right:0in;
|
522
|
-
margin-bottom
|
522
|
+
margin-bottom:$normalfontsize;
|
523
523
|
margin-left:0in;
|
524
524
|
text-align:left;
|
525
525
|
text-indent:0in;
|
@@ -549,7 +549,7 @@ h4
|
|
549
549
|
mso-style-next:Normal;
|
550
550
|
mso-margin-top-alt:auto;
|
551
551
|
margin-right:0in;
|
552
|
-
margin-bottom
|
552
|
+
margin-bottom:$normalfontsize;
|
553
553
|
margin-left:.6in;
|
554
554
|
text-align:left;
|
555
555
|
text-indent:-.6in;
|
@@ -579,7 +579,7 @@ h4
|
|
579
579
|
mso-style-next:Normal;
|
580
580
|
mso-margin-top-alt:auto;
|
581
581
|
margin-right:0in;
|
582
|
-
margin-bottom
|
582
|
+
margin-bottom:$normalfontsize;
|
583
583
|
margin-left:.6in;
|
584
584
|
text-align:left;
|
585
585
|
text-indent:-.6in;
|
@@ -609,7 +609,7 @@ h5
|
|
609
609
|
mso-style-next:Normal;
|
610
610
|
mso-margin-top-alt:auto;
|
611
611
|
margin-right:0in;
|
612
|
-
margin-bottom
|
612
|
+
margin-bottom:$normalfontsize;
|
613
613
|
margin-left:.7in;
|
614
614
|
text-align:left;
|
615
615
|
text-indent:-.7in;
|
@@ -639,7 +639,7 @@ h5
|
|
639
639
|
mso-style-next:Normal;
|
640
640
|
mso-margin-top-alt:auto;
|
641
641
|
margin-right:0in;
|
642
|
-
margin-bottom
|
642
|
+
margin-bottom:$normalfontsize;
|
643
643
|
margin-left:.7in;
|
644
644
|
text-align:left;
|
645
645
|
text-indent:-.7in;
|
@@ -670,7 +670,7 @@ h6
|
|
670
670
|
mso-style-next:Normal;
|
671
671
|
margin-top:0in;
|
672
672
|
margin-right:0in;
|
673
|
-
margin-bottom
|
673
|
+
margin-bottom:$normalfontsize;
|
674
674
|
margin-left:116.1pt;
|
675
675
|
text-align:justify;
|
676
676
|
text-indent:-.8in;
|
@@ -703,7 +703,7 @@ h6
|
|
703
703
|
mso-style-next:Normal;
|
704
704
|
margin-top:0in;
|
705
705
|
margin-right:0in;
|
706
|
-
margin-bottom
|
706
|
+
margin-bottom:$normalfontsize;
|
707
707
|
margin-left:116.1pt;
|
708
708
|
text-align:justify;
|
709
709
|
text-indent:-.8in;
|
@@ -733,14 +733,14 @@ p.TOCTitle, li.TOCTitle, div.TOCTitle
|
|
733
733
|
mso-style-unhide:no;
|
734
734
|
margin-top:0in;
|
735
735
|
margin-right:0in;
|
736
|
-
margin-bottom
|
736
|
+
margin-bottom:$normalfontsize;
|
737
737
|
margin-left:0in;
|
738
738
|
text-align:center;
|
739
739
|
page-break-after:avoid;
|
740
740
|
mso-pagination:none;
|
741
741
|
mso-hyphenate:none;
|
742
742
|
mso-layout-grid-align:none;
|
743
|
-
font-size
|
743
|
+
font-size:$normalfontsize;
|
744
744
|
mso-bidi-font-size:10.0pt;
|
745
745
|
font-weight:bold;
|
746
746
|
font-family:$headerfont;
|
@@ -825,13 +825,13 @@ p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText
|
|
825
825
|
mso-style-link:"Footnote Text Char";
|
826
826
|
margin-top:0cm;
|
827
827
|
margin-right:0cm;
|
828
|
-
margin-bottom
|
828
|
+
margin-bottom:$normalfontsize;
|
829
829
|
margin-left:0cm;
|
830
830
|
text-align:justify;
|
831
|
-
line-height
|
831
|
+
line-height:$normalfontsize;
|
832
832
|
mso-pagination:widow-orphan;
|
833
833
|
tab-stops:20.15pt;
|
834
|
-
font-size
|
834
|
+
font-size:$footnotefontsize;
|
835
835
|
font-family:$bodyfont;
|
836
836
|
mso-fareast-font-family:$bodyfont;
|
837
837
|
mso-bidi-font-family:$bodyfont;
|
@@ -847,9 +847,9 @@ p.MsoBodyText, li.MsoBodyText, div.MsoBodyText
|
|
847
847
|
margin-bottom:6.0pt;
|
848
848
|
margin-left:0cm;
|
849
849
|
text-align:justify;
|
850
|
-
line-height
|
850
|
+
line-height:$normalfontsize;
|
851
851
|
mso-pagination:widow-orphan;
|
852
|
-
font-size
|
852
|
+
font-size:$normalfontsize;
|
853
853
|
font-family:$bodyfont;
|
854
854
|
mso-fareast-font-family:$bodyfont;
|
855
855
|
mso-bidi-font-family:$bodyfont;
|
@@ -861,7 +861,7 @@ span.Heading1Char
|
|
861
861
|
mso-style-locked:yes;
|
862
862
|
mso-style-parent:"";
|
863
863
|
mso-style-link:"Heading 1";
|
864
|
-
mso-ansi-font-size
|
864
|
+
mso-ansi-font-size:$normalfontsize;
|
865
865
|
font-family:$headerfont;
|
866
866
|
mso-ascii-font-family:Cambria;
|
867
867
|
mso-fareast-font-family:$headerfont;
|
@@ -877,7 +877,7 @@ span.Heading2Char
|
|
877
877
|
mso-style-locked:yes;
|
878
878
|
mso-style-parent:"";
|
879
879
|
mso-style-link:"Heading 2";
|
880
|
-
mso-ansi-font-size
|
880
|
+
mso-ansi-font-size:$normalfontsize;
|
881
881
|
font-family:$headerfont;
|
882
882
|
mso-ascii-font-family:Cambria;
|
883
883
|
mso-fareast-font-family:$headerfont;
|
@@ -1409,7 +1409,7 @@ table.MsoNormalTable
|
|
1409
1409
|
mso-para-margin:0cm;
|
1410
1410
|
mso-para-margin-bottom:.0001pt;
|
1411
1411
|
mso-pagination:widow-orphan;
|
1412
|
-
font-size
|
1412
|
+
font-size:$smallerfontsize;
|
1413
1413
|
font-family:$bodyfont;}
|
1414
1414
|
ol
|
1415
1415
|
{margin-bottom:0cm;
|