asciidoctor-iso 0.7.2 → 0.7.3

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 (27) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +9 -3
  3. data/README.adoc +14 -0
  4. data/asciidoctor-iso.gemspec +1 -0
  5. data/lib/asciidoctor/iso/base.rb +26 -4
  6. data/lib/asciidoctor/iso/biblio.rng +584 -0
  7. data/lib/asciidoctor/iso/cleanup.rb +23 -0
  8. data/lib/asciidoctor/iso/cleanup_block.rb +0 -83
  9. data/lib/asciidoctor/iso/cleanup_footnotes.rb +96 -0
  10. data/lib/asciidoctor/iso/front.rb +7 -0
  11. data/lib/asciidoctor/iso/html/header.html +3 -3
  12. data/lib/asciidoctor/iso/html/{htmlstyle.css → htmlstyle.scss} +2 -2
  13. data/lib/asciidoctor/iso/html/{isodoc.css → isodoc.scss} +69 -107
  14. data/lib/asciidoctor/iso/html/{wordstyle.css → wordstyle.scss} +123 -125
  15. data/lib/asciidoctor/iso/isodoc.rng +10 -562
  16. data/lib/asciidoctor/iso/isostandard.rng +133 -69
  17. data/lib/asciidoctor/iso/lists.rb +2 -2
  18. data/lib/asciidoctor/iso/section.rb +2 -2
  19. data/lib/asciidoctor/iso/validate_section.rb +10 -5
  20. data/lib/asciidoctor/iso/version.rb +1 -1
  21. data/spec/asciidoctor-iso/base_spec.rb +69 -1
  22. data/spec/asciidoctor-iso/section_spec.rb +23 -17
  23. data/spec/asciidoctor-iso/validate_spec.rb +1 -0
  24. data/spec/examples/rice.doc +4971 -4941
  25. data/spec/examples/rice.html +567 -858
  26. data/spec/examples/rice.xml +175 -175
  27. metadata +21 -5
data/lib/asciidoctor/iso/cleanup.rb CHANGED
@@ -4,6 +4,7 @@ require "pathname"
4
4
  require "open-uri"
5
5
  require "pp"
6
6
  require_relative "./cleanup_block.rb"
7
+ require_relative "./cleanup_footnotes.rb"
7
8
  require_relative "./cleanup_ref.rb"
8
9
 
9
10
  module Asciidoctor
@@ -23,6 +24,7 @@ module Asciidoctor
23
24
  ref_cleanup(xmldoc)
24
25
  note_cleanup(xmldoc)
25
26
  normref_cleanup(xmldoc)
27
+ biblio_cleanup(xmldoc)
26
28
  reference_names(xmldoc)
27
29
  xref_cleanup(xmldoc)
28
30
  bpart_cleanup(xmldoc)
@@ -126,12 +128,33 @@ module Asciidoctor
126
128
  xmldoc.xpath("//terms/p | //terms/ul").each(&:remove)
127
129
  end
128
130
 
131
+ def termdef_subsection_cleanup(xmldoc)
132
+ xmldoc.xpath("//terms[terms]").each do |t|
133
+ t.name = "clause"
134
+ end
135
+ end
136
+
137
+ def termdocsource_cleanup(xmldoc)
138
+ f = xmldoc.at("//foreword")
139
+ xmldoc.xpath("//terms/termdocsource").each do |s|
140
+ f.previous = s.remove
141
+ end
142
+ end
143
+
129
144
  def termdef_cleanup(xmldoc)
130
145
  termdef_unnest_cleanup(xmldoc)
131
146
  termdef_stem_cleanup(xmldoc)
132
147
  termdomain_cleanup(xmldoc)
133
148
  termdefinition_cleanup(xmldoc)
134
149
  termdef_boilerplate_cleanup(xmldoc)
150
+ termdef_subsection_cleanup(xmldoc)
151
+ termdocsource_cleanup(xmldoc)
152
+ end
153
+
154
+ def biblio_cleanup(xmldoc)
155
+ xmldoc.xpath("//references[references]").each do |t|
156
+ t.name = "clause"
157
+ end
135
158
  end
136
159
 
137
160
  ELEMS_ALLOW_NOTES =
