metanorma-iso 1.5.11 → 1.6.1

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 (62) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/rake.yml +83 -0
  3. data/README.adoc +5 -6
  4. data/lib/asciidoctor/iso/base.rb +5 -5
  5. data/lib/asciidoctor/iso/basicdoc.rng +50 -3
  6. data/lib/asciidoctor/iso/boilerplate-fr.xml +2 -2
  7. data/lib/asciidoctor/iso/cleanup.rb +33 -6
  8. data/lib/asciidoctor/iso/front.rb +5 -0
  9. data/lib/asciidoctor/iso/isodoc.rng +61 -3
  10. data/lib/asciidoctor/iso/isostandard-amd.rng +8 -4
  11. data/lib/asciidoctor/iso/isostandard.rng +27 -10
  12. data/lib/asciidoctor/iso/validate.rb +13 -1
  13. data/lib/asciidoctor/iso/validate_section.rb +21 -9
  14. data/lib/isodoc/iso/base_convert.rb +2 -1
  15. data/lib/isodoc/iso/html/header.html +4 -8
  16. data/lib/isodoc/iso/html/htmlstyle.css +1 -1
  17. data/lib/isodoc/iso/html/htmlstyle.scss +1 -1
  18. data/lib/isodoc/iso/html/isodoc.css +42 -42
  19. data/lib/isodoc/iso/html/isodoc.scss +42 -42
  20. data/lib/isodoc/iso/html/style-human.css +9 -9
  21. data/lib/isodoc/iso/html/style-human.scss +7 -7
  22. data/lib/isodoc/iso/html/style-iso.css +7 -7
  23. data/lib/isodoc/iso/html/style-iso.scss +5 -5
  24. data/lib/isodoc/iso/html/wordstyle.css +67 -67
  25. data/lib/isodoc/iso/html/wordstyle.scss +67 -67
  26. data/lib/isodoc/iso/html_convert.rb +4 -0
  27. data/lib/isodoc/iso/i18n-en.yaml +1 -0
  28. data/lib/isodoc/iso/i18n-fr.yaml +2 -0
  29. data/lib/isodoc/iso/i18n-zh-Hans.yaml +1 -0
  30. data/lib/isodoc/iso/i18n.rb +10 -11
  31. data/lib/isodoc/iso/iso.amendment.xsl +381 -86
  32. data/lib/isodoc/iso/iso.international-standard.xsl +381 -86
  33. data/lib/isodoc/iso/metadata.rb +1 -0
  34. data/lib/isodoc/iso/sections.rb +1 -1
  35. data/lib/isodoc/iso/word_convert.rb +4 -0
  36. data/lib/isodoc/iso/xref.rb +34 -8
  37. data/lib/metanorma/iso/processor.rb +11 -9
  38. data/lib/metanorma/iso/version.rb +1 -1
  39. data/metanorma-iso.gemspec +2 -2
  40. data/spec/asciidoctor-iso/amd_spec.rb +14 -14
  41. data/spec/asciidoctor-iso/base_spec.rb +20 -18
  42. data/spec/asciidoctor-iso/blocks_spec.rb +22 -22
  43. data/spec/asciidoctor-iso/cleanup_spec.rb +36 -30
  44. data/spec/asciidoctor-iso/inline_spec.rb +7 -7
  45. data/spec/asciidoctor-iso/lists_spec.rb +9 -9
  46. data/spec/asciidoctor-iso/refs_spec.rb +177 -146
  47. data/spec/asciidoctor-iso/section_spec.rb +12 -7
  48. data/spec/asciidoctor-iso/table_spec.rb +4 -4
  49. data/spec/asciidoctor-iso/validate_spec.rb +401 -85
  50. data/spec/isodoc/amd_spec.rb +13 -13
  51. data/spec/isodoc/blocks_spec.rb +1 -0
  52. data/spec/isodoc/metadata_spec.rb +2 -0
  53. data/spec/isodoc/ref_spec.rb +2 -2
  54. data/spec/isodoc/section_spec.rb +20 -0
  55. data/spec/isodoc/xref_spec.rb +12 -0
  56. metadata +7 -12
  57. data/.github/workflows/macos.yml +0 -49
  58. data/.github/workflows/ubuntu.yml +0 -53
  59. data/.github/workflows/windows.yml +0 -50
  60. data/lib/asciidoctor/iso/macros.rb +0 -21
  61. data/lib/asciidoctor/iso/term_lookup_cleanup.rb +0 -86
  62. data/spec/asciidoctor-iso/macros_spec.rb +0 -310
