metanorma-iso 1.5.12 → 1.7.0
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 +18 -1
- data/lib/asciidoctor/iso/base.rb +5 -5
- data/lib/asciidoctor/iso/basicdoc.rng +52 -3
- data/lib/asciidoctor/iso/cleanup.rb +0 -6
- data/lib/asciidoctor/iso/front.rb +10 -5
- data/lib/asciidoctor/iso/isodoc.rng +51 -3
- data/lib/asciidoctor/iso/isostandard-amd.rng +8 -4
- data/lib/asciidoctor/iso/isostandard.rng +27 -10
- data/lib/asciidoctor/iso/validate.rb +78 -0
- data/lib/asciidoctor/iso/validate_section.rb +12 -9
- data/lib/isodoc/iso/base_convert.rb +2 -1
- data/lib/isodoc/iso/html/header.html +12 -12
- data/lib/isodoc/iso/html/html_iso_intro.html +1 -1
- data/lib/isodoc/iso/html/html_iso_titlepage.html +1 -1
- data/lib/isodoc/iso/html/htmlstyle.css +1 -1
- data/lib/isodoc/iso/html/htmlstyle.scss +1 -1
- data/lib/isodoc/iso/html/isodoc.css +42 -42
- data/lib/isodoc/iso/html/isodoc.scss +42 -42
- data/lib/isodoc/iso/html/style-human.css +9 -9
- data/lib/isodoc/iso/html/style-human.scss +7 -7
- data/lib/isodoc/iso/html/style-iso.css +7 -7
- data/lib/isodoc/iso/html/style-iso.scss +5 -5
- data/lib/isodoc/iso/html/word_iso_intro.html +1 -1
- data/lib/isodoc/iso/html/word_iso_titlepage.html +1 -1
- data/lib/isodoc/iso/html/wordstyle.css +67 -67
- data/lib/isodoc/iso/html/wordstyle.scss +67 -67
- data/lib/isodoc/iso/html_convert.rb +6 -2
- data/lib/isodoc/iso/i18n-en.yaml +2 -0
- data/lib/isodoc/iso/i18n-fr.yaml +1 -1
- data/lib/isodoc/iso/i18n-zh-Hans.yaml +1 -1
- data/lib/isodoc/iso/iso.amendment.xsl +276 -59
- data/lib/isodoc/iso/iso.international-standard.xsl +276 -59
- data/lib/isodoc/iso/metadata.rb +1 -0
- data/lib/isodoc/iso/sections.rb +1 -1
- data/lib/isodoc/iso/word_convert.rb +6 -2
- data/lib/isodoc/iso/xref.rb +34 -8
- data/lib/metanorma/iso/processor.rb +11 -9
- data/lib/metanorma/iso/version.rb +1 -1
- data/metanorma-iso.gemspec +2 -2
- data/spec/asciidoctor-iso/amd_spec.rb +14 -14
- data/spec/asciidoctor-iso/base_spec.rb +22 -20
- data/spec/asciidoctor-iso/blocks_spec.rb +22 -22
- data/spec/asciidoctor-iso/cleanup_spec.rb +32 -26
- data/spec/asciidoctor-iso/inline_spec.rb +7 -7
- data/spec/asciidoctor-iso/lists_spec.rb +9 -9
- data/spec/asciidoctor-iso/refs_spec.rb +5 -5
- data/spec/asciidoctor-iso/section_spec.rb +12 -7
- data/spec/asciidoctor-iso/table_spec.rb +4 -4
- data/spec/asciidoctor-iso/validate_spec.rb +455 -87
- data/spec/isodoc/amd_spec.rb +13 -13
- data/spec/isodoc/iso_spec.rb +2 -2
- data/spec/isodoc/metadata_spec.rb +2 -0
- data/spec/isodoc/section_spec.rb +20 -0
- data/spec/isodoc/xref_spec.rb +12 -0
- metadata +6 -12
- data/.github/workflows/macos.yml +0 -49
- data/.github/workflows/ubuntu.yml +0 -53
- data/.github/workflows/windows.yml +0 -50
- data/lib/asciidoctor/iso/macros.rb +0 -21
- data/lib/asciidoctor/iso/term_lookup_cleanup.rb +0 -86
- data/spec/asciidoctor-iso/macros_spec.rb +0 -310
@@ -4,11 +4,14 @@ module Asciidoctor
|
|
4
4
|
module ISO
|
5
5
|
class Converter < Standoc::Converter
|
6
6
|
def section_validate(doc)
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
7
|
+
doctype = doc&.at("//bibdata/ext/doctype")&.text
|
8
|
+
unless %w(amendment technical-corrigendum).include? doctype
|
9
|
+
foreword_validate(doc.root)
|
10
|
+
normref_validate(doc.root)
|
11
|
+
symbols_validate(doc.root)
|
12
|
+
sections_presence_validate(doc.root)
|
13
|
+
sections_sequence_validate(doc.root)
|
14
|
+
end
|
12
15
|
section_style(doc.root)
|
13
16
|
subclause_validate(doc.root)
|
14
17
|
super
|
@@ -111,13 +114,13 @@ module Asciidoctor
|
|
111
114
|
end
|
112
115
|
n&.at("./self::clause") ||
|
113
116
|
@log.add("Style", nil, "Document must contain clause after "\
|
114
|
-
|
117
|
+
"Terms and Definitions")
|
115
118
|
n&.at("./self::clause[@type = 'scope']") &&
|
116
119
|
@log.add("Style", nil, "Scope must occur before Terms and Definitions")
|
117
120
|
n = names.shift
|
118
121
|
while n&.name == "clause"
|
119
122
|
n&.at("./self::clause[@type = 'scope']")
|
120
|
-
|
123
|
+
@log.add("Style", nil, "Scope must occur before Terms and Definitions")
|
121
124
|
n = names.shift
|
122
125
|
end
|
123
126
|
unless %w(annex references).include? n&.name
|
@@ -127,12 +130,12 @@ module Asciidoctor
|
|
127
130
|
n = names.shift
|
128
131
|
if n.nil?
|
129
132
|
@log.add("Style", nil, "Document must include (references) "\
|
130
|
-
|
133
|
+
"Normative References")
|
131
134
|
end
|
132
135
|
end
|
133
136
|
n&.at("./self::references[@normative = 'true']") ||
|
134
137
|
@log.add("Style", nil, "Document must include (references) "\
|
135
|
-
|
138
|
+
"Normative References")
|
136
139
|
n = names&.shift
|
137
140
|
n&.at("./self::references[@normative = 'false']") ||
|
138
141
|
@log.add("Style", nil, "Final section must be (references) Bibliography")
|
@@ -74,7 +74,7 @@ mso-line-height-rule:exactly'><span lang=EN-GB>{{ docnumber_reference }}{{ draft
|
|
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
|
-
{{ agency }} {{ docyear }} – {{ all_rights_reserved }}</span><span lang=EN-GB
|
77
|
+
{{ agency }} {{ docyear }} – {{ labels["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,7 +93,7 @@ style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
|
|
93
93
|
mso-bidi-font-size:11.0pt'><span style='mso-element:field-end'></span></span></b><![endif]--><span
|
94
94
|
lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
|
95
95
|
style='mso-tab-count:1'> </span>©
|
96
|
-
{{ agency }} {{ docyear }} – {{ all_rights_reserved }}<o:p></o:p></span></p>
|
96
|
+
{{ agency }} {{ docyear }} – {{ labels["all_rights_reserved"] }}<o:p></o:p></span></p>
|
97
97
|
|
98
98
|
</div>
|
99
99
|
|
@@ -129,7 +129,7 @@ lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
|
|
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
|
-
{{ agency }} {{ docyear }} – {{ all_rights_reserved }}<o:p></o:p></span></p>
|
132
|
+
{{ agency }} {{ docyear }} – {{ labels["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'><span
|
|
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
|
-
{{ agency }} {{ docyear }} – {{ all_rights_reserved }}<o:p></o:p></span></p>
|
147
|
+
{{ agency }} {{ docyear }} – {{ labels["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'>© {{ agency }} {{ docyear }} – {{ all_rights_reserved }}<span style='mso-tab-count:1'> </span></span><!--[if supportFields]><span
|
152
|
+
style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© {{ agency }} {{ docyear }} – {{ labels["all_rights_reserved"] }}<span style='mso-tab-count:1'> </span></span><!--[if supportFields]><span
|
153
153
|
lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
|
154
154
|
style='mso-element:field-begin'></span> PAGE<span style='mso-spacerun:yes'>
|
155
155
|
</span>\* MERGEFORMAT <span style='mso-element:field-separator'></span></span><![endif]--><span
|
@@ -162,7 +162,7 @@ style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><o:p></o:p></span></p>
|
|
162
162
|
|
163
163
|
<div style='mso-element:footer' id=f2l>
|
164
164
|
<p class=MsoFooterLandscape style='line-height:12.0pt'><span lang=EN-GB
|
165
|
-
style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© {{ agency }} {{ docyear }} – {{ all_rights_reserved }}<span style='mso-tab-count:1'> </span></span><!--[if supportFields]><span
|
165
|
+
style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© {{ agency }} {{ docyear }} – {{ labels["all_rights_reserved"] }}<span style='mso-tab-count:1'> </span></span><!--[if supportFields]><span
|
166
166
|
lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
|
167
167
|
style='mso-element:field-begin'></span> PAGE<span style='mso-spacerun:yes'>
|
168
168
|
</span>\* MERGEFORMAT <span style='mso-element:field-separator'></span></span><![endif]--><span
|
@@ -186,7 +186,7 @@ style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
|
|
186
186
|
mso-bidi-font-size:11.0pt'><span style='mso-element:field-end'></span></span></b><![endif]--><span
|
187
187
|
lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
|
188
188
|
style='mso-tab-count:1'> </span>©
|
189
|
-
{{ agency }} {{ docyear }} – {{ all_rights_reserved }}<o:p></o:p></span></p>
|
189
|
+
{{ agency }} {{ docyear }} – {{ labels["all_rights_reserved"] }}<o:p></o:p></span></p>
|
190
190
|
</div>
|
191
191
|
|
192
192
|
<div style='mso-element:footer' id=ef3l>
|
@@ -202,12 +202,12 @@ style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
|
|
202
202
|
mso-bidi-font-size:11.0pt'><span style='mso-element:field-end'></span></span></b><![endif]--><span
|
203
203
|
lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
|
204
204
|
style='mso-tab-count:1'> </span>©
|
205
|
-
{{ agency }} {{ docyear }} – {{ all_rights_reserved }}<o:p></o:p></span></p>
|
205
|
+
{{ agency }} {{ docyear }} – {{ labels["all_rights_reserved"] }}<o:p></o:p></span></p>
|
206
206
|
</div>
|
207
207
|
|
208
208
|
<div style='mso-element:footer' id=f3>
|
209
209
|
<p class=MsoFooter style='line-height:12.0pt'><span lang=EN-GB
|
210
|
-
style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© {{ agency }} {{ docyear }} – {{ all_rights_reserved }}<span style='mso-tab-count:1'> </span></span><!--[if supportFields]><b
|
210
|
+
style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© {{ agency }} {{ docyear }} – {{ labels["all_rights_reserved"] }}<span style='mso-tab-count:1'> </span></span><!--[if supportFields]><b
|
211
211
|
style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
|
212
212
|
mso-bidi-font-size:11.0pt'><span style='mso-element:field-begin'></span>
|
213
213
|
PAGE<span style='mso-spacerun:yes'> </span>\* MERGEFORMAT <span
|
@@ -221,7 +221,7 @@ lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><o:p></o:p></span>
|
|
221
221
|
|
222
222
|
<div style='mso-element:footer' id=f3l>
|
223
223
|
<p class=MsoFooterLandscape style='line-height:12.0pt'><span lang=EN-GB
|
224
|
-
style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© {{ agency }} {{ docyear }} – {{ all_rights_reserved }}<span style='mso-tab-count:1'> </span></span><!--[if supportFields]><b
|
224
|
+
style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© {{ agency }} {{ docyear }} – {{ labels["all_rights_reserved"] }}<span style='mso-tab-count:1'> </span></span><!--[if supportFields]><b
|
225
225
|
style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
|
226
226
|
mso-bidi-font-size:11.0pt'><span style='mso-element:field-begin'></span>
|
227
227
|
PAGE<span style='mso-spacerun:yes'> </span>\* MERGEFORMAT <span
|
@@ -242,10 +242,10 @@ lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><o:p></o:p></span>
|
|
242
242
|
{% endif %}
|
243
243
|
|
244
244
|
<p class=MsoFooter style='margin-top:0cm'><span lang=EN-AU style='font-size:
|
245
|
-
10.0pt;mso-ansi-language:EN-AU'>{{ price_based_on | replace: "%", "<span style='mso-element:field-begin'></span><span style='mso-spacerun:yes'> </span>NUMPAGES<span style='mso-spacerun:yes'> </span>\* MERGEFORMAT <span style='mso-element:field-separator'></span><span style='mso-no-proof:yes'>26</span><span style='mso-element:field-end'></span>" }}</span></p>
|
245
|
+
10.0pt;mso-ansi-language:EN-AU'>{{ labels["price_based_on"] | replace: "%", "<span style='mso-element:field-begin'></span><span style='mso-spacerun:yes'> </span>NUMPAGES<span style='mso-spacerun:yes'> </span>\* MERGEFORMAT <span style='mso-element:field-separator'></span><span style='mso-no-proof:yes'>26</span><span style='mso-element:field-end'></span>" }}</span></p>
|
246
246
|
|
247
247
|
<p class=MsoFooter><span lang=EN-AU style='font-size:10.0pt;'>©
|
248
|
-
{{ agency }} {{ docyear }} – {{ all_rights_reserved }}<o:p></o:p></span></p>
|
248
|
+
{{ agency }} {{ docyear }} – {{ labels["all_rights_reserved"] }}<o:p></o:p></span></p>
|
249
249
|
|
250
250
|
</div>
|
251
251
|
|
@@ -10,7 +10,7 @@ p.MsoCommentText, li.MsoCommentText, div.MsoCommentText {
|
|
10
10
|
line-height: 12.0pt;
|
11
11
|
mso-pagination: widow-orphan;
|
12
12
|
tab-stops: 20.15pt;
|
13
|
-
font-size:
|
13
|
+
font-size: {{normalfontsize}};
|
14
14
|
font-family: {{bodyfont}};
|
15
15
|
mso-fareast-font-family: Calibri;
|
16
16
|
mso-bidi-font-family: "Times New Roman";
|
@@ -10,7 +10,7 @@ p.MsoCommentText, li.MsoCommentText, div.MsoCommentText
|
|
10
10
|
line-height:12.0pt;
|
11
11
|
mso-pagination:widow-orphan;
|
12
12
|
tab-stops:20.15pt;
|
13
|
-
font-size
|
13
|
+
font-size:$normalfontsize;
|
14
14
|
font-family:$bodyfont;
|
15
15
|
mso-fareast-font-family:Calibri;
|
16
16
|
mso-bidi-font-family:"Times New Roman";
|
@@ -10,7 +10,7 @@ p.Sourcecode, li.Sourcecode, div.Sourcecode, pre.Sourcecode {
|
|
10
10
|
line-height: 12.0pt;
|
11
11
|
mso-pagination: widow-orphan;
|
12
12
|
tab-stops: 20.15pt;
|
13
|
-
font-size:
|
13
|
+
font-size: {{monospacefontsize}};
|
14
14
|
font-family: {{monospacefont}};
|
15
15
|
mso-fareast-font-family: "SimSun",serif;
|
16
16
|
mso-bidi-font-family: "Courier New";
|
@@ -28,7 +28,7 @@ p.pseudocode, li.pseudocode, div.pseudocode {
|
|
28
28
|
line-height: 12.0pt;
|
29
29
|
mso-pagination: widow-orphan;
|
30
30
|
tab-stops: 20.15pt;
|
31
|
-
font-size:
|
31
|
+
font-size: {{smallerfontsize}};
|
32
32
|
font-family: {{bodyfont}};
|
33
33
|
mso-fareast-font-family: "SimSun",serif;
|
34
34
|
mso-bidi-font-family: "Courier New";
|
@@ -46,7 +46,7 @@ p.Biblio, li.Biblio, div.Biblio {
|
|
46
46
|
tab-stops: 33.15pt;
|
47
47
|
line-height: 12.0pt;
|
48
48
|
mso-pagination: widow-orphan;
|
49
|
-
font-size:
|
49
|
+
font-size: {{normalfontsize}};
|
50
50
|
font-family: {{bodyfont}};
|
51
51
|
mso-fareast-font-family: "SimSun",serif;
|
52
52
|
mso-bidi-font-family: {{bodyfont}};
|
@@ -64,7 +64,7 @@ p.NormRef, li.NormRef, div.NormRef {
|
|
64
64
|
tab-stops: 33.15pt;
|
65
65
|
line-height: 12.0pt;
|
66
66
|
mso-pagination: widow-orphan;
|
67
|
-
font-size:
|
67
|
+
font-size: {{normalfontsize}};
|
68
68
|
font-family: {{bodyfont}};
|
69
69
|
mso-fareast-font-family: "SimSun",serif;
|
70
70
|
mso-bidi-font-family: {{bodyfont}};
|
@@ -83,7 +83,7 @@ p.FigureTitle {
|
|
83
83
|
page-break-before: avoid;
|
84
84
|
mso-pagination: widow-orphan;
|
85
85
|
tab-stops: 20.15pt;
|
86
|
-
font-size:
|
86
|
+
font-size: {{normalfontsize}};
|
87
87
|
font-family: {{bodyfont}};
|
88
88
|
font-weight: bold;
|
89
89
|
mso-fareast-font-family: "SimSun",serif;
|
@@ -103,7 +103,7 @@ p.AdmonitionTitle, p.RecommendationTitle {
|
|
103
103
|
page-break-after: avoid;
|
104
104
|
mso-pagination: widow-orphan;
|
105
105
|
tab-stops: 20.15pt;
|
106
|
-
font-size:
|
106
|
+
font-size: {{normalfontsize}};
|
107
107
|
font-family: {{bodyfont}};
|
108
108
|
font-weight: bold;
|
109
109
|
mso-fareast-font-family: "SimSun",serif;
|
@@ -123,7 +123,7 @@ p.SourceTitle {
|
|
123
123
|
page-break-before: avoid;
|
124
124
|
mso-pagination: widow-orphan;
|
125
125
|
tab-stops: 20.15pt;
|
126
|
-
font-size:
|
126
|
+
font-size: {{normalfontsize}};
|
127
127
|
font-family: {{bodyfont}};
|
128
128
|
font-weight: bold;
|
129
129
|
mso-fareast-font-family: "SimSun",serif;
|
@@ -143,7 +143,7 @@ p.TableTitle {
|
|
143
143
|
line-height: 12.0pt;
|
144
144
|
mso-pagination: widow-orphan;
|
145
145
|
tab-stops: 20.15pt;
|
146
|
-
font-size:
|
146
|
+
font-size: {{normalfontsize}};
|
147
147
|
font-weight: bold;
|
148
148
|
font-family: {{bodyfont}};
|
149
149
|
mso-fareast-font-family: "SimSun",serif;
|
@@ -162,8 +162,8 @@ p.Note, div.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote
|
|
162
162
|
line-height: 12.0pt;
|
163
163
|
mso-pagination: widow-orphan;
|
164
164
|
tab-stops: 20.15pt;
|
165
|
-
font-size:
|
166
|
-
mso-bidi-font-size:
|
165
|
+
font-size: {{smallerfontsize}};
|
166
|
+
mso-bidi-font-size: {{normalfontsize}};
|
167
167
|
font-family: {{bodyfont}};
|
168
168
|
mso-fareast-font-family: "SimSun",serif;
|
169
169
|
mso-bidi-font-family: {{bodyfont}};
|
@@ -190,7 +190,7 @@ p.ANNEX, li.ANNEX, div.ANNEX {
|
|
190
190
|
mso-list: l0 level1 lfo12;
|
191
191
|
tab-stops: 20.15pt;
|
192
192
|
font-size: 14.0pt;
|
193
|
-
mso-bidi-font-size:
|
193
|
+
mso-bidi-font-size: {{normalfontsize}};
|
194
194
|
font-family: {{headerfont}};
|
195
195
|
mso-fareast-font-family: "SimHei",serif;
|
196
196
|
mso-bidi-font-family: {{headerfont}};
|
@@ -213,7 +213,7 @@ p.BiblioTitle, li.BiblioTitle, div.BiblioTitle {
|
|
213
213
|
mso-outline-level: 1;
|
214
214
|
tab-stops: 20.15pt;
|
215
215
|
font-size: 14.0pt;
|
216
|
-
mso-bidi-font-size:
|
216
|
+
mso-bidi-font-size: {{normalfontsize}};
|
217
217
|
font-family: {{headerfont}};
|
218
218
|
mso-fareast-font-family: "SimHei",serif;
|
219
219
|
mso-bidi-font-family: {{headerfont}};
|
@@ -233,7 +233,7 @@ p.Definition, li.Definition, div.Definition {
|
|
233
233
|
line-height: 12.0pt;
|
234
234
|
mso-pagination: widow-orphan;
|
235
235
|
tab-stops: 20.15pt;
|
236
|
-
font-size:
|
236
|
+
font-size: {{normalfontsize}};
|
237
237
|
font-family: {{bodyfont}};
|
238
238
|
mso-fareast-font-family: "SimSun",serif;
|
239
239
|
mso-bidi-font-family: {{bodyfont}};
|
@@ -256,7 +256,7 @@ p.ForewordTitle, li.ForewordTitle, div.ForewordTitle {
|
|
256
256
|
mso-hyphenate: none;
|
257
257
|
tab-stops: 20.15pt;
|
258
258
|
font-size: 14.0pt;
|
259
|
-
mso-bidi-font-size:
|
259
|
+
mso-bidi-font-size: {{normalfontsize}};
|
260
260
|
font-family: {{headerfont}};
|
261
261
|
mso-fareast-font-family: "SimHei",serif;
|
262
262
|
mso-bidi-font-family: {{headerfont}};
|
@@ -281,7 +281,7 @@ p.IntroTitle, li.IntroTitle, div.IntroTitle {
|
|
281
281
|
mso-hyphenate: none;
|
282
282
|
tab-stops: 20.15pt;
|
283
283
|
font-size: 14.0pt;
|
284
|
-
mso-bidi-font-size:
|
284
|
+
mso-bidi-font-size: {{normalfontsize}};
|
285
285
|
font-family: {{headerfont}};
|
286
286
|
mso-fareast-font-family: "SimHei",serif;
|
287
287
|
mso-bidi-font-family: {{headerfont}};
|
@@ -305,7 +305,7 @@ p.TitlePageSubhead, li.TitlePageSubhead, div.TitlePageSubhead {
|
|
305
305
|
mso-hyphenate: none;
|
306
306
|
tab-stops: 20.15pt;
|
307
307
|
font-size: 14.0pt;
|
308
|
-
mso-bidi-font-size:
|
308
|
+
mso-bidi-font-size: {{normalfontsize}};
|
309
309
|
font-family: {{headerfont}};
|
310
310
|
mso-fareast-font-family: "SimHei",serif;
|
311
311
|
mso-bidi-font-family: {{headerfont}};
|
@@ -325,7 +325,7 @@ p.Terms, li.Terms, div.Terms {
|
|
325
325
|
page-break-after: avoid;
|
326
326
|
mso-hyphenate: none;
|
327
327
|
tab-stops: 20.15pt;
|
328
|
-
font-size:
|
328
|
+
font-size: {{normalfontsize}};
|
329
329
|
font-family: {{headerfont}};
|
330
330
|
mso-fareast-font-family: "SimHei",serif;
|
331
331
|
mso-bidi-font-family: {{headerfont}};
|
@@ -345,7 +345,7 @@ p.AltTerms, li.AltTerms, div.AltTerms {
|
|
345
345
|
page-break-after: avoid;
|
346
346
|
mso-hyphenate: none;
|
347
347
|
tab-stops: 20.15pt;
|
348
|
-
font-size:
|
348
|
+
font-size: {{normalfontsize}};
|
349
349
|
font-family: {{bodyfont}};
|
350
350
|
mso-fareast-font-family: "SimSun",serif;
|
351
351
|
mso-bidi-font-family: {{bodyfont}};
|
@@ -364,7 +364,7 @@ p.DeprecatedTerms, li.DeprecatedTerms, div.DeprecatedTerms {
|
|
364
364
|
page-break-after: avoid;
|
365
365
|
mso-hyphenate: none;
|
366
366
|
tab-stops: 20.15pt;
|
367
|
-
font-size:
|
367
|
+
font-size: {{normalfontsize}};
|
368
368
|
font-family: {{bodyfont}};
|
369
369
|
mso-fareast-font-family: "SimSun",serif;
|
370
370
|
mso-bidi-font-family: {{bodyfont}};
|
@@ -382,7 +382,7 @@ p.TermNum, li.TermNum, div.TermNum {
|
|
382
382
|
mso-pagination: widow-orphan;
|
383
383
|
page-break-after: avoid;
|
384
384
|
tab-stops: 20.15pt;
|
385
|
-
font-size:
|
385
|
+
font-size: {{normalfontsize}};
|
386
386
|
font-family: {{headerfont}};
|
387
387
|
mso-fareast-font-family: "SimHei",serif;
|
388
388
|
mso-bidi-font-family: {{headerfont}};
|
@@ -407,7 +407,7 @@ p.zzContents, li.zzContents, div.zzContents {
|
|
407
407
|
mso-hyphenate: none;
|
408
408
|
tab-stops: 20.15pt;
|
409
409
|
font-size: 14.0pt;
|
410
|
-
mso-bidi-font-size:
|
410
|
+
mso-bidi-font-size: {{normalfontsize}};
|
411
411
|
font-family: {{headerfont}};
|
412
412
|
mso-fareast-font-family: "SimHei",serif;
|
413
413
|
mso-bidi-font-family: {{headerfont}};
|
@@ -502,7 +502,7 @@ p.zzSTDTitle, li.zzSTDTitle, div.zzSTDTitle {
|
|
502
502
|
mso-hyphenate: none;
|
503
503
|
tab-stops: 20.15pt;
|
504
504
|
font-size: 16.0pt;
|
505
|
-
mso-bidi-font-size:
|
505
|
+
mso-bidi-font-size: {{normalfontsize}};
|
506
506
|
font-family: {{headerfont}};
|
507
507
|
mso-fareast-font-family: "SimHei",serif;
|
508
508
|
mso-bidi-font-family: {{headerfont}};
|
@@ -525,7 +525,7 @@ p.zzSTDTitle1, li.zzSTDTitle1, div.zzSTDTitle1 {
|
|
525
525
|
mso-hyphenate: none;
|
526
526
|
tab-stops: 20.15pt;
|
527
527
|
font-size: 16.0pt;
|
528
|
-
mso-bidi-font-size:
|
528
|
+
mso-bidi-font-size: {{normalfontsize}};
|
529
529
|
font-family: {{headerfont}};
|
530
530
|
mso-fareast-font-family: "SimHei",serif;
|
531
531
|
mso-bidi-font-family: {{headerfont}};
|
@@ -548,7 +548,7 @@ p.zzSTDTitle2, li.zzSTDTitle2, div.zzSTDTitle2 {
|
|
548
548
|
mso-hyphenate: none;
|
549
549
|
tab-stops: 20.15pt;
|
550
550
|
font-size: 16.0pt;
|
551
|
-
mso-bidi-font-size:
|
551
|
+
mso-bidi-font-size: {{normalfontsize}};
|
552
552
|
font-family: {{headerfont}};
|
553
553
|
mso-fareast-font-family: "SimHei",serif;
|
554
554
|
mso-bidi-font-family: {{headerfont}};
|
@@ -565,7 +565,7 @@ p.Quote, li.Quote, div.Quote {
|
|
565
565
|
line-height: 12.0pt;
|
566
566
|
mso-pagination: widow-orphan;
|
567
567
|
tab-stops: 20.15pt;
|
568
|
-
font-size:
|
568
|
+
font-size: {{normalfontsize}};
|
569
569
|
font-family: {{bodyfont}};
|
570
570
|
mso-fareast-font-family: "SimSun",serif;
|
571
571
|
mso-bidi-font-family: {{bodyfont}};
|
@@ -602,8 +602,8 @@ p.Code, li.Code, div.Code {
|
|
602
602
|
line-height: 10.0pt;
|
603
603
|
mso-pagination: widow-orphan;
|
604
604
|
tab-stops: 20.15pt;
|
605
|
-
font-size:
|
606
|
-
mso-bidi-font-size:
|
605
|
+
font-size: {{monospacefontsize}};
|
606
|
+
mso-bidi-font-size: {{normalfontsize}};
|
607
607
|
font-family: {{monospacefont}};
|
608
608
|
mso-fareast-font-family: "SimSun",serif;
|
609
609
|
mso-bidi-font-family: "Cambria";
|
@@ -615,12 +615,12 @@ p.Formula, li.Formula, div.Formula {
|
|
615
615
|
mso-style-unhide: no;
|
616
616
|
margin-top: 0cm;
|
617
617
|
margin-right: 0cm;
|
618
|
-
margin-bottom:
|
618
|
+
margin-bottom: {{normalfontsize}};
|
619
619
|
margin-left: 20.15pt;
|
620
620
|
line-height: 12.0pt;
|
621
621
|
mso-pagination: widow-orphan;
|
622
622
|
tab-stops: right 487.45pt;
|
623
|
-
font-size:
|
623
|
+
font-size: {{normalfontsize}};
|
624
624
|
font-family: {{bodyfont}};
|
625
625
|
mso-fareast-font-family: "SimSun",serif;
|
626
626
|
mso-bidi-font-family: {{bodyfont}};
|
@@ -629,7 +629,7 @@ p.Formula, li.Formula, div.Formula {
|
|
629
629
|
table.dl {
|
630
630
|
margin-top: 0cm;
|
631
631
|
margin-right: 0cm;
|
632
|
-
margin-bottom:
|
632
|
+
margin-bottom: {{normalfontsize}};
|
633
633
|
margin-left: 0cm; }
|
634
634
|
|
635
635
|
div.figdl {
|
@@ -647,7 +647,7 @@ table.figdl {
|
|
647
647
|
margin-right: 0cm; }
|
648
648
|
|
649
649
|
div.figdl p, table.figdl p {
|
650
|
-
font-size:
|
650
|
+
font-size: {{smallerfontsize}}; }
|
651
651
|
|
652
652
|
table.formula_dl {
|
653
653
|
margin-left: 20.15pt; }
|
@@ -670,7 +670,7 @@ table.MsoISOTable, table.MsoISOTableBig {
|
|
670
670
|
mso-yfti-tbllook: 480;
|
671
671
|
mso-border-insideh: .75pt solid windowtext;
|
672
672
|
mso-border-insidev: .75pt solid windowtext;
|
673
|
-
font-size:
|
673
|
+
font-size: {{smallerfontsize}};
|
674
674
|
font-family: {{bodyfont}}; }
|
675
675
|
|
676
676
|
table.MsoISOTable th, table.MsoISOTableBig th {
|
@@ -684,7 +684,7 @@ table.MsoISOTable td, table.MsoISOTableBig td {
|
|
684
684
|
padding: 0cm 2.85pt 0cm 2.85pt; }
|
685
685
|
|
686
686
|
table.MsoISOTable p, table.MsoISOTableBig p {
|
687
|
-
font-size:
|
687
|
+
font-size: {{smallerfontsize}}; }
|
688
688
|
|
689
689
|
table.MsoTableGrid {
|
690
690
|
mso-style-name: "Table Grid";
|
@@ -700,7 +700,7 @@ table.MsoTableGrid {
|
|
700
700
|
mso-para-margin: 0cm;
|
701
701
|
mso-para-margin-bottom: .0001pt;
|
702
702
|
mso-pagination: widow-orphan;
|
703
|
-
font-size:
|
703
|
+
font-size: {{smallerfontsize}};
|
704
704
|
font-family: {{bodyfont}}; }
|
705
705
|
|
706
706
|
div.formula {
|
@@ -820,7 +820,7 @@ a.TableFootnoteRef, span.TableFootnoteRef {
|
|
820
820
|
vertical-align: super; }
|
821
821
|
|
822
822
|
aside {
|
823
|
-
font-size:
|
823
|
+
font-size: {{footnotefontsize}}; }
|
824
824
|
|
825
825
|
/*
|
826
826
|
div.example {
|
@@ -841,7 +841,7 @@ div.example {
|
|
841
841
|
p.example, li.example, div.example, td.example {
|
842
842
|
mso-pagination: none;
|
843
843
|
tab-stops: 70.9pt;
|
844
|
-
font-size:
|
844
|
+
font-size: {{smallerfontsize}};
|
845
845
|
font-family: {{bodyfont}}; }
|
846
846
|
|
847
847
|
div.example, td.example {
|
@@ -849,26 +849,26 @@ div.example, td.example {
|
|
849
849
|
margin-bottom: 12.0pt; }
|
850
850
|
|
851
851
|
td.example p.MsoListParagraph {
|
852
|
-
font-size:
|
852
|
+
font-size: {{smallerfontsize}}; }
|
853
853
|
|
854
854
|
div.example p.MsoListParagraph {
|
855
|
-
font-size:
|
855
|
+
font-size: {{smallerfontsize}}; }
|
856
856
|
|
857
857
|
div.Note p.MsoListParagraph {
|
858
|
-
font-size:
|
858
|
+
font-size: {{smallerfontsize}};
|
859
859
|
margin-left: 1.0cm; }
|
860
860
|
|
861
861
|
div.Note span.stem {
|
862
|
-
font-size:
|
862
|
+
font-size: {{smallerfontsize}}; }
|
863
863
|
|
864
864
|
div.Note p.Sourcecode, div.Note pre.Sourcecode {
|
865
865
|
font-size: 8.0pt;
|
866
866
|
margin-left: 1.0cm; }
|
867
867
|
|
868
868
|
div.Note table.dl {
|
869
|
-
font-size:
|
869
|
+
font-size: {{smallerfontsize}};
|
870
870
|
margin-left: 1.0cm; }
|
871
871
|
|
872
872
|
span.note_label, span.example_label, td.example_label, td.note_label {
|
873
|
-
font-size:
|
873
|
+
font-size: {{smallerfontsize}};
|
874
874
|
font-family: {{bodyfont}}; }
|