data/lib/asciidoctor/iso/cleanup_block.rb CHANGED
@@ -83,20 +83,6 @@ module Asciidoctor
83
83
  end
84
84
  end
85
85
 
86
- # include footnotes inside figure
87
- def figure_footnote_cleanup(xmldoc)
88
- nomatches = false
89
- until nomatches
90
- q = "//figure/following-sibling::*[1][self::p and *[1][self::fn]]"
91
- nomatches = true
92
- xmldoc.xpath(q).each do |s|
93
- s.previous_element << s.first_element_child.remove
94
- s.remove
95
- nomatches = false
96
- end
97
- end
98
- end
99
-
100
86
  # include key definition list inside figure
101
87
  def figure_dl_cleanup(xmldoc)
102
88
  q = "//figure/following-sibling::*"\
@@ -124,75 +110,6 @@ module Asciidoctor
124
110
  subfigure_cleanup(xmldoc)
125
111
  end
126
112
 
127
- def table_footnote_renumber1(fn, i, seen)
128
- if seen[fn.text] then outnum = seen[fn.text]
129
- else
130
- i += 1
131
- outnum = i
132
- seen[fn.text] = outnum
133
- end
134
- fn["reference"] = (outnum - 1 + "a".ord).chr
135
- fn["table"] = true
136
- [i, seen]
137
- end
138
-
139
- def table_footnote_renumber(xmldoc)
140
- xmldoc.xpath("//table | //figure").each do |t|
141
- seen = {}
142
- i = 0
143
- t.xpath(".//fn").each do |fn|
144
- i, seen = table_footnote_renumber1(fn, i, seen)
145
- end
146
- end
147
- end
148
-
149
- def other_footnote_renumber1(fn, i, seen)
150
- unless fn["table"]
151
- if seen[fn.text] then outnum = seen[fn.text]
152
- else
153
- i += 1
154
- outnum = i
155
- seen[fn.text] = outnum
156
- end
157
- fn["reference"] = outnum.to_s
158
- end
159
- [i, seen]
160
- end
161
-
162
- PRE_NORMREF_FOOTNOTES = "//foreword//fn | //introduction//fn |"\
163
- "//clause[title = 'Scope']//fn" .freeze
164
-
165
- NORMREF_FOOTNOTES =
166
- "//references[title = 'Normative References']//fn |"\
167
- "//references[title = 'Normative References']//bibitem/note".freeze
168
-
169
- POST_NORMREF_FOOTNOTES =
170
- "//clause[not(title = 'Scope')]//fn | "\
171
- "//references[title = 'Bibliography']//fn | "\
172
- "//references[title = 'Bibliography']//bibitem/note".freeze
173
-
174
- def other_footnote_renumber(xmldoc)
175
- seen = {}
176
- i = 0
177
- xmldoc.xpath(PRE_NORMREF_FOOTNOTES).each do |fn|
178
- i, seen = other_footnote_renumber1(fn, i, seen)
179
- end
180
- xmldoc.xpath(NORMREF_FOOTNOTES).each do |fn|
181
- i, seen = other_footnote_renumber1(fn, i, seen)
182
- end
183
- xmldoc.xpath(POST_NORMREF_FOOTNOTES).each do |fn|
184
- i, seen = other_footnote_renumber1(fn, i, seen)
185
- end
186
- end
187
-
188
- def footnote_renumber(xmldoc)
189
- table_footnote_renumber(xmldoc)
190
- other_footnote_renumber(xmldoc)
191
- xmldoc.xpath("//fn").each do |fn|
192
- fn.delete("table")
193
- end
194
- end
195
-
196
113
  def sections_cleanup(x)
197
114
  s = x.at("//sections")
198
115
  foreword = x.at("//foreword")