data/lib/asciidoctor/iso/isostandard-amd.rng CHANGED
@@ -14,9 +14,6 @@
14
14
  </define>
15
15
  <define name="clause">
16
16
  <element name="clause">
17
- <optional>
18
- <attribute name="type"/>
19
- </optional>
20
17
  <optional>
21
18
  <attribute name="change">
22
19
  <choice>
@@ -34,6 +31,13 @@
34
31
  </define>
35
32
  <define name="iso-standard">
36
33
  <element name="iso-standard">
34
+ <attribute name="version"/>
35
+ <attribute name="type">
36
+ <choice>
37
+ <value>semantic</value>
38
+ <value>presentation</value>
39
+ </choice>
40
+ </attribute>
37
41
  <ref name="bibdata"/>
38
42
  <optional>
39
43
  <ref name="boilerplate"/>
@@ -68,7 +72,7 @@
68
72
  </optional>
69
73
  <optional>
70
74
  <attribute name="origyr">
71
- <data type="int"/>
75
+ <ref name="ISO8601Date"/>
72
76
  </attribute>
73
77
  </optional>
74
78
  <text/>
data/lib/asciidoctor/iso/isostandard.rng CHANGED
@@ -38,6 +38,9 @@
38
38
  </define>
39
39
  <define name="BibDataExtensionType">
40
40
  <ref name="doctype"/>
41
+ <optional>
42
+ <ref name="horizontal"/>
43
+ </optional>
41
44
  <ref name="editorialgroup"/>
42
45
  <zeroOrMore>
43
46
  <ref name="ics"/>
@@ -137,22 +140,28 @@
137
140
  </choice>
138
141
  </attribute>
139
142
  </optional>
143
+ <optional>
144
+ <attribute name="type"/>
145
+ </optional>
140
146
  <optional>
141
147
  <ref name="section-title"/>
142
148
  </optional>
143
- <choice>
144
- <group>
145
- <oneOrMore>
146
- <ref name="BasicBlock"/>
147
- </oneOrMore>
148
- <zeroOrMore>
149
- <ref name="note"/>
150
- </zeroOrMore>
151
- </group>
149
+ <group>
150
+ <choice>
151
+ <group>
152
+ <oneOrMore>
153
+ <ref name="BasicBlock"/>
154
+ </oneOrMore>
155
+ <zeroOrMore>
156
+ <ref name="note"/>
157
+ </zeroOrMore>
158
+ </group>
159
+ <ref name="amend"/>
160
+ </choice>
152
161
  <oneOrMore>
153
162
  <ref name="clause-subsection"/>
154
163
  </oneOrMore>
155
- </choice>
164
+ </group>
156
165
  </define>
157
166
  <define name="term">
158
167
  <element name="term">
@@ -379,6 +388,9 @@
379
388
  <data type="anyURI"/>
380
389
  </attribute>
381
390
  </optional>
391
+ <optional>
392
+ <ref name="colgroup"/>
393
+ </optional>
382
394
  <optional>
383
395
  <ref name="tname"/>
384
396
  </optional>
@@ -429,6 +441,11 @@
429
441
  <ref name="bibliography"/>
430
442
  </element>
431
443
  </define>
444
+ <define name="horizontal">
445
+ <element name="horizontal">
446
+ <data type="boolean"/>
447
+ </element>
448
+ </define>
432
449
  <define name="documentnumber">
433
450
  <element name="project-number">
434
451
  <optional>
data/lib/asciidoctor/iso/validate.rb CHANGED
@@ -146,6 +146,17 @@ module Asciidoctor
146
146
  "#{iteration} is not a recognised iteration")
147
147
  end
148
148
 
