metanorma-rsd 1.4.3 → 1.4.8
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.
- checksums.yaml +4 -4
- data/.github/workflows/macos.yml +10 -10
- data/.github/workflows/ubuntu.yml +11 -11
- data/.github/workflows/windows.yml +11 -12
- data/README.adoc +5 -5
- data/lib/asciidoctor/rsd/biblio.rng +144 -49
- data/lib/asciidoctor/rsd/converter.rb +40 -7
- data/lib/asciidoctor/rsd/isodoc.rng +49 -5
- data/lib/isodoc/rsd/base_convert.rb +56 -0
- data/lib/isodoc/rsd/html/header.html +15 -15
- data/lib/isodoc/rsd/html/html_rsd_titlepage.html +1 -1
- data/lib/isodoc/rsd/html/htmlstyle.scss +6 -7
- data/lib/isodoc/rsd/html/logo.png +0 -0
- data/lib/isodoc/rsd/html/rsd.scss +57 -60
- data/lib/isodoc/rsd/html/scripts.html +14 -27
- data/lib/isodoc/rsd/html/word_rsd_intro.html +5 -5
- data/lib/isodoc/rsd/html/word_rsd_titlepage.html +69 -14
- data/lib/isodoc/rsd/html/wordstyle.scss +43 -30
- data/lib/isodoc/rsd/html_convert.rb +16 -8
- data/lib/isodoc/rsd/metadata.rb +2 -28
- data/lib/isodoc/rsd/pdf_convert.rb +16 -11
- data/lib/isodoc/rsd/rsd.standard.xsl +6642 -0
- data/lib/isodoc/rsd/word_convert.rb +15 -8
- data/lib/metanorma-rsd.rb +1 -0
- data/lib/metanorma/rsd.rb +2 -2
- data/lib/metanorma/rsd/processor.rb +3 -6
- data/lib/metanorma/rsd/version.rb +1 -1
- data/metanorma-rsd.gemspec +2 -2
- data/metanorma.yml +14 -1
- metadata +8 -7
- data/lib/asciidoctor/rsd/validate.rb +0 -22
- data/lib/isodoc/rsd/html/scripts.pdf.html +0 -72
|
@@ -1,22 +1,54 @@
|
|
|
1
1
|
require "asciidoctor/standoc/converter"
|
|
2
|
-
require 'asciidoctor/
|
|
2
|
+
require 'asciidoctor/generic/converter'
|
|
3
3
|
|
|
4
4
|
module Asciidoctor
|
|
5
5
|
module Rsd
|
|
6
6
|
# A {Converter} implementation that generates RSD output, and a document
|
|
7
7
|
# schema encapsulation of the document for validation
|
|
8
8
|
#
|
|
9
|
-
class Converter < Asciidoctor::
|
|
9
|
+
class Converter < Asciidoctor::Generic::Converter
|
|
10
|
+
XML_ROOT_TAG = 'rsd-standard'.freeze
|
|
11
|
+
XML_NAMESPACE = 'https://www.metanorma.org/ns/rsd'.freeze
|
|
12
|
+
|
|
10
13
|
register_for "rsd"
|
|
11
14
|
|
|
12
|
-
def
|
|
13
|
-
|
|
14
|
-
|
|
15
|
+
def sectiontype(node, level = true)
|
|
16
|
+
ret = node&.attr("heading")&.downcase ||
|
|
17
|
+
node.title.gsub(/<[^>]+>/, "").downcase
|
|
18
|
+
ret1 = sectiontype_streamline(ret)
|
|
19
|
+
return ret1 if "symbols and abbreviated terms" == ret1
|
|
20
|
+
return ret1 if "executive summary" == ret1
|
|
21
|
+
return nil unless !level || node.level == 1
|
|
22
|
+
return nil if @seen_headers.include? ret
|
|
23
|
+
@seen_headers << ret
|
|
24
|
+
ret1
|
|
25
|
+
end
|
|
26
|
+
|
|
27
|
+
def make_preface(x, s)
|
|
28
|
+
if x.at("//foreword | //introduction | //acknowledgements | "\
|
|
29
|
+
"//clause[@preface] | //executivesummary")
|
|
30
|
+
preface = s.add_previous_sibling("<preface/>").first
|
|
31
|
+
f = x.at("//foreword") and preface.add_child f.remove
|
|
32
|
+
f = x.at("//executivesummary") and preface.add_child f.remove
|
|
33
|
+
f = x.at("//introduction") and preface.add_child f.remove
|
|
34
|
+
move_clauses_into_preface(x, preface)
|
|
35
|
+
f = x.at("//acknowledgements") and preface.add_child f.remove
|
|
36
|
+
end
|
|
37
|
+
make_abstract(x, s)
|
|
15
38
|
end
|
|
16
39
|
|
|
17
|
-
def
|
|
40
|
+
def clause_parse(attrs, xml, node)
|
|
41
|
+
sectiontype(node) == "executive summary" and
|
|
42
|
+
return executivesummary_parse(attrs, xml, node)
|
|
18
43
|
super
|
|
19
|
-
|
|
44
|
+
end
|
|
45
|
+
|
|
46
|
+
def executivesummary_parse(attrs, xml, node)
|
|
47
|
+
xml.executivesummary **attr_code(attrs) do |xml_section|
|
|
48
|
+
xml_section.title { |t| t << node.title || "Executive Summary" }
|
|
49
|
+
content = node.content
|
|
50
|
+
xml_section << content
|
|
51
|
+
end
|
|
20
52
|
end
|
|
21
53
|
|
|
22
54
|
def configuration
|
|
@@ -28,6 +60,7 @@ module Asciidoctor
|
|
|
28
60
|
end
|
|
29
61
|
|
|
30
62
|
def pdf_converter(node)
|
|
63
|
+
return nil if node.attr("no-pdf")
|
|
31
64
|
IsoDoc::Rsd::PdfConvert.new(html_extract_attributes(node))
|
|
32
65
|
end
|
|
33
66
|
|
|
@@ -53,6 +53,14 @@
|
|
|
53
53
|
<optional>
|
|
54
54
|
<attribute name="alt"/>
|
|
55
55
|
</optional>
|
|
56
|
+
<optional>
|
|
57
|
+
<attribute name="case">
|
|
58
|
+
<choice>
|
|
59
|
+
<value>capital</value>
|
|
60
|
+
<value>lowercase</value>
|
|
61
|
+
</choice>
|
|
62
|
+
</attribute>
|
|
63
|
+
</optional>
|
|
56
64
|
<text/>
|
|
57
65
|
</element>
|
|
58
66
|
</define>
|
|
@@ -101,9 +109,7 @@
|
|
|
101
109
|
<ref name="structuredidentifier"/>
|
|
102
110
|
</zeroOrMore>
|
|
103
111
|
</define>
|
|
104
|
-
|
|
105
|
-
<text/>
|
|
106
|
-
</define>
|
|
112
|
+
<!-- TitleType = text -->
|
|
107
113
|
<define name="sections">
|
|
108
114
|
<element name="sections">
|
|
109
115
|
<oneOrMore>
|
|
@@ -131,6 +137,9 @@
|
|
|
131
137
|
</choice>
|
|
132
138
|
</attribute>
|
|
133
139
|
</optional>
|
|
140
|
+
<attribute name="normative">
|
|
141
|
+
<data type="boolean"/>
|
|
142
|
+
</attribute>
|
|
134
143
|
<optional>
|
|
135
144
|
<ref name="section-title"/>
|
|
136
145
|
</optional>
|
|
@@ -307,6 +316,21 @@
|
|
|
307
316
|
</define>
|
|
308
317
|
</include>
|
|
309
318
|
<!-- end overrides -->
|
|
319
|
+
<define name="TextElement" combine="choice">
|
|
320
|
+
<ref name="concept"/>
|
|
321
|
+
</define>
|
|
322
|
+
<define name="concept">
|
|
323
|
+
<element name="concept">
|
|
324
|
+
<optional>
|
|
325
|
+
<attribute name="term"/>
|
|
326
|
+
</optional>
|
|
327
|
+
<choice>
|
|
328
|
+
<ref name="eref"/>
|
|
329
|
+
<ref name="xref"/>
|
|
330
|
+
<ref name="termref"/>
|
|
331
|
+
</choice>
|
|
332
|
+
</element>
|
|
333
|
+
</define>
|
|
310
334
|
<define name="BasicBlock" combine="choice">
|
|
311
335
|
<choice>
|
|
312
336
|
<ref name="requirement"/>
|
|
@@ -886,7 +910,15 @@
|
|
|
886
910
|
<attribute name="id">
|
|
887
911
|
<data type="ID"/>
|
|
888
912
|
</attribute>
|
|
889
|
-
<
|
|
913
|
+
<oneOrMore>
|
|
914
|
+
<choice>
|
|
915
|
+
<ref name="paragraph"/>
|
|
916
|
+
<ref name="ul"/>
|
|
917
|
+
<ref name="ol"/>
|
|
918
|
+
<ref name="dl"/>
|
|
919
|
+
<ref name="formula"/>
|
|
920
|
+
</choice>
|
|
921
|
+
</oneOrMore>
|
|
890
922
|
</element>
|
|
891
923
|
</define>
|
|
892
924
|
<define name="termexample">
|
|
@@ -913,7 +945,10 @@
|
|
|
913
945
|
</define>
|
|
914
946
|
<define name="origin">
|
|
915
947
|
<element name="origin">
|
|
916
|
-
<
|
|
948
|
+
<choice>
|
|
949
|
+
<ref name="erefType"/>
|
|
950
|
+
<ref name="termref"/>
|
|
951
|
+
</choice>
|
|
917
952
|
</element>
|
|
918
953
|
</define>
|
|
919
954
|
<define name="modification">
|
|
@@ -921,6 +956,15 @@
|
|
|
921
956
|
<ref name="paragraph"/>
|
|
922
957
|
</element>
|
|
923
958
|
</define>
|
|
959
|
+
<define name="termref">
|
|
960
|
+
<element name="termref">
|
|
961
|
+
<attribute name="base"/>
|
|
962
|
+
<attribute name="target"/>
|
|
963
|
+
<optional>
|
|
964
|
+
<text/>
|
|
965
|
+
</optional>
|
|
966
|
+
</element>
|
|
967
|
+
</define>
|
|
924
968
|
<define name="structuredidentifier">
|
|
925
969
|
<element name="structuredidentifier">
|
|
926
970
|
<optional>
|
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
module IsoDoc
|
|
2
|
+
module Rsd
|
|
3
|
+
module BaseConvert
|
|
4
|
+
def metadata_init(lang, script, labels)
|
|
5
|
+
@meta = Metadata.new(lang, script, labels)
|
|
6
|
+
end
|
|
7
|
+
|
|
8
|
+
def annex_name(annex, name, div)
|
|
9
|
+
div.h1 **{ class: "Annex" } do |t|
|
|
10
|
+
t << "#{anchor(annex['id'], :label)}<br/><br/>"
|
|
11
|
+
name&.children&.each { |c2| parse(c2, t) }
|
|
12
|
+
end
|
|
13
|
+
end
|
|
14
|
+
|
|
15
|
+
def annex_name_lbl(clause, num)
|
|
16
|
+
obl = l10n("(#{@inform_annex_lbl})")
|
|
17
|
+
obl = l10n("(#{@norm_annex_lbl})") if clause["obligation"] == "normative"
|
|
18
|
+
l10n("#{@annex_lbl} #{num}<br/>#{obl}")
|
|
19
|
+
end
|
|
20
|
+
|
|
21
|
+
def executivesummary docxml, out
|
|
22
|
+
f = docxml.at(ns("//executivesummary")) || return
|
|
23
|
+
title_attr = { class: "IntroTitle" }
|
|
24
|
+
page_break(out)
|
|
25
|
+
out.div **{ class: "Section3", id: f["id"] } do |div|
|
|
26
|
+
clause_name(nil, f&.at(ns("./title")), div, title_attr)
|
|
27
|
+
f.elements.each do |e|
|
|
28
|
+
parse(e, div) unless e.name == "title"
|
|
29
|
+
end
|
|
30
|
+
end
|
|
31
|
+
end
|
|
32
|
+
|
|
33
|
+
def initial_anchor_names(d)
|
|
34
|
+
preface_names(d.at(ns("//executivesummary")))
|
|
35
|
+
super
|
|
36
|
+
sequential_asset_names(
|
|
37
|
+
d.xpath(ns("//preface/abstract | //foreword | //introduction | "\
|
|
38
|
+
"//preface/clause | //acknowledgements | //executivesummary")))
|
|
39
|
+
end
|
|
40
|
+
|
|
41
|
+
def clausedelim
|
|
42
|
+
""
|
|
43
|
+
end
|
|
44
|
+
|
|
45
|
+
def section_names1(clause, num, level)
|
|
46
|
+
@anchors[clause["id"]] =
|
|
47
|
+
{ label: num, level: level, xref: num }
|
|
48
|
+
# subclauses are not prefixed with "Clause"
|
|
49
|
+
clause.xpath(ns("./clause | ./terms | ./term | ./definitions | ./references")).
|
|
50
|
+
each_with_index do |c, i|
|
|
51
|
+
section_names1(c, "#{num}.#{i + 1}", level + 1)
|
|
52
|
+
end
|
|
53
|
+
end
|
|
54
|
+
end
|
|
55
|
+
end
|
|
56
|
+
end
|
|
@@ -66,7 +66,7 @@ normal'>RS {{ docnumber }}:{{ docyea
|
|
|
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'>©
|
|
77
|
-
Ribose
|
|
77
|
+
Ribose Asia Limited {{ docyear }} – All rights reserved</span><span lang=EN-GB
|
|
78
78
|
style='font-weight:normal'><o:p></o:p></span></p>
|
|
79
79
|
|
|
80
80
|
</div>
|
|
@@ -93,28 +93,28 @@ style='mso-bidi-font-weight:normal'> |
|
|
129
129
|
style='mso-element:field-end'></span></span><![endif]--><span lang=EN-GB
|
|
130
130
|
style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span style='mso-tab-count:
|
|
131
131
|
1'> </span>©
|
|
132
|
-
Ribose
|
|
132
|
+
Ribose Asia Limited {{ docyear }} – All rights reserved<o:p></o:p></span></p>
|
|
133
133
|
</div>
|
|
134
134
|
|
|
135
135
|
<div style='mso-element:footer' id=ef2l>
|
|
@@ -144,12 +144,12 @@ lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'> |
|
|
144
144
|
style='mso-element:field-end'></span></span><![endif]--><span lang=EN-GB
|
|
145
145
|
style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span style='mso-tab-count:
|
|
146
146
|
1'> </span>©
|
|
147
|
-
Ribose
|
|
147
|
+
Ribose Asia Limited {{ docyear }} – All rights reserved<o:p></o:p></span></p>
|
|
148
148
|
</div>
|
|
149
149
|
|
|
150
150
|
<div style='mso-element:footer' id=f2>
|
|
151
151
|
<p class=MsoFooter style='line-height:12.0pt'><span lang=EN-GB
|
|
152
|
-
style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© Ribose
|
|
152
|
+
style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© Ribose Asia Limited {{ docyear }} – All
|
|
153
153
|
rights reserved<span style='mso-tab-count:1'> </span></span><!--[if supportFields]><span
|
|
154
154
|
lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
|
|
155
155
|
style='mso-element:field-begin'></span> PAGE<span style='mso-spacerun:yes'>
|
|
@@ -163,7 +163,7 @@ style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>
|
|
|
163
163
|
|
|
164
164
|
<div style='mso-element:footer' id=f2l>
|
|
165
165
|
<p class=MsoFooterLandscape style='line-height:12.0pt'><span lang=EN-GB
|
|
166
|
-
style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© Ribose
|
|
166
|
+
style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© Ribose Asia Limited {{ docyear }} – All
|
|
167
167
|
rights reserved<span style='mso-tab-count:1'> </span></span><!--[if supportFields]><span
|
|
168
168
|
lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
|
|
169
169
|
style='mso-element:field-begin'></span> PAGE<span style='mso-spacerun:yes'>
|
|
@@ -188,7 +188,7 @@ style='mso-bidi-font-weight:normal'>
|
|
|
224
224
|
|
|
225
225
|
<div style='mso-element:footer' id=f3l>
|
|
226
226
|
<p class=MsoFooterLandscape style='line-height:12.0pt'><span lang=EN-GB
|
|
227
|
-
style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© Ribose
|
|
227
|
+
style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© Ribose Asia Limited {{ docyear }} – All
|
|
228
228
|
rights reserved<span style='mso-tab-count:1'> </span></span><!--[if supportFields]><b
|
|
229
229
|
style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
|
|
230
230
|
mso-bidi-font-size:11.0pt'><span style='mso-element:field-begin'></span>
|
|
@@ -87,16 +87,15 @@ div.figure {
|
|
|
87
87
|
*/
|
|
88
88
|
|
|
89
89
|
.document-type-band {
|
|
90
|
-
@include docBand(2,
|
|
91
|
-
}
|
|
90
|
+
@include docBand($order: 2, $offset: 180px);
|
|
92
91
|
|
|
93
|
-
.document-
|
|
94
|
-
|
|
92
|
+
.document-type {
|
|
93
|
+
top: 20px;
|
|
94
|
+
}
|
|
95
95
|
}
|
|
96
96
|
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
@include docBandTitle(150);
|
|
97
|
+
.document-stage-band {
|
|
98
|
+
@include docBand($order: 1, $textLength: 160px, $fontWeight: 300);
|
|
100
99
|
}
|
|
101
100
|
|
|
102
101
|
#governance-band p.document-type {
|
|
Binary file
|
|
@@ -42,7 +42,7 @@ p.Biblio, li.Biblio, div.Biblio, p.NormRef, li.NormRef, div.NormRef
|
|
|
42
42
|
tab-stops: 33.15pt;
|
|
43
43
|
line-height:12.0pt;
|
|
44
44
|
mso-pagination:widow-orphan;
|
|
45
|
-
font-size:
|
|
45
|
+
font-size:12.0pt;
|
|
46
46
|
font-weight:normal;
|
|
47
47
|
font-family:$bodyfont;
|
|
48
48
|
mso-fareast-font-family:$bodyfont;
|
|
@@ -135,10 +135,9 @@ p.Note, div.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote
|
|
|
135
135
|
line-height:12.0pt;
|
|
136
136
|
mso-pagination:widow-orphan;
|
|
137
137
|
tab-stops:20.15pt;
|
|
138
|
-
font-size:
|
|
138
|
+
font-size:11.0pt;
|
|
139
139
|
mso-bidi-font-size:11.0pt;
|
|
140
140
|
font-family:$bodyfont;
|
|
141
|
-
font-size:10.0pt;
|
|
142
141
|
mso-fareast-font-family:$bodyfont;
|
|
143
142
|
mso-bidi-font-family:$bodyfont;
|
|
144
143
|
mso-ansi-language:EN-GB;}
|
|
@@ -161,14 +160,14 @@ p.ANNEX, li.ANNEX, div.ANNEX
|
|
|
161
160
|
mso-outline-level:1;
|
|
162
161
|
mso-list:l0 level1 lfo12;
|
|
163
162
|
tab-stops:20.15pt;
|
|
164
|
-
font-size:
|
|
163
|
+
font-size:12.0pt;
|
|
165
164
|
mso-bidi-font-size:11.0pt;
|
|
166
165
|
font-family:$headerfont;
|
|
166
|
+
color:#0E1A85;
|
|
167
167
|
mso-fareast-font-family:$headerfont;
|
|
168
168
|
mso-bidi-font-family:$headerfont;
|
|
169
169
|
mso-ansi-language:EN-GB;
|
|
170
170
|
mso-fareast-language:JA;
|
|
171
|
-
font-weight:bold;
|
|
172
171
|
mso-bidi-font-weight:normal;}
|
|
173
172
|
p.BiblioTitle, li.BiblioTitle, div.BiblioTitle
|
|
174
173
|
{mso-style-name:"Biblio Title";
|
|
@@ -183,13 +182,13 @@ p.BiblioTitle, li.BiblioTitle, div.BiblioTitle
|
|
|
183
182
|
mso-pagination:widow-orphan;
|
|
184
183
|
mso-outline-level:1;
|
|
185
184
|
tab-stops:20.15pt;
|
|
186
|
-
font-size:
|
|
185
|
+
font-size:12.0pt;
|
|
187
186
|
mso-bidi-font-size:11.0pt;
|
|
188
187
|
font-family:$headerfont;
|
|
188
|
+
color:#0E1A85;
|
|
189
189
|
mso-fareast-font-family:$headerfont;
|
|
190
190
|
mso-bidi-font-family:$headerfont;
|
|
191
191
|
mso-ansi-language:EN-GB;
|
|
192
|
-
font-weight:bold;
|
|
193
192
|
mso-bidi-font-weight:normal;}
|
|
194
193
|
p.Definition, li.Definition, div.Definition
|
|
195
194
|
{mso-style-name:Definition;
|
|
@@ -203,7 +202,7 @@ p.Definition, li.Definition, div.Definition
|
|
|
203
202
|
line-height:12.0pt;
|
|
204
203
|
mso-pagination:widow-orphan;
|
|
205
204
|
tab-stops:20.15pt;
|
|
206
|
-
font-size:
|
|
205
|
+
font-size:12.0pt;
|
|
207
206
|
font-family:$bodyfont;
|
|
208
207
|
mso-fareast-font-family:$bodyfont;
|
|
209
208
|
mso-bidi-font-family:$bodyfont;
|
|
@@ -224,13 +223,13 @@ p.ForewordTitle, li.ForewordTitle, div.ForewordTitle
|
|
|
224
223
|
mso-outline-level:1;
|
|
225
224
|
mso-hyphenate:none;
|
|
226
225
|
tab-stops:20.15pt;
|
|
227
|
-
font-size:
|
|
226
|
+
font-size:12.0pt;
|
|
228
227
|
mso-bidi-font-size:11.0pt;
|
|
229
228
|
font-family:$headerfont;
|
|
229
|
+
color:#0E1A85;
|
|
230
230
|
mso-fareast-font-family:$headerfont;
|
|
231
231
|
mso-bidi-font-family:$headerfont;
|
|
232
232
|
mso-ansi-language:EN-GB;
|
|
233
|
-
font-weight:bold;
|
|
234
233
|
mso-bidi-font-weight:normal;}
|
|
235
234
|
p.IntroTitle, li.IntroTitle, div.IntroTitle
|
|
236
235
|
{mso-style-name:"Intro Title";
|
|
@@ -248,13 +247,13 @@ p.IntroTitle, li.IntroTitle, div.IntroTitle
|
|
|
248
247
|
mso-outline-level:1;
|
|
249
248
|
mso-hyphenate:none;
|
|
250
249
|
tab-stops:20.15pt;
|
|
251
|
-
font-size:
|
|
250
|
+
font-size:12.0pt;
|
|
252
251
|
mso-bidi-font-size:11.0pt;
|
|
253
252
|
font-family:$headerfont;
|
|
253
|
+
color:#0E1A85;
|
|
254
254
|
mso-fareast-font-family:$headerfont;
|
|
255
255
|
mso-bidi-font-family:$headerfont;
|
|
256
256
|
mso-ansi-language:EN-GB;
|
|
257
|
-
font-weight:bold;
|
|
258
257
|
page-break-before:always;
|
|
259
258
|
mso-bidi-font-weight:normal;}
|
|
260
259
|
p.TitlePageSubhead, li.TitlePageSubhead, div.TitlePageSubhead {
|
|
@@ -271,13 +270,13 @@ p.TitlePageSubhead, li.TitlePageSubhead, div.TitlePageSubhead {
|
|
|
271
270
|
page-break-after:avoid;
|
|
272
271
|
mso-hyphenate:none;
|
|
273
272
|
tab-stops:20.15pt;
|
|
274
|
-
font-size:
|
|
273
|
+
font-size:12.0pt;
|
|
275
274
|
mso-bidi-font-size:11.0pt;
|
|
276
275
|
font-family:$headerfont;
|
|
276
|
+
color:#0E1A85;
|
|
277
277
|
mso-fareast-font-family:$headerfont;
|
|
278
278
|
mso-bidi-font-family:$headerfont;
|
|
279
279
|
mso-ansi-language:EN-GB;
|
|
280
|
-
font-weight:bold;
|
|
281
280
|
mso-bidi-font-weight:normal;
|
|
282
281
|
}
|
|
283
282
|
p.Terms, li.Terms, div.Terms
|
|
@@ -292,12 +291,11 @@ p.Terms, li.Terms, div.Terms
|
|
|
292
291
|
page-break-after:avoid;
|
|
293
292
|
mso-hyphenate:none;
|
|
294
293
|
tab-stops:20.15pt;
|
|
295
|
-
font-size:
|
|
294
|
+
font-size:12.0pt;
|
|
296
295
|
font-family:$headerfont;
|
|
297
296
|
mso-fareast-font-family:$headerfont;
|
|
298
297
|
mso-bidi-font-family:$headerfont;
|
|
299
298
|
mso-ansi-language:EN-GB;
|
|
300
|
-
font-weight:bold;
|
|
301
299
|
mso-bidi-font-weight:normal;}
|
|
302
300
|
p.AltTerms, li.AltTerms, div.AltTerms
|
|
303
301
|
{mso-style-name:"AltTerm\(s\)";
|
|
@@ -311,7 +309,7 @@ p.AltTerms, li.AltTerms, div.AltTerms
|
|
|
311
309
|
page-break-after:avoid;
|
|
312
310
|
mso-hyphenate:none;
|
|
313
311
|
tab-stops:20.15pt;
|
|
314
|
-
font-size:
|
|
312
|
+
font-size:12.0pt;
|
|
315
313
|
font-family:$bodyfont;
|
|
316
314
|
mso-fareast-font-family:$bodyfont;
|
|
317
315
|
mso-bidi-font-family:$bodyfont;
|
|
@@ -329,7 +327,7 @@ p.DeprecatedTerms, li.DeprecatedTerms, div.DeprecatedTerms
|
|
|
329
327
|
page-break-after:avoid;
|
|
330
328
|
mso-hyphenate:none;
|
|
331
329
|
tab-stops:20.15pt;
|
|
332
|
-
font-size:
|
|
330
|
+
font-size:12.0pt;
|
|
333
331
|
font-family:$bodyfont;
|
|
334
332
|
mso-fareast-font-family:$bodyfont;
|
|
335
333
|
mso-bidi-font-family:$bodyfont;
|
|
@@ -346,7 +344,7 @@ p.TermNum, li.TermNum, div.TermNum
|
|
|
346
344
|
mso-pagination:widow-orphan;
|
|
347
345
|
page-break-after:avoid;
|
|
348
346
|
tab-stops:20.15pt;
|
|
349
|
-
font-size:
|
|
347
|
+
font-size:12.0pt;
|
|
350
348
|
font-family:$headerfont;
|
|
351
349
|
mso-fareast-font-family:$headerfont;
|
|
352
350
|
mso-bidi-font-family:$headerfont;
|
|
@@ -369,13 +367,13 @@ p.zzContents, li.zzContents, div.zzContents
|
|
|
369
367
|
page-break-after:avoid;
|
|
370
368
|
mso-hyphenate:none;
|
|
371
369
|
tab-stops:20.15pt;
|
|
372
|
-
font-size:
|
|
370
|
+
font-size:12.0pt;
|
|
373
371
|
mso-bidi-font-size:11.0pt;
|
|
374
372
|
font-family:$headerfont;
|
|
373
|
+
color:#0E1A85;
|
|
375
374
|
mso-fareast-font-family:$headerfont;
|
|
376
375
|
mso-bidi-font-family:$headerfont;
|
|
377
376
|
mso-ansi-language:EN-GB;
|
|
378
|
-
font-weight:bold;
|
|
379
377
|
mso-bidi-font-weight:normal;}
|
|
380
378
|
p.zzCopyright, li.zzCopyright
|
|
381
379
|
{mso-style-name:zzCopyright;
|
|
@@ -392,7 +390,7 @@ p.zzCopyright, li.zzCopyright
|
|
|
392
390
|
tab-stops:20.15pt 25.7pt 481.15pt;
|
|
393
391
|
padding:0cm;
|
|
394
392
|
mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt;
|
|
395
|
-
font-size:
|
|
393
|
+
font-size:12.0pt;
|
|
396
394
|
font-family:$bodyfont;
|
|
397
395
|
mso-fareast-font-family:$bodyfont;
|
|
398
396
|
mso-bidi-font-family:$bodyfont;
|
|
@@ -416,7 +414,7 @@ p.zzCopyright_address
|
|
|
416
414
|
text-autospace:none;
|
|
417
415
|
padding-left:20pt;
|
|
418
416
|
mso-padding-alt-left:20pt;
|
|
419
|
-
font-size:
|
|
417
|
+
font-size:12.0pt;
|
|
420
418
|
text-align:left;
|
|
421
419
|
mso-bidi-font-size:11.0pt;}
|
|
422
420
|
p.zzSTDTitle, li.zzSTDTitle, div.zzSTDTitle
|
|
@@ -439,7 +437,6 @@ p.zzSTDTitle, li.zzSTDTitle, div.zzSTDTitle
|
|
|
439
437
|
mso-fareast-font-family:$headerfont;
|
|
440
438
|
mso-bidi-font-family:$headerfont;
|
|
441
439
|
mso-ansi-language:EN-GB;
|
|
442
|
-
font-weight:bold;
|
|
443
440
|
mso-bidi-font-weight:normal;}
|
|
444
441
|
p.zzSTDTitle1, li.zzSTDTitle1, div.zzSTDTitle1
|
|
445
442
|
{mso-style-name:zzSTDTitle;
|
|
@@ -473,7 +470,7 @@ p.Quote, li.Quote, div.Quote
|
|
|
473
470
|
line-height:12.0pt;
|
|
474
471
|
mso-pagination:widow-orphan;
|
|
475
472
|
tab-stops:20.15pt;
|
|
476
|
-
font-size:
|
|
473
|
+
font-size:12.0pt;
|
|
477
474
|
font-family:$bodyfont;
|
|
478
475
|
mso-fareast-font-family:$bodyfont;
|
|
479
476
|
mso-bidi-font-family:$bodyfont;
|
|
@@ -488,7 +485,7 @@ p.QuoteAttribution
|
|
|
488
485
|
line-height:12.0pt;
|
|
489
486
|
mso-pagination:widow-orphan;
|
|
490
487
|
tab-stops:20.15pt;
|
|
491
|
-
font-size:
|
|
488
|
+
font-size:12.0pt;
|
|
492
489
|
font-family:$bodyfont;
|
|
493
490
|
mso-fareast-font-family:$bodyfont;
|
|
494
491
|
mso-bidi-font-family:$bodyfont;
|
|
@@ -531,7 +528,7 @@ p.Code, li.Code, div.Code
|
|
|
531
528
|
line-height:10.0pt;
|
|
532
529
|
mso-pagination:widow-orphan;
|
|
533
530
|
tab-stops:20.15pt;
|
|
534
|
-
font-size:
|
|
531
|
+
font-size:10.0pt;
|
|
535
532
|
mso-bidi-font-size:11.0pt;
|
|
536
533
|
font-family:$monospacefont;
|
|
537
534
|
mso-fareast-font-family:Calibri;
|
|
@@ -548,7 +545,7 @@ p.Formula, li.Formula, div.Formula
|
|
|
548
545
|
line-height:12.0pt;
|
|
549
546
|
mso-pagination:widow-orphan;
|
|
550
547
|
tab-stops:right 487.45pt;
|
|
551
|
-
font-size:
|
|
548
|
+
font-size:12.0pt;
|
|
552
549
|
font-family:$bodyfont;
|
|
553
550
|
mso-fareast-font-family:$bodyfont;
|
|
554
551
|
mso-bidi-font-family:$bodyfont;
|
|
@@ -558,9 +555,9 @@ p.Formula, li.Formula, div.Formula
|
|
|
558
555
|
}
|
|
559
556
|
@page WordSection1
|
|
560
557
|
{size:595.3pt 841.9pt;
|
|
561
|
-
margin:
|
|
562
|
-
mso-header-margin:
|
|
563
|
-
mso-footer-margin:
|
|
558
|
+
margin:85.65pt 53.85pt 57.4pt 53.85pt;
|
|
559
|
+
mso-header-margin:35.45pt;
|
|
560
|
+
mso-footer-margin:61.0pt;
|
|
564
561
|
mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh1;
|
|
565
562
|
mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h1;
|
|
566
563
|
mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef1;
|
|
@@ -569,9 +566,9 @@ div.WordSection1
|
|
|
569
566
|
{page:WordSection1;}
|
|
570
567
|
@page WordSection2
|
|
571
568
|
{size:595.3pt 841.9pt;
|
|
572
|
-
margin:
|
|
573
|
-
mso-header-margin:
|
|
574
|
-
mso-footer-margin:
|
|
569
|
+
margin:79.8pt 53.85pt 1.0cm 53.85pt;
|
|
570
|
+
mso-header-margin:35.45pt;
|
|
571
|
+
mso-footer-margin:49.3pt;
|
|
575
572
|
mso-page-numbers:roman-lower;
|
|
576
573
|
mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2;
|
|
577
574
|
mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
|
|
@@ -580,9 +577,9 @@ div.WordSection1
|
|
|
580
577
|
mso-paper-source:0;}
|
|
581
578
|
@page WordSection2L
|
|
582
579
|
{size:841.9pt 595.3pt;
|
|
583
|
-
|
|
584
|
-
|
|
585
|
-
|
|
580
|
+
margin:79.8pt 53.85pt 1.0cm 53.85pt;
|
|
581
|
+
mso-header-margin:35.45pt;
|
|
582
|
+
mso-footer-margin:49.3pt;
|
|
586
583
|
mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2l;
|
|
587
584
|
mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2l;
|
|
588
585
|
mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef2l;
|
|
@@ -590,9 +587,9 @@ div.WordSection1
|
|
|
590
587
|
mso-paper-source:0;}
|
|
591
588
|
@page WordSection2P
|
|
592
589
|
{size:595.3pt 841.9pt;
|
|
593
|
-
|
|
594
|
-
|
|
595
|
-
|
|
590
|
+
margin:79.8pt 53.85pt 1.0cm 53.85pt;
|
|
591
|
+
mso-header-margin:35.45pt;
|
|
592
|
+
mso-footer-margin:49.3pt;
|
|
596
593
|
mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2;
|
|
597
594
|
mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
|
|
598
595
|
mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef2;
|
|
@@ -602,9 +599,9 @@ div.WordSection2
|
|
|
602
599
|
{page:WordSection2;}
|
|
603
600
|
@page WordSection3
|
|
604
601
|
{size:595.3pt 841.9pt;
|
|
605
|
-
|
|
606
|
-
mso-header-margin:
|
|
607
|
-
mso-footer-margin:
|
|
602
|
+
margin:59.2pt 53.85pt 70.8pt 53.85pt;
|
|
603
|
+
mso-header-margin:35.45pt;
|
|
604
|
+
mso-footer-margin:54.7pt;
|
|
608
605
|
mso-page-numbers:1;
|
|
609
606
|
mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2;
|
|
610
607
|
mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
|
|
@@ -613,9 +610,9 @@ div.WordSection2
|
|
|
613
610
|
mso-paper-source:0;}
|
|
614
611
|
@page WordSection3L
|
|
615
612
|
{size:841.9pt 595.3pt;
|
|
616
|
-
margin:
|
|
617
|
-
|
|
618
|
-
|
|
613
|
+
margin:59.2pt 53.85pt 70.8pt 53.85pt;
|
|
614
|
+
mso-header-margin:35.45pt;
|
|
615
|
+
mso-footer-margin:54.7pt;
|
|
619
616
|
mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2l;
|
|
620
617
|
mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2l;
|
|
621
618
|
mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef3l;
|
|
@@ -623,9 +620,9 @@ div.WordSection2
|
|
|
623
620
|
mso-paper-source:0;}
|
|
624
621
|
@page WordSection3P
|
|
625
622
|
{size:595.3pt 841.9pt;
|
|
626
|
-
margin:
|
|
627
|
-
|
|
628
|
-
|
|
623
|
+
margin:59.2pt 53.85pt 70.8pt 53.85pt;
|
|
624
|
+
mso-header-margin:35.45pt;
|
|
625
|
+
mso-footer-margin:54.7pt;
|
|
629
626
|
mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2;
|
|
630
627
|
mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
|
|
631
628
|
mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef3;
|
|
@@ -651,7 +648,7 @@ table.MsoISOTable
|
|
|
651
648
|
mso-yfti-tbllook:480;
|
|
652
649
|
mso-border-insideh:.75pt solid windowtext;
|
|
653
650
|
mso-border-insidev:.75pt solid windowtext;
|
|
654
|
-
font-size:
|
|
651
|
+
font-size:12.0pt;
|
|
655
652
|
font-family:$bodyfont;}
|
|
656
653
|
table.MsoISOTable th
|
|
657
654
|
{border:solid windowtext 1pt;
|
|
@@ -662,7 +659,7 @@ table.MsoISOTable td
|
|
|
662
659
|
mso-border-alt:solid windowtext 1pt;
|
|
663
660
|
padding:0cm 2.85pt 0cm 2.85pt;}
|
|
664
661
|
table.MsoISOTable p
|
|
665
|
-
{font-size:
|
|
662
|
+
{font-size:12.0pt; }
|
|
666
663
|
table.MsoTableGrid
|
|
667
664
|
{mso-style-name:"Table Grid";
|
|
668
665
|
mso-tstyle-rowband-size:0;
|
|
@@ -677,7 +674,7 @@ table.MsoTableGrid
|
|
|
677
674
|
mso-para-margin:0cm;
|
|
678
675
|
mso-para-margin-bottom:.0001pt;
|
|
679
676
|
mso-pagination:widow-orphan;
|
|
680
|
-
font-size:
|
|
677
|
+
font-size:12.0pt;
|
|
681
678
|
font-family:$bodyfont;}
|
|
682
679
|
div.formula
|
|
683
680
|
{tab-stops:right 487.45pt;}
|
|
@@ -699,12 +696,12 @@ div.coverpage_warning
|
|
|
699
696
|
border:solid windowtext 1.0pt #485094;
|
|
700
697
|
mso-border-alt:solid windowtext .5pt;
|
|
701
698
|
padding:1.0pt 4.0pt 1.0pt 4.0pt #485094;
|
|
702
|
-
font-size:
|
|
699
|
+
font-size:12.0pt;
|
|
703
700
|
margin-left:4.25pt;
|
|
704
701
|
margin-right:4.25pt}
|
|
705
702
|
.coverpage_warning
|
|
706
703
|
{color:#485094;
|
|
707
|
-
font-size:
|
|
704
|
+
font-size:12.0pt;}
|
|
708
705
|
|
|
709
706
|
a.TableFootnoteRef, span.TableFootnoteRef
|
|
710
707
|
{mso-style-priority:99;
|
|
@@ -712,7 +709,7 @@ div.coverpage_warning
|
|
|
712
709
|
vertical-align:super;}
|
|
713
710
|
|
|
714
711
|
aside {
|
|
715
|
-
font-size:
|
|
712
|
+
font-size:12.0pt;
|
|
716
713
|
}
|
|
717
714
|
|
|
718
715
|
.example-title {
|
|
@@ -734,24 +731,24 @@ div.example {
|
|
|
734
731
|
|
|
735
732
|
p.example, li.example, div.example, td.example {
|
|
736
733
|
mso-pagination:none;
|
|
737
|
-
font-size:
|
|
734
|
+
font-size:11.0pt;
|
|
738
735
|
font-family:$bodyfont;}
|
|
739
736
|
|
|
740
737
|
td.example p.MsoListParagraph {
|
|
741
|
-
font-size:
|
|
738
|
+
font-size: 11.0pt;
|
|
742
739
|
}
|
|
743
740
|
|
|
744
741
|
div.example p.MsoListParagraph {
|
|
745
|
-
font-size:
|
|
742
|
+
font-size: 11.0pt;
|
|
746
743
|
}
|
|
747
744
|
|
|
748
745
|
div.Note p.MsoListParagraph {
|
|
749
|
-
font-size:
|
|
746
|
+
font-size: 11.0pt;
|
|
750
747
|
}
|
|
751
748
|
|
|
752
749
|
span.note_label, span.example_label, td.example_label, td.note_label
|
|
753
750
|
{
|
|
754
|
-
font-size:
|
|
751
|
+
font-size: 11.0pt;
|
|
755
752
|
font-family:$bodyfont;
|
|
756
753
|
}
|
|
757
754
|
|