data/lib/asciidoctor/iso/cleanup_footnotes.rb ADDED
@@ -0,0 +1,96 @@
1
+ require "date"
2
+ require "nokogiri"
3
+ require "htmlentities"
4
+ require "json"
5
+ require "pathname"
6
+ require "open-uri"
7
+ require "pp"
8
+
9
+ module Asciidoctor
10
+ module ISO
11
+ module Cleanup
12
+ # include footnotes inside figure
13
+ def figure_footnote_cleanup(xmldoc)
14
+ nomatches = false
15
+ until nomatches
16
+ q = "//figure/following-sibling::*[1][self::p and *[1][self::fn]]"
17
+ nomatches = true
18
+ xmldoc.xpath(q).each do |s|
19
+ s.previous_element << s.first_element_child.remove
20
+ s.remove
21
+ nomatches = false
22
+ end
23
+ end
24
+ end
25
+
26
+ def table_footnote_renumber1(fn, i, seen)
27
+ if seen[fn.text] then outnum = seen[fn.text]
28
+ else
29
+ i += 1
30
+ outnum = i
31
+ seen[fn.text] = outnum
32
+ end
33
+ fn["reference"] = (outnum - 1 + "a".ord).chr
34
+ fn["table"] = true
35
+ [i, seen]
36
+ end
37
+
38
+ def table_footnote_renumber(xmldoc)
39
+ xmldoc.xpath("//table | //figure").each do |t|
40
+ seen = {}
41
+ i = 0
42
+ t.xpath(".//fn").each do |fn|
43
+ i, seen = table_footnote_renumber1(fn, i, seen)
44
+ end
45
+ end
46
+ end
47
+
48
+ def other_footnote_renumber1(fn, i, seen)
49
+ unless fn["table"]
50
+ if seen[fn.text] then outnum = seen[fn.text]
51
+ else
52
+ i += 1
53
+ outnum = i
54
+ seen[fn.text] = outnum
55
+ end
56
+ fn["reference"] = outnum.to_s
57
+ end
58
+ [i, seen]
59
+ end
60
+
61
+ PRE_NORMREF_FOOTNOTES = "//foreword//fn | //introduction//fn |"\
62
+ "//clause[title = 'Scope']//fn" .freeze
63
+
64
+ NORMREF_FOOTNOTES =
65
+ "//references[title = 'Normative References']//fn |"\
66
+ "//references[title = 'Normative References']//bibitem/note".freeze
67
+
68
+ POST_NORMREF_FOOTNOTES =
69
+ "//clause[not(title = 'Scope')]//fn | "\
70
+ "//references[title = 'Bibliography']//fn | "\
71
+ "//references[title = 'Bibliography']//bibitem/note".freeze
72
+
73
+ def other_footnote_renumber(xmldoc)
74
+ seen = {}
75
+ i = 0
76
+ xmldoc.xpath(PRE_NORMREF_FOOTNOTES).each do |fn|
77
+ i, seen = other_footnote_renumber1(fn, i, seen)
78
+ end
79
+ xmldoc.xpath(NORMREF_FOOTNOTES).each do |fn|
80
+ i, seen = other_footnote_renumber1(fn, i, seen)
81
+ end
82
+ xmldoc.xpath(POST_NORMREF_FOOTNOTES).each do |fn|
83
+ i, seen = other_footnote_renumber1(fn, i, seen)
84
+ end
85
+ end
86
+
87
+ def footnote_renumber(xmldoc)
88
+ table_footnote_renumber(xmldoc)
89
+ other_footnote_renumber(xmldoc)
90
+ xmldoc.xpath("//fn").each do |fn|
91
+ fn.delete("table")
92
+ end
93
+ end
94
+ end
95
+ end
96
+ end
data/lib/asciidoctor/iso/front.rb CHANGED
@@ -84,6 +84,7 @@ module Asciidoctor
84
84
  xml.status do |s|
85
85
  s.stage (node.attr("docstage") || "60")
86
86
  s.substage (node.attr("docsubstage") || "60")
87
+ node.attr("iteration") && (s.iteration node.attr("iteration"))
87
88
  end
88
89
  end
89
90
 
@@ -96,6 +97,11 @@ module Asciidoctor
96
97
  end
97
98
  end
98
99
 
100
+ def metadata_ics(node, xml)
101
+ ics = node.attr("library-ics")
102
+ ics && ics.split(/,\s*/).each { |i| xml.ics i }
103
+ end
104
+
99
105
  def metadata(node, xml)
100
106
  title node, xml
101
107
  metadata_id(node, xml)
@@ -106,6 +112,7 @@ module Asciidoctor
106
112
  metadata_status(node, xml)
107
113
  metadata_copyright(node, xml)
108
114
  metadata_committee(node, xml)
115
+ metadata_ics(node, xml)
109
116
  end
