metanorma-itu 1.2.7 → 1.2.8

Sign up to get free protection for your applications and to get access to all the features.
Files changed (31) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/rake.yml +4 -5
  3. data/lib/asciidoctor/itu/front.rb +19 -0
  4. data/lib/asciidoctor/itu/itu.rng +1 -0
  5. data/lib/asciidoctor/itu/validate.rb +1 -8
  6. data/lib/isodoc/itu/html/html_itu_titlepage.html +5 -14
  7. data/lib/isodoc/itu/html/htmlstyle.css +769 -769
  8. data/lib/isodoc/itu/html/htmlstyle.scss +6 -8
  9. data/lib/isodoc/itu/html/itu.css +43 -43
  10. data/lib/isodoc/itu/html/itu.scss +44 -43
  11. data/lib/isodoc/itu/html/word_itu_intro.html +2 -0
  12. data/lib/isodoc/itu/html/word_itu_titlepage.html +5 -3
  13. data/lib/isodoc/itu/html/wordstyle.css +37 -37
  14. data/lib/isodoc/itu/html/wordstyle.scss +37 -37
  15. data/lib/isodoc/itu/html_convert.rb +4 -1
  16. data/lib/isodoc/itu/i18n-en.yaml +12 -0
  17. data/lib/isodoc/itu/itu.recommendation-annex.xsl +420 -84
  18. data/lib/isodoc/itu/itu.recommendation.xsl +420 -84
  19. data/lib/isodoc/itu/itu.resolution.xsl +420 -84
  20. data/lib/isodoc/itu/itu.technical-paper.xsl +5147 -0
  21. data/lib/isodoc/itu/itu.technical-report.xsl +5147 -0
  22. data/lib/isodoc/itu/metadata.rb +2 -0
  23. data/lib/isodoc/itu/pdf_convert.rb +2 -0
  24. data/lib/isodoc/itu/ref.rb +0 -13
  25. data/lib/isodoc/itu/word_cleanup.rb +4 -1
  26. data/lib/isodoc/itu/word_convert.rb +6 -1
  27. data/lib/metanorma/itu/fonts_manifest.yaml +4 -0
  28. data/lib/metanorma/itu/processor.rb +0 -8
  29. data/lib/metanorma/itu/version.rb +1 -1
  30. data/metanorma-itu.gemspec +1 -1
  31. metadata +7 -4
data/lib/isodoc/itu/html/word_itu_intro.html CHANGED
@@ -145,6 +145,8 @@ style='mso-ansi-language:EN-US'><o:p>&nbsp;</o:p></span></span></p>
145
145
  </tr>
146
146
  </table>
147
147
 
148
+ <div id="change_logbox"/>
149
+
148
150
  <p class=MsoNormal><span style='mso-bookmark:_Hlk526346232'><span lang=EN-US
149
151
  style='mso-ansi-language:EN-US'><o:p>&nbsp;</o:p></span></span></p>
150
152
 
data/lib/isodoc/itu/html/word_itu_titlepage.html CHANGED
@@ -1,4 +1,5 @@
1
- {% if doctype == "Technical Report" and unpublished %}
1
+ {% if unpublished %}
2
+ {% if doctype == "Technical Report" or doctype == "Technical Paper" or doctype == "Implementers Guide" %}
2
3
 
3
4
  <table class="MsoNormalTable" border="0" cellspacing="0" cellpadding="0" width="662"
4
5
  style='border-collapse:collapse;mso-table-layout-alt:fixed;mso-padding-alt:
@@ -111,6 +112,7 @@
111
112
  <p><br clear="all" style="page-break-before:always"/></p>
112
113
 
113
114
  {% endif %}
115
+ {% endif %}
114
116
 
115
117
 
116
118
 
@@ -206,7 +208,7 @@
206
208
  <p class="MsoNormal" align="right" style='margin-top:12.0pt;text-align:right'><span
207
209
  style='mso-bookmark:_Hlk526346232'><a name="dnume"><b style='mso-bidi-font-weight:
208
210
  normal'><span lang="EN-US" style='font-size:30.0pt;mso-bidi-font-size:10.0pt;
209
- font-family:"Arial",sans-serif;mso-ansi-language:EN-US'>{% if doctype == "Recommendation" %}{{ docnumeric }}{% else %}{{ doctype }}{% endif %}<o:p></o:p></span></b></a></span></p>
211
+ font-family:"Arial",sans-serif;mso-ansi-language:EN-US'>{% if doctype == "Recommendation" %}{{ docnumeric }}{% else %}{% if recommendationnumber %}{{ recommendationnumber }} {% endif %}{{ doctype_display }}{% endif %}<o:p></o:p></span></b></a></span></p>
210
212
  </td>
211
213
  <span style='mso-bookmark:_Hlk526346232'><span style='mso-bookmark:dnume'></span></span>
212
214
  </tr>
@@ -379,7 +381,7 @@
379
381
  margin-bottom:12.0pt;margin-left:0cm;text-align:left;tab-stops:39.7pt 59.55pt 79.4pt 99.25pt right 17.0cm'><span