149
+ # DRG directives 3.7; but anticipated by standoc
150
+ def figure_validate(xmldoc)
151
+ xmldoc.xpath("//figure//figure").each do |f|
152
+ { footnote: "fn", note: "note", key: "dl" }.each do |k, v|
153
+ f.xpath(".//#{v}").each do |n|
154
+ @log.add("Style", n, "#{k} is not permitted in a subfigure")
155
+ end
156
+ end
157
+ end
158
+ end
159
+
149
160
  def bibdata_validate(doc)
150
161
  doctype_validate(doc)
151
162
  script_validate(doc)
@@ -166,11 +177,12 @@ module Asciidoctor
166
177
  locality_erefs_validate(doc.root)
167
178
  bibdata_validate(doc.root)
168
179
  bibitem_validate(doc.root)
180
+ figure_validate(doc.root)
169
181
  end
170
182
 
171
183
  def bibitem_validate(xmldoc)
172
184
  xmldoc.xpath("//bibitem[date/on = '–']").each do |b|
173
- b.at("./note[@type = 'ISO DATE']") or
185
+ b.at("./note[@type = 'Unpublished-Status']") or
174
186
  @log.add("Style", b,
175
187
  "Reference #{b&.at("./@id")&.text} does not have an "\
176
188
  "associated footnote indicating unpublished status")
data/lib/asciidoctor/iso/validate_section.rb CHANGED
@@ -4,11 +4,14 @@ module Asciidoctor
4
4
  module ISO
5
5
  class Converter < Standoc::Converter
6
6
  def section_validate(doc)
7
- foreword_validate(doc.root)
8
- normref_validate(doc.root)
9
- symbols_validate(doc.root)
10
- sections_presence_validate(doc.root)
11
- sections_sequence_validate(doc.root)
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
- "Terms and Definitions")
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
- @log.add("Style", nil, "Scope must occur before Terms and Definitions")
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
- "Normative References")
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
- "Normative References")
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")
@@ -157,6 +160,15 @@ module Asciidoctor
157
160
  scope = root.at("//clause[@type = 'scope']/clause")
158
161
  # ISO/IEC DIR 2, 14.4
159
162
  scope.nil? || style_warning(scope, SCOPE_WARN, nil)
163
+ tech_report_style(root)
164
+ end
165
+
166
+ def tech_report_style(root)
167
+ root.at("//bibdata/ext/doctype")&.text == "technical-report" or return
168
+ root.xpath("//sections/clause[not(@type = 'scope')] | //annex").each do |s|
169
+ r = requirement_check(extract_text(s))
170
+ style_warning(s, "Technical Report clause may contain requirement", r) if r
171
+ end
160
172
  end
161
173
 
162
174
  ASSETS_TO_STYLE =
data/lib/isodoc/iso/base_convert.rb CHANGED
@@ -14,7 +14,8 @@ module IsoDoc
14
14
  end
15
15
 
16
16
  def implicit_reference(b)
17
- b&.at(ns("./docidentifier"))&.text == "IEV"
17
+ return true if b&.at(ns("./docidentifier"))&.text == "IEV"
18
+ super
18
19
  end
19
20
 
20
21
  # terms not defined in standoc
data/lib/isodoc/iso/html/header.html CHANGED
@@ -149,8 +149,7 @@ style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span style='mso-tab-count:
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 }}&nbsp;{{ docyear }}&nbsp;– All
153
- 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 }}&nbsp;{{ docyear }}&nbsp;– {{ all_rights_reserved }}<span style='mso-tab-count:1'>                                                                                                                                                                          </span></span><!--[if supportFields]><span
154
153
  lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
155
154
  style='mso-element:field-begin'></span> PAGE<span style='mso-spacerun:yes'>  
156
155
  </span>\* MERGEFORMAT <span style='mso-element:field-separator'></span></span><![endif]--><span
@@ -163,8 +162,7 @@ style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><o:p></o:p></span></p>
163
162
 
164
163
  <div style='mso-element:footer' id=f2l>
165
164
  <p class=MsoFooterLandscape style='line-height:12.0pt'><span lang=EN-GB
166
- style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© {{ agency }}&nbsp;{{ docyear }}&nbsp;– All
167
- 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 }}&nbsp;{{ docyear }}&nbsp;– {{ all_rights_reserved }}<span style='mso-tab-count:1'>                                                                                                                                                                          </span></span><!--[if supportFields]><span
168
166
  lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><span