110
117
 
111
118
  def title_intro(node, t, lang, at)
data/lib/asciidoctor/iso/html/header.html CHANGED
@@ -63,14 +63,14 @@ normal'><span lang=EN-GB><span style='mso-special-character:footnote-continuatio
63
63
 
64
64
  </div>
65
65
 
66
- <div style='mso-element:header' id=eh1>
66
+ <div style='mso-element:header' id=eha>
67
67
 
68
68
  <p class=MsoHeader align=left style='text-align:left;line-height:12.0pt;
69
69
  mso-line-height-rule:exactly'><span lang=EN-GB>{{ agency }}&nbsp;{{ docnumber }}:{{ docyear }}(E){{ draftinfo }}</span></p>
70
70
 
71
71
  </div>
72
72
 
73
- <div style='mso-element:header' id=h1>
73
+ <div style='mso-element:header' id=ha>
74
74
 
75
75
  <p class=MsoHeader style='margin-bottom:18.0pt'><span lang=EN-GB
76
76
  style='font-size:10.0pt;mso-bidi-font-size:11.0pt;font-weight:normal'>©
@@ -79,7 +79,7 @@ style='font-weight:normal'><o:p></o:p></span></p>
79
79
 
80
80
  </div>
81
81
 
82
- <div style='mso-element:footer' id=ef1>
82
+ <div style='mso-element:footer' id=efa>
83
83
 
84
84
  <p class=MsoFooter style='margin-top:12.0pt;line-height:12.0pt;mso-line-height-rule:
85
85
  exactly'><!--[if supportFields]><b style='mso-bidi-font-weight:normal'><span
data/lib/asciidoctor/iso/html/{htmlstyle.css → htmlstyle.scss} RENAMED
@@ -11,7 +11,7 @@ p.MsoCommentText, li.MsoCommentText, div.MsoCommentText
11
11
  mso-pagination:widow-orphan;
12
12
  tab-stops:20.15pt;
13
13
  font-size:12.0pt;
14
- font-family:"Cambria",serif;
14
+ font-family:$bodyfont;
15
15
  mso-fareast-font-family:Calibri;
16
16
  mso-bidi-font-family:"Times New Roman";
17
17
  mso-ansi-language:EN-GB;
@@ -37,7 +37,7 @@ p.MsoCommentSubject, li.MsoCommentSubject, div.MsoCommentSubject
37
37
  mso-pagination:widow-orphan;
38
38
  tab-stops:20.15pt;
39
39
  font-size:10.0pt;
40
- font-family:"Cambria",serif;
40
+ font-family:$headerfont;
41
41
  mso-fareast-font-family:Calibri;
42
42
  mso-bidi-font-family:"Times New Roman";
43
43
  mso-ansi-language:EN-GB;
data/lib/asciidoctor/iso/html/{isodoc.css → isodoc.scss} RENAMED
@@ -11,7 +11,7 @@ p.Sourcecode, li.Sourcecode, div.Sourcecode, pre.Sourcecode
11
11
  mso-pagination:widow-orphan;
12
12
  tab-stops:20.15pt;
13
13
  font-size:9.0pt;
14
- font-family:"Courier New",monospace;
14
+ font-family:$monospacefont;
15
15
  mso-fareast-font-family:Calibri;
16
16
  mso-bidi-font-family:"Courier New";
17
17
  mso-ansi-language:EN-GB;}
@@ -28,9 +28,9 @@ p.Biblio, li.Biblio, div.Biblio
28
28
  line-height:12.0pt;
29
29
  mso-pagination:widow-orphan;
30
30
  font-size:11.0pt;
31
- font-family:"Cambria",serif;
32
- mso-fareast-font-family:Calibri;
33
- mso-bidi-font-family:"Cambria";
31
+ font-family:$bodyfont;
32
+ mso-fareast-font-family:$bodyfont;
33
+ mso-bidi-font-family:$bodyfont;
34
34
  mso-ansi-language:EN-GB;}
35
35
  p.FigureTitle