380
382
  style='mso-bookmark:_Hlk526346232'><a name="dnum2e"></a><span lang="EN-US"
381
383
  style='font-size:16.0pt;mso-bidi-font-size:10.0pt;font-family:"Arial",sans-serif;
382
- mso-ansi-language:EN-US'>{% if stage == "Draft" %}Draft {% endif %}{{ doctype }}<span style='mso-spacerun:yes'> 
384
+ mso-ansi-language:EN-US'>{% if stage == "Draft" %}Draft {% endif %}{% if recommendationnumber %}{{ recommendationnumber }} {% endif %}{{ doctype_display }}<span style='mso-spacerun:yes'> 
383
385
  </span>ITU‑{{ bureau }}<span style='mso-spacerun:yes'>  </span>{{ docnumeric }}<o:p></o:p></span></span></p>
384
386
  <span style='mso-bookmark:_Hlk526346232'></span>
385
387
  <p class="MsoNormal" align="left" style='margin-top:3.0pt;text-align:left;
data/lib/isodoc/itu/html/wordstyle.css CHANGED
@@ -90,7 +90,7 @@ p.MsoNormal, li.MsoNormal, div.MsoNormal {
90
90
  mso-layout-grid-align: none;
91
91
  punctuation-wrap: simple;
92
92
  text-autospace: none;
93
- font-size: 12pt;
93
+ font-size: {{normalfontsize}};
94
94
  font-family: {{bodyfont}};
95
95
  mso-fareast-font-family: "Times New Roman";
96
96
  mso-ansi-language: EN-US;
@@ -108,7 +108,7 @@ p.MsoListParagraph, li.MsoListParagraph, div.MsoListParagraph {
108
108
  /* do not put in margin-left, it is specific to list level */
109
109
  mso-add-space: auto;
110
110
  mso-pagination: widow-orphan;
111
- font-size: 12pt;
111
+ font-size: {{normalfontsize}};
112
112
  font-family: {{bodyfont}};
113
113
  mso-ansi-language: EN-AU;
114
114
  mso-fareast-language: EN-US; }
@@ -126,7 +126,7 @@ p.MsoListParagraphCxSpFirst, li.MsoListParagraphCxSpFirst, div.MsoListParagraphC
126
126
  /* do not put in margin-left, it is specific to list level */
127
127
  mso-add-space: auto;
128
128
  mso-pagination: widow-orphan;
129
- font-size: 12pt;
129
+ font-size: {{normalfontsize}};
130
130
  font-family: {{bodyfont}};
131
131
  mso-ansi-language: EN-AU;
132
132
  mso-fareast-language: EN-US; }
@@ -144,7 +144,7 @@ p.MsoListParagraphCxSpMiddle, li.MsoListParagraphCxSpMiddle, div.MsoListParagrap
144
144
  /* do not put in margin-left, it is specific to list level */
145
145
  mso-add-space: auto;
146
146
  mso-pagination: widow-orphan;
147
- font-size: 12pt;
147
+ font-size: {{normalfontsize}};
148
148
  font-family: {{bodyfont}};
149
149
  mso-ansi-language: EN-AU;
150
150
  mso-fareast-language: EN-US; }
@@ -162,7 +162,7 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
162
162
  /* do not put in margin-left, it is specific to list level */
163
163
  mso-add-space: auto;
164
164
  mso-pagination: widow-orphan;
165
- font-size: 12pt;
165
+ font-size: {{normalfontsize}};
166
166
  font-family: {{bodyfont}};
167
167
  mso-ansi-language: EN-AU;
168
168
  mso-fareast-language: EN-US; }