169
167
  style='mso-element:field-begin'></span> PAGE<span style='mso-spacerun:yes'>  
170
168
  </span>\* MERGEFORMAT <span style='mso-element:field-separator'></span></span><![endif]--><span
@@ -209,8 +207,7 @@ style='mso-tab-count:1'>                            
209
207
 
210
208
  <div style='mso-element:footer' id=f3>
211
209
  <p class=MsoFooter style='line-height:12.0pt'><span lang=EN-GB
212
- style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© {{ agency }}&nbsp;{{ docyear }}&nbsp;– All
213
- 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 }}&nbsp;{{ docyear }}&nbsp;– {{ all_rights_reserved }}<span style='mso-tab-count:1'>                                                                                                                                                                           </span></span><!--[if supportFields]><b
214
211
  style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
215
212
  mso-bidi-font-size:11.0pt'><span style='mso-element:field-begin'></span>
216
213
  PAGE<span style='mso-spacerun:yes'>   </span>\* MERGEFORMAT <span
@@ -224,8 +221,7 @@ lang=EN-GB style='font-size:10.0pt;mso-bidi-font-size:11.0pt'><o:p></o:p></span>
224
221
 
225
222
  <div style='mso-element:footer' id=f3l>
226
223
  <p class=MsoFooterLandscape style='line-height:12.0pt'><span lang=EN-GB
227
- style='font-size:10.0pt;mso-bidi-font-size:11.0pt'>© {{ agency }}&nbsp;{{ docyear }}&nbsp;– All
228
- 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 }}&nbsp;{{ docyear }}&nbsp;– {{ all_rights_reserved }}<span style='mso-tab-count:1'>                                                                                                                                                                           </span></span><!--[if supportFields]><b
229
225
  style='mso-bidi-font-weight:normal'><span lang=EN-GB style='font-size:10.0pt;
230
226
  mso-bidi-font-size:11.0pt'><span style='mso-element:field-begin'></span>
231
227
  PAGE<span style='mso-spacerun:yes'>   </span>\* MERGEFORMAT <span
data/lib/isodoc/iso/html/htmlstyle.css CHANGED
@@ -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: 12.0pt;
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";
data/lib/isodoc/iso/html/htmlstyle.scss CHANGED
@@ -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:12.0pt;
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";
data/lib/isodoc/iso/html/isodoc.css CHANGED
@@ -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: 9.0pt;
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: 10.0pt;
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: 11.0pt;
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: 11.0pt;
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: 11.0pt;
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: 11.0pt;
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: 11.0pt;
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: 11.0pt;
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: 10.0pt;
166
- mso-bidi-font-size: 11.0pt;
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: 11.0pt;
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: 11.0pt;
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: 11.0pt;
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: 11.0pt;
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: 11.0pt;
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: 11.0pt;
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: 11.0pt;
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: 11.0pt;
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: 11.0pt;
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: 11.0pt;
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: 11.0pt;
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: 11.0pt;
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: 11.0pt;
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: 11.0pt;
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: 11.0pt;
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: 9.0pt;
606
- mso-bidi-font-size: 11.0pt;
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: 11.0pt;
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: 11.0pt;
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: 11.0pt;
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: 10.0pt; }
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: 10.0pt;
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: 10.0pt; }
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: 10.0pt;
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: 10.0pt; }
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: 10.0pt;
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: 10.0pt; }
852
+ font-size: {{smallerfontsize}}; }
853
853
 
854
854
  div.example p.MsoListParagraph {
855
- font-size: 10.0pt; }
855
+ font-size: {{smallerfontsize}}; }
856
856
 
857
857
  div.Note p.MsoListParagraph {
858
- font-size: 10.0pt;
858
+ font-size: {{smallerfontsize}};
859
859
  margin-left: 1.0cm; }
860
860
 
861
861
  div.Note span.stem {
862
- font-size: 10.0pt; }
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: 10.0pt;
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: 10.0pt;
873
+ font-size: {{smallerfontsize}};
874
874
  font-family: {{bodyfont}}; }