36
36
  {mso-style-unhide:no;
@@ -46,9 +46,9 @@ p.FigureTitle
46
46
  mso-pagination:widow-orphan;
47
47
  tab-stops:20.15pt;
48
48
  font-size:11.0pt;
49
- font-family:"Cambria",serif;
50
- mso-fareast-font-family:Calibri;
51
- mso-bidi-font-family:"Cambria";
49
+ font-family:$bodyfont;
50
+ mso-fareast-font-family:$bodyfont;
51
+ mso-bidi-font-family:$bodyfont;
52
52
  mso-ansi-language:EN-GB;}
53
53
  p.TableTitle
54
54
  {mso-style-unhide:no;
@@ -64,9 +64,9 @@ p.TableTitle
64
64
  mso-pagination:widow-orphan;
65
65
  tab-stops:20.15pt;
66
66
  font-size:11.0pt;
67
- font-family:"Cambria",serif;
68
- mso-fareast-font-family:Calibri;
69
- mso-bidi-font-family:"Cambria";
67
+ font-family:$bodyfont;
68
+ mso-fareast-font-family:$bodyfont;
69
+ mso-bidi-font-family:$bodyfont;
70
70
  mso-ansi-language:EN-GB;}
71
71
  p.Note, div.Note, li.Note
72
72
  {mso-style-unhide:no;
@@ -82,9 +82,9 @@ p.Note, div.Note, li.Note
82
82
  tab-stops:20.15pt;
83
83
  font-size:10.0pt;
84
84
  mso-bidi-font-size:11.0pt;
85
- font-family:"Cambria",serif;
86
- mso-fareast-font-family:Calibri;
87
- mso-bidi-font-family:"Cambria";
85
+ font-family:$bodyfont;
86
+ mso-fareast-font-family:$bodyfont;
87
+ mso-bidi-font-family:$bodyfont;
88
88
  mso-ansi-language:EN-GB;}
89
89
  /* may need to be revised */
90
90
  p.ANNEX, li.ANNEX, div.ANNEX
@@ -108,9 +108,9 @@ p.ANNEX, li.ANNEX, div.ANNEX
108
108
  tab-stops:20.15pt;
109
109
  font-size:14.0pt;
110
110
  mso-bidi-font-size:11.0pt;
111
- font-family:"Cambria",serif;
112
- mso-fareast-font-family:"MS Mincho";
113
- mso-bidi-font-family:"Cambria";
111
+ font-family:$headerfont;
112
+ mso-fareast-font-family:$headerfont;
113
+ mso-bidi-font-family:$headerfont;
114
114
  mso-ansi-language:EN-GB;
115
115
  mso-fareast-language:JA;
116
116
  font-weight:bold;
@@ -130,9 +130,9 @@ p.BiblioTitle, li.BiblioTitle, div.BiblioTitle
130
130
  tab-stops:20.15pt;
131
131
  font-size:14.0pt;
132
132
  mso-bidi-font-size:11.0pt;
133
- font-family:"Cambria",serif;
134
- mso-fareast-font-family:Calibri;
135
- mso-bidi-font-family:"Cambria";
133
+ font-family:$headerfont;
134
+ mso-fareast-font-family:$headerfont;
135
+ mso-bidi-font-family:$headerfont;
136
136
  mso-ansi-language:EN-GB;
137
137
  font-weight:bold;
138
138
  mso-bidi-font-weight:normal;}
@@ -149,9 +149,9 @@ p.Definition, li.Definition, div.Definition
149
149
  mso-pagination:widow-orphan;
150
150
  tab-stops:20.15pt;
151
151
  font-size:11.0pt;
152
- font-family:"Cambria",serif;
153
- mso-fareast-font-family:Calibri;
154
- mso-bidi-font-family:"Cambria";
152
+ font-family:$bodyfont;
153
+ mso-fareast-font-family:$bodyfont;
154
+ mso-bidi-font-family:$bodyfont;
155
155
  mso-ansi-language:EN-GB;}
156
156
  p.ForewordTitle, li.ForewordTitle, div.ForewordTitle
157
157
  {mso-style-name:"Foreword Title";
@@ -171,9 +171,9 @@ p.ForewordTitle, li.ForewordTitle, div.ForewordTitle
171
171
  tab-stops:20.15pt;
172
172
  font-size:14.0pt;
173
173
  mso-bidi-font-size:11.0pt;
174
- font-family:"Cambria",serif;
175
- mso-fareast-font-family:Calibri;
176
- mso-bidi-font-family:"Cambria";
174
+ font-family:$headerfont;
175
+ mso-fareast-font-family:$headerfont;
176
+ mso-bidi-font-family:$headerfont;
177
177
  mso-ansi-language:EN-GB;
178
178
  font-weight:bold;
179
179
  mso-bidi-font-weight:normal;}