@@ -263,7 +263,7 @@ p.MsoBodyText, li.MsoBodyText, div.MsoBodyText {
263
263
  margin-left: 0cm;
264
264
  margin-bottom: .0001pt;
265
265
  mso-pagination: widow-orphan;
266
- font-size: 12.0pt;
266
+ font-size: {{normalfontsize}};
267
267
  font-family: {{bodyfont}};
268
268
  mso-fareast-font-family: "Times New Roman";
269
269
  mso-bidi-font-family: "Times New Roman";
@@ -380,7 +380,7 @@ p.MsoCommentSubject, li.MsoCommentSubject, div.MsoCommentSubject {
380
380
  mso-layout-grid-align: none;
381
381
  punctuation-wrap: simple;
382
382
  text-autospace: none;
383
- font-size: 12.0pt;
383
+ font-size: {{normalfontsize}};
384
384
  mso-bidi-font-size: 10.0pt;
385
385
  font-family: {{bodyfont}};
386
386
  mso-fareast-font-family: "Times New Roman";
@@ -437,7 +437,7 @@ p.MsoRMPane, li.MsoRMPane, div.MsoRMPane {
437
437
  margin: 0cm;
438
438
  margin-bottom: .0001pt;
439
439
  mso-pagination: widow-orphan;
440
- font-size: 12.0pt;
440
+ font-size: {{normalfontsize}};
441
441
  mso-bidi-font-size: 10.0pt;
442
442
  font-family: {{bodyfont}};
443
443
  mso-fareast-font-family: SimSun;
@@ -479,7 +479,7 @@ h1 {
479
479
  mso-layout-grid-align: none;
480
480
  punctuation-wrap: simple;
481
481
  text-autospace: none;
482
- font-size: 12.0pt;
482
+ font-size: {{normalfontsize}};
483
483
  mso-bidi-font-size: 10.0pt;
484
484
  mso-list: l1 level1 lfo6;
485
485
  mso-hyphenate: none;
@@ -534,7 +534,7 @@ p.h1Preface {
534
534
  mso-layout-grid-align: none;
535
535
  punctuation-wrap: simple;
536
536
  text-autospace: none;
537
- font-size: 12.0pt;
537
+ font-size: {{normalfontsize}};
538
538
  mso-bidi-font-size: 10.0pt;
539
539
  font-family: {{headerfont}};
540
540
  mso-fareast-font-family: {{headerfont}};
@@ -587,7 +587,7 @@ h1.Annex {
587
587
  mso-style-parent: "Heading 1";
588
588
  mso-style-link: "Heading 2 Char";
589
589
  mso-style-next: Normal;
590
- margin-top: 12.0pt;
590
+ margin-top: {{normalfontsize}};
591
591
  margin-right: 0cm;
592
592
  margin-bottom: 6pt;
593
593
  margin-left: 39.7pt;
@@ -600,7 +600,7 @@ h1.Annex {
600
600
  tab-stops: 39.7pt 59.55pt 79.4pt 99.25pt;
601
601
  punctuation-wrap: simple;
602
602
  text-autospace: none;
603
- font-size: 12.0pt;
603
+ font-size: {{normalfontsize}};
604
604
  font-weight: bold;
605
605
  mso-bidi-font-size: 10.0pt;
606
606
  font-family: {{headerfont}};
@@ -618,7 +618,7 @@ h2 {
618
618
  mso-style-parent: "Heading 1";
619
619
  mso-style-link: "Heading 2 Char";
620
620
  mso-style-next: Normal;
621
- margin-top: 12.0pt;
621
+ margin-top: {{normalfontsize}};
622
622
  margin-right: 0cm;
623
623
  margin-bottom: 6pt;
624
624
  margin-left: 39.7pt;
@@ -632,7 +632,7 @@ h2 {
632
632
  tab-stops: 39.7pt 59.55pt 79.4pt 99.25pt;
633
633
  punctuation-wrap: simple;
634
634
  text-autospace: none;
635
- font-size: 12.0pt;
635
+ font-size: {{normalfontsize}};
636
636
  mso-bidi-font-size: 10.0pt;
637
637
  font-family: {{headerfont}};
638
638
  mso-fareast-font-family: {{headerfont}};
@@ -661,7 +661,7 @@ h3 {
661
661
  mso-list: l1 level3 lfo6;
662
662
  mso-hyphenate: none;
663
663
  tab-stops: 39.7pt 59.55pt 79.4pt 99.25pt;
664
- font-size: 12.0pt;
664
+ font-size: {{normalfontsize}};
665
665
  mso-bidi-font-size: 10.0pt;
666
666
  font-family: {{headerfont}};
667
667
  color: black;
@@ -693,7 +693,7 @@ h4 {
693
693
  mso-layout-grid-align: none;
694
694
  punctuation-wrap: simple;
695
695
  text-autospace: none;
696
- font-size: 12.0pt;
696
+ font-size: {{normalfontsize}};
697
697
  mso-bidi-font-size: 10.0pt;
698
698
  font-family: {{headerfont}};
699
699
  color: black;
@@ -725,7 +725,7 @@ h5 {
725
725
  mso-layout-grid-align: none;
726
726
  punctuation-wrap: simple;
727
727
  text-autospace: none;
728
- font-size: 12.0pt;
728
+ font-size: {{normalfontsize}};
729
729
  mso-bidi-font-size: 10.0pt;
730
730
  font-weight: bold;
731
731
  font-family: {{headerfont}};
@@ -755,7 +755,7 @@ h6 {
755
755
  mso-layout-grid-align: none;
756
756
  punctuation-wrap: simple;
757
757
  text-autospace: none;
758
- font-size: 12.0pt;
758
+ font-size: {{normalfontsize}};
759
759
  mso-bidi-font-size: 10.0pt;
760
760
  mso-list: l1 level6 lfo6;
761
761
  mso-hyphenate: none;
@@ -785,7 +785,7 @@ p.MsoHeading7, li.MsoHeading7, div.MsoHeading7 {
785
785
  mso-layout-grid-align: none;
786
786
  punctuation-wrap: simple;
787
787
  text-autospace: none;
788
- font-size: 12.0pt;
788
+ font-size: {{normalfontsize}};
789
789
  mso-bidi-font-size: 10.0pt;
790
790
  font-family: {{headerfont}};
791
791
  mso-fareast-font-family: "Times New Roman";
@@ -812,7 +812,7 @@ p.MsoHeading8, li.MsoHeading8, div.MsoHeading8 {
812
812
  mso-layout-grid-align: none;
813
813
  punctuation-wrap: simple;
814
814
  text-autospace: none;
815
- font-size: 12.0pt;
815
+ font-size: {{normalfontsize}};
816
816
  mso-bidi-font-size: 10.0pt;
817
817
  font-family: {{headerfont}};
818
818
  mso-fareast-font-family: "Times New Roman";
@@ -839,7 +839,7 @@ p.MsoHeading9, li.MsoHeading9, div.MsoHeading9 {
839
839
  mso-layout-grid-align: none;
840
840
  punctuation-wrap: simple;
841
841
  text-autospace: none;
842
- font-size: 12.0pt;
842
+ font-size: {{normalfontsize}};
843
843
  mso-bidi-font-size: 10.0pt;
844
844
  font-family: {{headerfont}};
845
845
  mso-fareast-font-family: "Times New Roman";
@@ -862,7 +862,7 @@ p.MsoIndex1, li.MsoIndex1, div.MsoIndex1 {
862
862
  mso-layout-grid-align: none;
863
863
  punctuation-wrap: simple;
864
864
  text-autospace: none;
865
- font-size: 12.0pt;
865
+ font-size: {{normalfontsize}};
866
866
  mso-bidi-font-size: 10.0pt;
867
867
  font-family: {{bodyfont}};
868
868
  mso-fareast-font-family: "Times New Roman";
@@ -883,7 +883,7 @@ p.MsoIndex2, li.MsoIndex2, div.MsoIndex2 {
883
883
  mso-layout-grid-align: none;
884
884
  punctuation-wrap: simple;
885
885
  text-autospace: none;
886
- font-size: 12.0pt;
886
+ font-size: {{normalfontsize}};
887
887
  mso-bidi-font-size: 10.0pt;
888
888
  font-family: {{bodyfont}};
889
889
  mso-fareast-font-family: "Times New Roman";
@@ -904,7 +904,7 @@ p.MsoIndex3, li.MsoIndex3, div.MsoIndex3 {
904
904
  mso-layout-grid-align: none;
905
905
  punctuation-wrap: simple;
906
906
  text-autospace: none;
907
- font-size: 12.0pt;
907
+ font-size: {{normalfontsize}};
908
908
  mso-bidi-font-size: 10.0pt;
909
909
  font-family: {{bodyfont}};
910
910
  mso-fareast-font-family: "Times New Roman";
@@ -926,7 +926,7 @@ p.MsoToc1, li.MsoToc1, div.MsoToc1 {
926
926
  mso-layout-grid-align: none;
927
927
  punctuation-wrap: simple;
928
928
  text-autospace: none;
929
- font-size: 12.0pt;
929
+ font-size: {{normalfontsize}};
930
930
  mso-bidi-font-size: 10.0pt;
931
931
  font-family: {{bodyfont}};
932
932
  mso-fareast-font-family: {{bodyfont}};
@@ -952,7 +952,7 @@ p.MsoToc2, li.MsoToc2, div.MsoToc2 {
952
952
  mso-layout-grid-align: none;
953
953
  punctuation-wrap: simple;
954
954
  text-autospace: none;
955
- font-size: 12.0pt;
955
+ font-size: {{normalfontsize}};
956
956
  mso-bidi-font-size: 10.0pt;
957
957
  font-family: {{bodyfont}};
958
958
  mso-fareast-font-family: {{bodyfont}};
@@ -978,7 +978,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3 {
978
978
  mso-layout-grid-align: none;
979
979
  punctuation-wrap: simple;
980
980
  text-autospace: none;
981
- font-size: 12.0pt;
981
+ font-size: {{normalfontsize}};
982
982
  mso-bidi-font-size: 10.0pt;
983
983
  font-family: {{bodyfont}};
984
984
  mso-fareast-font-family: {{bodyfont}};
@@ -1002,7 +1002,7 @@ p.MsoToc4, li.MsoToc4, div.MsoToc4 {
1002
1002
  mso-layout-grid-align: none;
1003
1003
  punctuation-wrap: simple;
1004
1004
  text-autospace: none;
1005
- font-size: 12.0pt;
1005
+ font-size: {{normalfontsize}};
1006
1006
  mso-bidi-font-size: 10.0pt;
1007
1007
  font-family: {{bodyfont}};
1008
1008
  mso-fareast-font-family: {{bodyfont}};
@@ -1026,7 +1026,7 @@ p.MsoToc5, li.MsoToc5, div.MsoToc5 {
1026
1026
  mso-layout-grid-align: none;
1027
1027
  punctuation-wrap: simple;
1028
1028
  text-autospace: none;
1029
- font-size: 12.0pt;
1029
+ font-size: {{normalfontsize}};
1030
1030
  mso-bidi-font-size: 10.0pt;
1031
1031
  font-family: {{bodyfont}};
1032
1032
  mso-fareast-font-family: {{bodyfont}};
@@ -1050,7 +1050,7 @@ p.MsoToc6, li.MsoToc6, div.MsoToc6 {
1050
1050
  mso-layout-grid-align: none;
1051
1051
  punctuation-wrap: simple;
1052
1052
  text-autospace: none;
1053
- font-size: 12.0pt;
1053
+ font-size: {{normalfontsize}};
1054
1054
  mso-bidi-font-size: 10.0pt;
1055
1055
  font-family: {{bodyfont}};
1056
1056
  mso-fareast-font-family: {{bodyfont}};
@@ -1074,7 +1074,7 @@ p.MsoToc7, li.MsoToc7, div.MsoToc7 {
1074
1074
  mso-layout-grid-align: none;
1075
1075
  punctuation-wrap: simple;
1076
1076
  text-autospace: none;
1077
- font-size: 12.0pt;
1077
+ font-size: {{normalfontsize}};
1078
1078
  mso-bidi-font-size: 10.0pt;
1079
1079
  font-family: {{bodyfont}};
1080
1080
  mso-fareast-font-family: {{bodyfont}};
@@ -1098,7 +1098,7 @@ p.MsoToc8, li.MsoToc8, div.MsoToc8 {
1098
1098
  mso-layout-grid-align: none;
1099
1099
  punctuation-wrap: simple;
1100
1100
  text-autospace: none;
1101
- font-size: 12.0pt;
1101
+ font-size: {{normalfontsize}};
1102
1102
  mso-bidi-font-size: 10.0pt;
1103
1103
  font-family: {{bodyfont}};
1104
1104
  mso-fareast-font-family: {{bodyfont}};
@@ -1122,7 +1122,7 @@ p.MsoToc9, li.MsoToc9, div.MsoToc9 {
1122
1122
  mso-layout-grid-align: none;
1123
1123
  punctuation-wrap: simple;
1124
1124
  text-autospace: none;
1125
- font-size: 12.0pt;
1125
+ font-size: {{normalfontsize}};
1126
1126
  mso-bidi-font-size: 10.0pt;
1127
1127
  font-family: {{bodyfont}};
1128
1128
  mso-fareast-font-family: {{bodyfont}};
@@ -1156,7 +1156,7 @@ p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText {
1156
1156
  mso-layout-grid-align: none;
1157
1157
  punctuation-wrap: simple;
1158
1158
  text-autospace: none;
1159
- font-size: 11.0pt;
1159
+ font-size: {{footnotefontsize}};
1160
1160
  mso-bidi-font-size: 10.0pt;
1161
1161
  font-family: {{bodyfont}};
1162
1162
  mso-fareast-font-family: {{bodyfont}};
@@ -1174,9 +1174,9 @@ p.MsoBodyText, li.MsoBodyText, div.MsoBodyText {
1174
1174
  margin-bottom: 6.0pt;
1175
1175
  margin-left: 0cm;
1176
1176
  text-align: justify;
1177
- line-height: 12.0pt;
1177
+ line-height: {{normalfontsize}};
1178
1178
  mso-pagination: widow-orphan;
1179
- font-size: 12pt;
1179
+ font-size: {{normalfontsize}};
1180
1180
  font-family: {{bodyfont}};
1181
1181
  mso-fareast-font-family: {{bodyfont}};
1182
1182
  mso-bidi-font-family: {{bodyfont}};
@@ -1206,7 +1206,7 @@ span.Heading2Char {
1206
1206
  mso-style-locked: yes;
1207
1207
  mso-style-parent: "";
1208
1208
  mso-style-link: "Heading 2";
1209
- mso-ansi-font-size: 12.0pt;
1209
+ mso-ansi-font-size: {{normalfontsize}};
1210
1210
  font-family: {{headerfont}};
1211
1211
  mso-ascii-font-family: Cambria;
1212
1212
  mso-fareast-font-family: {{headerfont}};
data/lib/isodoc/itu/html/wordstyle.scss CHANGED
@@ -80,7 +80,7 @@ p.MsoNormal, li.MsoNormal, div.MsoNormal
80
80
  mso-layout-grid-align:none;
81
81
  punctuation-wrap:simple;
82
82
  text-autospace:none;
83
- font-size:12pt;
83
+ font-size:$normalfontsize;
84
84
  font-family:$bodyfont;
85
85
  mso-fareast-font-family:"Times New Roman";
86
86
  mso-ansi-language:EN-US;
@@ -97,7 +97,7 @@ p.MsoListParagraph, li.MsoListParagraph, div.MsoListParagraph
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:12pt;
100
+ font-size:$normalfontsize;
101
101
  font-family:$bodyfont;
102
102
  mso-ansi-language:EN-AU;
103
103
  mso-fareast-language:EN-US;}
@@ -114,7 +114,7 @@ p.MsoListParagraphCxSpFirst, li.MsoListParagraphCxSpFirst, div.MsoListParagraphC
114
114
  /* do not put in margin-left, it is specific to list level */
115
115
  mso-add-space:auto;
116
116
  mso-pagination:widow-orphan;
117
- font-size:12pt;
117
+ font-size:$normalfontsize;
118
118
  font-family:$bodyfont;
119
119
  mso-ansi-language:EN-AU;
120
120
  mso-fareast-language:EN-US;}
@@ -131,7 +131,7 @@ p.MsoListParagraphCxSpMiddle, li.MsoListParagraphCxSpMiddle, div.MsoListParagrap
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:12pt;
134
+ font-size:$normalfontsize;
135
135
  font-family:$bodyfont;
136
136
  mso-ansi-language:EN-AU;
137
137
  mso-fareast-language:EN-US;}
@@ -148,7 +148,7 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
148
148
  /* do not put in margin-left, it is specific to list level */
149
149
  mso-add-space:auto;
150
150
  mso-pagination:widow-orphan;
151
- font-size:12pt;
151
+ font-size:$normalfontsize;
152
152
  font-family:$bodyfont;
153
153
  mso-ansi-language:EN-AU;
154
154
  mso-fareast-language:EN-US;}
@@ -243,7 +243,7 @@ p.MsoBodyText, li.MsoBodyText, div.MsoBodyText
243
243
  margin-left:0cm;
244
244
  margin-bottom:.0001pt;
245
245
  mso-pagination:widow-orphan;
246
- font-size:12.0pt;
246
+ font-size:$normalfontsize;
247
247
  font-family:$bodyfont;
248
248
  mso-fareast-font-family:"Times New Roman";
249
249
  mso-bidi-font-family:"Times New Roman";
@@ -355,7 +355,7 @@ p.MsoCommentSubject, li.MsoCommentSubject, div.MsoCommentSubject
355
355
  mso-layout-grid-align:none;
356
356
  punctuation-wrap:simple;
357
357
  text-autospace:none;
358
- font-size:12.0pt;
358
+ font-size:$normalfontsize;
359
359
  mso-bidi-font-size:10.0pt;
360
360
  font-family:$bodyfont;
361
361
  mso-fareast-font-family:"Times New Roman";
@@ -406,7 +406,7 @@ p.MsoRMPane, li.MsoRMPane, div.MsoRMPane
406
406
  margin:0cm;
407
407
  margin-bottom:.0001pt;
408
408
  mso-pagination:widow-orphan;
409
- font-size:12.0pt;
409
+ font-size:$normalfontsize;
410
410
  mso-bidi-font-size:10.0pt;
411
411
  font-family:$bodyfont;
412
412
  mso-fareast-font-family:SimSun;
@@ -447,7 +447,7 @@ h1
447
447
  mso-layout-grid-align:none;
448
448
  punctuation-wrap:simple;
449
449
  text-autospace:none;
450
- font-size:12.0pt;
450
+ font-size:$normalfontsize;
451
451
  mso-bidi-font-size:10.0pt;
452
452
  mso-list:l1 level1 lfo6;
453
453
  mso-hyphenate:none;
@@ -502,7 +502,7 @@ p.h1Preface
502
502
  mso-layout-grid-align:none;
503
503
  punctuation-wrap:simple;
504
504
  text-autospace:none;
505
- font-size:12.0pt;
505
+ font-size:$normalfontsize;
506
506
  mso-bidi-font-size:10.0pt;
507
507
  font-family:$headerfont;
508
508
  mso-fareast-font-family:$headerfont;
@@ -553,7 +553,7 @@ h1.Annex {
553
553
  mso-style-parent:"Heading 1";
554
554
  mso-style-link:"Heading 2 Char";
555
555
  mso-style-next:Normal;
556
- margin-top:12.0pt;
556
+ margin-top:$normalfontsize;
557
557
  margin-right:0cm;
558
558
  margin-bottom:6pt;
559
559
  margin-left:39.7pt;
@@ -566,7 +566,7 @@ h1.Annex {
566
566
  tab-stops:39.7pt 59.55pt 79.4pt 99.25pt;
567
567
  punctuation-wrap:simple;
568
568
  text-autospace:none;
569
- font-size:12.0pt;
569
+ font-size:$normalfontsize;
570
570
  font-weight:bold;
571
571
  mso-bidi-font-size:10.0pt;
572
572
  font-family:$headerfont;
@@ -583,7 +583,7 @@ h2
583
583
  mso-style-parent:"Heading 1";
584
584
  mso-style-link:"Heading 2 Char";
585
585
  mso-style-next:Normal;
586
- margin-top:12.0pt;
586
+ margin-top:$normalfontsize;
587
587
  margin-right:0cm;
588
588
  margin-bottom:6pt;
589
589
  margin-left:39.7pt;
@@ -597,7 +597,7 @@ h2
597
597
  tab-stops:39.7pt 59.55pt 79.4pt 99.25pt;
598
598
  punctuation-wrap:simple;
599
599
  text-autospace:none;
600
- font-size:12.0pt;
600
+ font-size:$normalfontsize;
601
601
  mso-bidi-font-size:10.0pt;
602
602
  font-family:$headerfont;
603
603
  mso-fareast-font-family:$headerfont;
@@ -625,7 +625,7 @@ h3
625
625
  mso-list:l1 level3 lfo6;
626
626
  mso-hyphenate:none;
627
627
  tab-stops:39.7pt 59.55pt 79.4pt 99.25pt;
628
- font-size:12.0pt;
628
+ font-size:$normalfontsize;
629
629
  mso-bidi-font-size:10.0pt;
630
630
  font-family:$headerfont;
631
631
  color:black;
@@ -656,7 +656,7 @@ h4
656
656
  mso-layout-grid-align:none;
657
657
  punctuation-wrap:simple;
658
658
  text-autospace:none;
659
- font-size:12.0pt;
659
+ font-size:$normalfontsize;
660
660
  mso-bidi-font-size:10.0pt;
661
661
  font-family:$headerfont;
662
662
  color:black;
@@ -687,7 +687,7 @@ h5
687
687
  mso-layout-grid-align:none;
688
688
  punctuation-wrap:simple;
689
689
  text-autospace:none;
690
- font-size:12.0pt;
690
+ font-size:$normalfontsize;
691
691
  mso-bidi-font-size:10.0pt;
692
692
  font-weight:bold;
693
693
  font-family:$headerfont;
@@ -716,7 +716,7 @@ h6
716
716
  mso-layout-grid-align:none;
717
717
  punctuation-wrap:simple;
718
718
  text-autospace:none;
719
- font-size:12.0pt;
719
+ font-size:$normalfontsize;
720
720
  mso-bidi-font-size:10.0pt;
721
721
  mso-list:l1 level6 lfo6;
722
722
  mso-hyphenate:none;
@@ -745,7 +745,7 @@ p.MsoHeading7, li.MsoHeading7, div.MsoHeading7
745
745
  mso-layout-grid-align:none;
746
746
  punctuation-wrap:simple;
747
747
  text-autospace:none;
748
- font-size:12.0pt;
748
+ font-size:$normalfontsize;
749
749
  mso-bidi-font-size:10.0pt;
750
750
  font-family:$headerfont;
751
751
  mso-fareast-font-family:"Times New Roman";
@@ -771,7 +771,7 @@ p.MsoHeading8, li.MsoHeading8, div.MsoHeading8
771
771
  mso-layout-grid-align:none;
772
772
  punctuation-wrap:simple;
773
773
  text-autospace:none;
774
- font-size:12.0pt;
774
+ font-size:$normalfontsize;
775
775
  mso-bidi-font-size:10.0pt;
776
776
  font-family:$headerfont;
777
777
  mso-fareast-font-family:"Times New Roman";
@@ -797,7 +797,7 @@ p.MsoHeading9, li.MsoHeading9, div.MsoHeading9
797
797
  mso-layout-grid-align:none;
798
798
  punctuation-wrap:simple;
799
799
  text-autospace:none;
800
- font-size:12.0pt;
800
+ font-size:$normalfontsize;
801
801
  mso-bidi-font-size:10.0pt;
802
802
  font-family:$headerfont;
803
803
  mso-fareast-font-family:"Times New Roman";
@@ -819,7 +819,7 @@ p.MsoIndex1, li.MsoIndex1, div.MsoIndex1
819
819
  mso-layout-grid-align:none;
820
820
  punctuation-wrap:simple;
821
821
  text-autospace:none;
822
- font-size:12.0pt;
822
+ font-size:$normalfontsize;
823
823
  mso-bidi-font-size:10.0pt;
824
824
  font-family:$bodyfont;
825
825
  mso-fareast-font-family:"Times New Roman";
@@ -839,7 +839,7 @@ p.MsoIndex2, li.MsoIndex2, div.MsoIndex2
839
839
  mso-layout-grid-align:none;
840
840
  punctuation-wrap:simple;
841
841
  text-autospace:none;
842
- font-size:12.0pt;
842
+ font-size:$normalfontsize;
843
843
  mso-bidi-font-size:10.0pt;
844
844
  font-family:$bodyfont;
845
845
  mso-fareast-font-family:"Times New Roman";
@@ -859,7 +859,7 @@ p.MsoIndex3, li.MsoIndex3, div.MsoIndex3
859
859
  mso-layout-grid-align:none;
860
860
  punctuation-wrap:simple;
861
861
  text-autospace:none;
862
- font-size:12.0pt;
862
+ font-size:$normalfontsize;
863
863
  mso-bidi-font-size:10.0pt;
864
864
  font-family:$bodyfont;
865
865
  mso-fareast-font-family:"Times New Roman";
@@ -879,7 +879,7 @@ p.MsoToc1, li.MsoToc1, div.MsoToc1
879
879
  mso-layout-grid-align:none;
880
880
  punctuation-wrap:simple;
881
881
  text-autospace:none;
882
- font-size:12.0pt;
882
+ font-size:$normalfontsize;
883
883
  mso-bidi-font-size:10.0pt;
884
884
  font-family:$bodyfont;
885
885
  mso-fareast-font-family:$bodyfont;
@@ -903,7 +903,7 @@ p.MsoToc2, li.MsoToc2, div.MsoToc2
903
903
  mso-layout-grid-align:none;
904
904
  punctuation-wrap:simple;
905
905
  text-autospace:none;
906
- font-size:12.0pt;
906
+ font-size:$normalfontsize;
907
907
  mso-bidi-font-size:10.0pt;
908
908
  font-family:$bodyfont;
909
909
  mso-fareast-font-family:$bodyfont;
@@ -927,7 +927,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3
927
927
  mso-layout-grid-align:none;
928
928
  punctuation-wrap:simple;
929
929
  text-autospace:none;
930
- font-size:12.0pt;
930
+ font-size:$normalfontsize;
931
931
  mso-bidi-font-size:10.0pt;
932
932
  font-family:$bodyfont;
933
933
  mso-fareast-font-family:$bodyfont;
@@ -949,7 +949,7 @@ p.MsoToc4, li.MsoToc4, div.MsoToc4
949
949
  mso-layout-grid-align:none;
950
950
  punctuation-wrap:simple;
951
951
  text-autospace:none;
952
- font-size:12.0pt;
952
+ font-size:$normalfontsize;
953
953
  mso-bidi-font-size:10.0pt;
954
954
  font-family:$bodyfont;
955
955
  mso-fareast-font-family:$bodyfont;
@@ -971,7 +971,7 @@ p.MsoToc5, li.MsoToc5, div.MsoToc5
971
971
  mso-layout-grid-align:none;
972
972
  punctuation-wrap:simple;
973
973
  text-autospace:none;
974
- font-size:12.0pt;
974
+ font-size:$normalfontsize;
975
975
  mso-bidi-font-size:10.0pt;
976
976
  font-family:$bodyfont;
977
977
  mso-fareast-font-family:$bodyfont;
@@ -993,7 +993,7 @@ p.MsoToc6, li.MsoToc6, div.MsoToc6
993
993
  mso-layout-grid-align:none;
994
994
  punctuation-wrap:simple;
995
995
  text-autospace:none;
996
- font-size:12.0pt;
996
+ font-size:$normalfontsize;
997
997
  mso-bidi-font-size:10.0pt;
998
998
  font-family:$bodyfont;
999
999
  mso-fareast-font-family:$bodyfont;
@@ -1015,7 +1015,7 @@ p.MsoToc7, li.MsoToc7, div.MsoToc7
1015
1015
  mso-layout-grid-align:none;
1016
1016
  punctuation-wrap:simple;
1017
1017
  text-autospace:none;
1018
- font-size:12.0pt;
1018
+ font-size:$normalfontsize;
1019
1019
  mso-bidi-font-size:10.0pt;
1020
1020
  font-family:$bodyfont;
1021
1021
  mso-fareast-font-family:$bodyfont;
@@ -1037,7 +1037,7 @@ p.MsoToc8, li.MsoToc8, div.MsoToc8
1037
1037
  mso-layout-grid-align:none;
1038
1038
  punctuation-wrap:simple;
1039
1039
  text-autospace:none;
1040
- font-size:12.0pt;
1040
+ font-size:$normalfontsize;
1041
1041
  mso-bidi-font-size:10.0pt;
1042
1042
  font-family:$bodyfont;
1043
1043
  mso-fareast-font-family:$bodyfont;
@@ -1059,7 +1059,7 @@ p.MsoToc9, li.MsoToc9, div.MsoToc9
1059
1059
  mso-layout-grid-align:none;
1060
1060
  punctuation-wrap:simple;
1061
1061
  text-autospace:none;
1062
- font-size:12.0pt;
1062
+ font-size:$normalfontsize;
1063
1063
  mso-bidi-font-size:10.0pt;
1064
1064
  font-family:$bodyfont;
1065
1065
  mso-fareast-font-family:$bodyfont;
@@ -1091,7 +1091,7 @@ p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText
1091
1091
  mso-layout-grid-align:none;
1092
1092
  punctuation-wrap:simple;
1093
1093
  text-autospace:none;
1094
- font-size:11.0pt;
1094
+ font-size:$footnotefontsize;
1095
1095
  mso-bidi-font-size:10.0pt;
1096
1096
  font-family:$bodyfont;
1097
1097
  mso-fareast-font-family:$bodyfont;
@@ -1108,9 +1108,9 @@ p.MsoBodyText, li.MsoBodyText, div.MsoBodyText
1108
1108
  margin-bottom:6.0pt;
1109
1109
  margin-left:0cm;
1110
1110
  text-align:justify;
1111
- line-height:12.0pt;
1111
+ line-height:$normalfontsize;
1112
1112
  mso-pagination:widow-orphan;
1113
- font-size:12pt;
1113
+ font-size:$normalfontsize;
1114
1114
  font-family:$bodyfont;
1115
1115
  mso-fareast-font-family:$bodyfont;
1116
1116
  mso-bidi-font-family:$bodyfont;
@@ -1138,7 +1138,7 @@ span.Heading2Char
1138
1138
  mso-style-locked:yes;
1139
1139
  mso-style-parent:"";
1140
1140
  mso-style-link:"Heading 2";
1141
- mso-ansi-font-size:12.0pt;
1141
+ mso-ansi-font-size:$normalfontsize;
1142
1142
  font-family:$headerfont;
1143
1143
  mso-ascii-font-family:Cambria;
1144
1144
  mso-fareast-font-family:$headerfont;