@@ -196,9 +196,9 @@ p.IntroTitle, li.IntroTitle, div.IntroTitle
196
196
  font-size:14.0pt;
197
197
  mso-bidi-font-size:11.0pt;
198
198
  page-break-before:always;
199
- font-family:"Cambria",serif;
200
- mso-fareast-font-family:Calibri;
201
- mso-bidi-font-family:"Cambria";
199
+ font-family:$headerfont;
200
+ mso-fareast-font-family:$headerfont;
201
+ mso-bidi-font-family:$headerfont;
202
202
  mso-ansi-language:EN-GB;
203
203
  font-weight:bold;
204
204
  mso-bidi-font-weight:normal;}
@@ -215,9 +215,9 @@ p.Terms, li.Terms, div.Terms
215
215
  mso-hyphenate:none;
216
216
  tab-stops:20.15pt;
217
217
  font-size:11.0pt;
218
- font-family:"Cambria",serif;
219
- mso-fareast-font-family:Calibri;
220
- mso-bidi-font-family:"Cambria";
218
+ font-family:$headerfont;
219
+ mso-fareast-font-family:$headerfont;
220
+ mso-bidi-font-family:$headerfont;
221
221
  mso-ansi-language:EN-GB;
222
222
  font-weight:bold;
223
223
  mso-bidi-font-weight:normal;}
@@ -234,9 +234,9 @@ p.AltTerms, li.AltTerms, div.AltTerms
234
234
  mso-hyphenate:none;
235
235
  tab-stops:20.15pt;
236
236
  font-size:11.0pt;
237
- font-family:"Cambria",serif;
238
- mso-fareast-font-family:Calibri;
239
- mso-bidi-font-family:"Cambria";
237
+ font-family:$bodyfont;
238
+ mso-fareast-font-family:$bodyfont;
239
+ mso-bidi-font-family:$bodyfont;
240
240
  mso-ansi-language:EN-GB;
241
241
  mso-bidi-font-weight:normal;}
242
242
  p.DeprecatedTerms, li.DeprecatedTerms, div.DeprecatedTerms
@@ -252,9 +252,9 @@ p.DeprecatedTerms, li.DeprecatedTerms, div.DeprecatedTerms
252
252
  mso-hyphenate:none;
253
253
  tab-stops:20.15pt;
254
254
  font-size:11.0pt;
255
- font-family:"Cambria",serif;
256
- mso-fareast-font-family:Calibri;
257
- mso-bidi-font-family:"Cambria";
255
+ font-family:$bodyfont;
256
+ mso-fareast-font-family:$bodyfont;
257
+ mso-bidi-font-family:$bodyfont;
258
258
  mso-ansi-language:EN-GB;
259
259
  mso-bidi-font-weight:normal;}
260
260
  p.TermNum, li.TermNum, div.TermNum
@@ -269,9 +269,9 @@ p.TermNum, li.TermNum, div.TermNum
269
269
  page-break-after:avoid;
270
270
  tab-stops:20.15pt;
271
271
  font-size:11.0pt;
272
- font-family:"Cambria",serif;
273
- mso-fareast-font-family:Calibri;
274
- mso-bidi-font-family:"Cambria";
272
+ font-family:$headerfont;
273
+ mso-fareast-font-family:$headerfont;
274
+ mso-bidi-font-family:$headerfont;
275
275
  mso-ansi-language:EN-GB;
276
276
  font-weight:bold;
277
277
  mso-bidi-font-weight:normal;}
@@ -293,9 +293,9 @@ p.zzContents, li.zzContents, div.zzContents
293
293
  tab-stops:20.15pt;
294
294
  font-size:14.0pt;
295
295
  mso-bidi-font-size:11.0pt;
296
- font-family:"Cambria",serif;
297
- mso-fareast-font-family:Calibri;
298
- mso-bidi-font-family:"Cambria";
296
+ font-family:$headerfont;
297
+ mso-fareast-font-family:$headerfont;
298
+ mso-bidi-font-family:$headerfont;
299
299
  mso-ansi-language:EN-GB;
300
300
  font-weight:bold;
301
301
  mso-bidi-font-weight:normal;}
@@ -317,9 +317,9 @@ p.zzCopyright, li.zzCopyright, div.zzCopyright
317
317
  padding:0cm;
318
318
  mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt;
319
319
  font-size:11.0pt;
320
- font-family:"Cambria",serif;
321
- mso-fareast-font-family:Calibri;
322
- mso-bidi-font-family:"Cambria";
320
+ font-family:$bodyfont;
321
+ mso-fareast-font-family:$bodyfont;
322
+ mso-bidi-font-family:$bodyfont;
323
323
  mso-ansi-language:EN-GB;}
324
324
  p.zzSTDTitle, li.zzSTDTitle, div.zzSTDTitle
325
325
  {mso-style-name:zzSTDTitle;
@@ -337,9 +337,9 @@ p.zzSTDTitle, li.zzSTDTitle, div.zzSTDTitle
337
337
  tab-stops:20.15pt;
338
338
  font-size:16.0pt;
339
339
  mso-bidi-font-size:11.0pt;
340
- font-family:"Cambria",serif;
341
- mso-fareast-font-family:Calibri;
342
- mso-bidi-font-family:"Cambria";
340
+ font-family:$headerfont;
341
+ mso-fareast-font-family:$headerfont;
342
+ mso-bidi-font-family:$headerfont;
343
343
  mso-ansi-language:EN-GB;
344
344
  font-weight:bold;
345
345
  mso-bidi-font-weight:normal;}
@@ -359,9 +359,9 @@ p.zzSTDTitle1, li.zzSTDTitle1, div.zzSTDTitle1
359
359
  tab-stops:20.15pt;
360
360
  font-size:16.0pt;
361
361
  mso-bidi-font-size:11.0pt;
362
- font-family:"Cambria",serif;
363
- mso-fareast-font-family:Calibri;
364
- mso-bidi-font-family:"Cambria";
362
+ font-family:$headerfont;
363
+ mso-fareast-font-family:$headerfont;
364
+ mso-bidi-font-family:$headerfont;
365
365
  mso-ansi-language:EN-GB;
366
366
  font-weight:bold;
367
367
  mso-bidi-font-weight:normal;}
@@ -376,9 +376,9 @@ p.Quote, li.Quote, div.Quote
376
376
  mso-pagination:widow-orphan;
377
377
  tab-stops:20.15pt;
378
378
  font-size:11.0pt;
379
- font-family:"Cambria",sans-serif;
380
- mso-fareast-font-family:Calibri;
381
- mso-bidi-font-family:"Cambria";
379
+ font-family:$bodyfont;
380
+ mso-fareast-font-family:$bodyfont;
381
+ mso-bidi-font-family:$bodyfont;
382
382
  mso-ansi-language:EN-GB;}
383
383
  p.QuoteAttribution
384
384
  {text-align:right;}
@@ -388,14 +388,14 @@ p.Admonition, li.Admonition, div.Admonition
388
388
  border:none;
389
389
  padding:0cm;
390
390
  font-size:12.0pt;
391
- font-family:"Calibri",sans-serif;
392
- mso-ascii-font-family:Calibri;
391
+ font-family:$bodyfont;
392
+ mso-ascii-font-family:$bodyfont;
393
393
  mso-ascii-theme-font:minor-latin;
394
- mso-fareast-font-family:"Cambria";
394
+ mso-fareast-font-family:$bodyfont;
395
395
  mso-fareast-theme-font:minor-fareast;
396
- mso-hansi-font-family:Calibri;
396
+ mso-hansi-font-family:$bodyfont;
397
397
  mso-hansi-theme-font:minor-latin;
398
- mso-bidi-font-family:"Cambria";
398
+ mso-bidi-font-family:$bodyfont;
399
399
  mso-bidi-theme-font:minor-bidi;
400
400
  font-weight:bold;
401
401
  mso-ansi-language:EN-AU;}
@@ -411,7 +411,7 @@ p.Code, li.Code, div.Code
411
411
  tab-stops:20.15pt;
412
412
  font-size:9.0pt;
413
413
  mso-bidi-font-size:11.0pt;
414
- font-family:"Courier New",serif;
414
+ font-family:$monospacefont;
415
415
  mso-fareast-font-family:Calibri;
416
416
  mso-bidi-font-family:"Cambria";
417
417
  mso-ansi-language:EN-GB;}
@@ -427,9 +427,9 @@ p.Formula, li.Formula, div.Formula
427
427
  mso-pagination:widow-orphan;
428
428
  tab-stops:right 487.45pt;
429
429
  font-size:11.0pt;
430
- font-family:"Cambria",serif;
431
- mso-fareast-font-family:"Cambria";
432
- mso-bidi-font-family:"Cambria";
430
+ font-family:$bodyfont;
431
+ mso-fareast-font-family:$bodyfont;
432
+ mso-bidi-font-family:$bodyfont;
433
433
  mso-ansi-language:EN-GB;}
434
434
  table.dl
435
435
  {margin-top:0cm;
@@ -454,50 +454,13 @@ table.dl
454
454
  tab-stops:27.0pt 35.0pt;
455
455
  font-size:12.0pt;
456
456
  mso-bidi-font-size:11.0pt;
457
- font-family:"Cambria",serif;
457
+ font-family:$headerfont;
458
458
  font-weight:bold;
459
- mso-fareast-font-family:"MS Mincho";
459
+ mso-fareast-font-family:$headerfont;
460
460
  mso-ansi-language:EN-GB;
461
461
  mso-fareast-language:JA;
462
462
  mso-bidi-font-weight:normal;}
463
463
 
464
- @page WordSection1
465
- {size:595.3pt 841.9pt;
466
- margin:39.7pt 53.85pt 1.0cm 53.85pt;
467
- mso-header-margin:35.45pt;
468
- mso-footer-margin:14.2pt;
469
- mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh1;
470
- mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h1;
471
- mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef1;
472
- mso-paper-source:0;}
473
- div.WordSection1
474
- {page:WordSection1;}
475
- @page WordSection2
476
- {size:595.3pt 841.9pt;
477
- margin:39.7pt 53.85pt 1.0cm 53.85pt;
478
- mso-header-margin:35.45pt;
479
- mso-footer-margin:14.2pt;
480
- mso-page-numbers:roman-lower;
481
- mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2;
482
- mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
483
- mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef2;
484
- mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f2;
485
- mso-paper-source:0;}
486
- div.WordSection2
487
- {page:WordSection2;}
488
- @page WordSection3
489
- {size:595.3pt 841.9pt;
490
- margin:39.7pt 53.85pt 1.0cm 53.85pt;
491
- mso-header-margin:35.45pt;
492
- mso-footer-margin:14.2pt;
493
- mso-page-numbers:1;
494
- mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2;
495
- mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
496
- mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef3;
497
- mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f3;
498
- mso-paper-source:0;}
499
- div.WordSection3
500
- {page:WordSection3;}
501
464
  ol
502
465
  {margin-bottom:0cm;}
503
466
  ul
@@ -521,7 +484,7 @@ table.MsoISOTable
521
484
  mso-border-insideh:.75pt solid windowtext;
522
485
  mso-border-insidev:.75pt solid windowtext;
523
486
  font-size:10.0pt;
524
- font-family:"Cambria",serif;}
487
+ font-family:$bodyfont;}
525
488
  table.MsoISOTable tr
526
489
  {page-break-inside:avoid;}
527
490
  table.MsoISOTable th
@@ -547,14 +510,13 @@ table.MsoTableGrid
547
510
  mso-para-margin-bottom:.0001pt;
548
511
  mso-pagination:widow-orphan;
549
512
  font-size:10.0pt;
550
- font-family:"Cambria",serif;}
513
+ font-family:$bodyfont;}
551
514
  td { page-break-inside:avoid; }
552
515
  tr { page-break-after:avoid; }
553
516
  span.stem
554
517
  {font-family:"Cambria Math",serif;
555
518
  mso-ascii-font-family:"Cambria Math";
556
- font-style:
557
- italic;}
519
+ font-style:italic;}
558
520
  div.formula
559
521
  {tab-stops:right 487.45pt;}
560
522
  body