metanorma-nist 0.0.5 → 0.0.6

Sign up to get free protection for your applications and to get access to all the features.
@@ -12,24 +12,30 @@ module Asciidoctor
12
12
 
13
13
  def title_subtitle(node, t, at)
14
14
  return unless node.attr("title-sub")
15
- t.title_sub(**attr_code(at)) do |t1|
15
+ t.title(**attr_code(at.merge(type: "subtitle"))) do |t1|
16
16
  t1 << asciidoc_sub(node.attr("title-sub"))
17
17
  end
18
18
  end
19
19
 
20
+ def title_document_class(node, t, at)
21
+ return unless node.attr("title-document-class")
22
+ t.title(**attr_code(at.merge(type: "document-class"))) do |t1|
23
+ t1 << asciidoc_sub(node.attr("title-document-class"))
24
+ end
25
+ end
26
+
20
27
  def title_main(node, t, at)
21
- t.title_main **attr_code(at) do |t1|
28
+ t.title(**attr_code(at.merge(type: "main"))) do |t1|
22
29
  t1 << asciidoc_sub(node.attr("title-main") || node.title)
23
30
  end
24
31
  end
25
32
 
26
33
  def title(node, xml)
27
34
  ["en"].each do |lang|
28
- xml.title do |t|
29
- at = { language: lang, format: "text/plain" }
30
- title_main(node, t, at)
31
- title_subtitle(node, t, at)
32
- end
35
+ at = { language: lang, format: "text/plain" }
36
+ title_main(node, xml, at)
37
+ title_subtitle(node, xml, at)
38
+ title_document_class(node, xml, at)
33
39
  end
34
40
  end
35
41
 
@@ -60,7 +66,7 @@ module Asciidoctor
60
66
  end
61
67
 
62
68
  def add_id_parts(dn, series, edition, long)
63
- ed_delim = "-"
69
+ ed_delim = " Revision "
64
70
  series and series_name = long ? SERIES.dig(series.to_sym) :
65
71
  SERIES_ABBR.dig(series.to_sym)
66
72
  dn = (series_name || "NIST #{series}") + " " + dn
@@ -131,15 +137,11 @@ module Asciidoctor
131
137
 
132
138
  def metadata_series(node, xml)
133
139
  series = node.attr("series")
134
- subseries = node.attr("subseries")
135
- series || subseries || return
140
+ series || return
136
141
  series and xml.series **{ type: "main" } do |s|
137
142
  s.title (SERIES.dig(series.to_sym) || series)
138
143
  SERIES_ABBR.dig(series.to_sym) and s.abbreviation SERIES_ABBR.dig(series.to_sym)
139
144
  end
140
- subseries and xml.series **{ type: "secondary" } do |s|
141
- s.title subseries.split(/-/).map{ |w| w.capitalize }.join(" ")
142
- end
143
145
  end
144
146
 
145
147
  def metadata_commentperiod(node, xml)
@@ -153,6 +155,18 @@ module Asciidoctor
153
155
  end
154
156
  end
155
157
 
158
+ def metadata_getrelation(node, xml, type)
159
+ docs = node.attr(type) || return
160
+ docs.split(/,/).each do |d|
161
+ xml.relation **{ type: type.sub(/-by$/, "By") } do |r|
162
+ r.bibitem do |b|
163
+ # TODO: use nistbib to fetch more information
164
+ b.docidentifier d
165
+ end
166
+ end
167
+ end
168
+ end
169
+
156
170
  SERIES = {
157
171
  "nist-ams": "NIST Advanced Manufacturing Series",
158
172
  "building-science": "NIST Building Science Series",
@@ -203,6 +217,9 @@ module Asciidoctor
203
217
 
204
218
  def metadata(node, xml)
205
219
  super
220
+ %w(obsoletes obsoleted-by supersedes superseded-by).each do |t|
221
+ metadata_getrelation(node, xml, t)
222
+ end
206
223
  metadata_series(node, xml)
207
224
  metadata_keywords(node, xml)
208
225
  metadata_commentperiod(node, xml)
@@ -71,17 +71,18 @@
71
71
  </element>
72
72
  </define>
73
73
  <define name="BibItemType" combine="choice">
74
+ <value>standard</value>
75
+ </define>
76
+ <define name="DocRelationType" combine="choice">
74
77
  <choice>
75
- <value>policy-and-procedures</value>
76
- <value>best-practices</value>
77
- <value>supporting-document</value>
78
- <value>report</value>
79
- <value>legal</value>
80
- <value>directives</value>
81
- <value>proposal</value>
82
- <value>standard</value>
78
+ <value>obsoletedBy</value>
79
+ <value>supersedes</value>
80
+ <value>supersededBy</value>
83
81
  </choice>
84
82
  </define>
83
+ <define name="TitleType" combine="choice">
84
+ <value>document-class</value>
85
+ </define>
85
86
  <define name="editorialgroup">
86
87
  <element name="editorialgroup">
87
88
  <oneOrMore>
@@ -89,19 +90,6 @@
89
90
  </oneOrMore>
90
91
  </element>
91
92
  </define>
92
- <define name="btitle">
93
- <element name="title">
94
- <choice>
95
- <ref name="FormattedString"/>
96
- <group>
97
- <ref name="title-main"/>
98
- <optional>
99
- <ref name="title-sub"/>
100
- </optional>
101
- </group>
102
- </choice>
103
- </element>
104
- </define>
105
93
  <define name="stage">
106
94
  <element name="stage">
107
95
  <choice>
@@ -123,6 +111,26 @@
123
111
  <ref name="FormattedString"/>
124
112
  </element>
125
113
  </define>
114
+ <define name="preface">
115
+ <element name="preface">
116
+ <ref name="authority"/>
117
+ <optional>
118
+ <ref name="preface_abstract"/>
119
+ </optional>
120
+ <optional>
121
+ <ref name="foreword"/>
122
+ </optional>
123
+ <zeroOrMore>
124
+ <ref name="clause"/>
125
+ </zeroOrMore>
126
+ <optional>
127
+ <ref name="reviewernote"/>
128
+ </optional>
129
+ <optional>
130
+ <ref name="executivesummary"/>
131
+ </optional>
132
+ </element>
133
+ </define>
126
134
  <define name="BibData">
127
135
  <optional>
128
136
  <attribute name="type">
@@ -294,6 +302,35 @@
294
302
  </optional>
295
303
  </element>
296
304
  </define>
305
+ <define name="reviewernote">
306
+ <element name="reviewernote">
307
+ <ref name="Basic-Section"/>
308
+ </element>
309
+ </define>
310
+ <define name="executivesummary">
311
+ <element name="executivesummary">
312
+ <ref name="Basic-Section"/>
313
+ </element>
314
+ </define>
315
+ <define name="authority">
316
+ <element name="authority">
317
+ <element name="authority1">
318
+ <ref name="Basic-Section"/>
319
+ </element>
320
+ <element name="authority2">
321
+ <ref name="Basic-Section"/>
322
+ </element>
323
+ <element name="authority3">
324
+ <ref name="Basic-Section"/>
325
+ </element>
326
+ <element name="authority4">
327
+ <ref name="Basic-Section"/>
328
+ </element>
329
+ <element name="authority5">
330
+ <ref name="Basic-Section"/>
331
+ </element>
332
+ </element>
333
+ </define>
297
334
  <define name="nist-standard">
298
335
  <element name="nist-standard">
299
336
  <ref name="bibdata"/>
@@ -0,0 +1,53 @@
1
+ <authority>
2
+ <title>Authority</title>
3
+
4
+ <authority1>
5
+ <p>This publication has been developed by NIST in accordance with its statutory responsibilities under the Federal Information Security Modernization Act (FISMA) of 2014, 44 U.S.C. &#xa7; 3551 <em>et seq.</em>, Public Law (P.L.) 113-283. NIST is responsible for developing information security standards and guidelines, including minimum requirements for federal information systems, but such standards and guidelines shall not apply to national security systems without the express approval of appropriate federal officials exercising policy authority over such systems. This guideline is consistent with the requirements of the Office of Management and Budget (OMB) Circular A-130.</p>
6
+
7
+ <p>Nothing in this publication should be taken to contradict the standards and guidelines made mandatory and binding on federal agencies by the Secretary of Commerce under statutory authority. Nor should these guidelines be interpreted as altering or superseding the existing authorities of the Secretary of Commerce, Director of the OMB, or any other federal official. This publication may be used by nongovernmental organizations on a voluntary basis and is not subject to copyright in the United States. Attribution would, however, be appreciated by NIST.</p>
8
+ </authority1>
9
+
10
+ <authority2>
11
+ <p align="center">National Institute of Standards and Technology {{ docidentifier_long | remove: "NIST " }} <br/>
12
+ Natl. Inst. Stand. Technol. {{ docidentifier | remove: "NIST " }}, ({{ revdate_monthyear }}) <br/>
13
+ CODEN: NSPUE2</p>
14
+
15
+ {% if doi %}
16
+ <p align="center">This publication is available free of charge from: <br/>
17
+ <link target="{{doi}}"/></p>
18
+ {% endif %}
19
+ </authority2>
20
+
21
+ <authority3>
22
+ <p>Any mention of commercial products or reference to commercial organizations is for information only; it does not imply recommendation or endorsement by the United States Government, nor does it imply that the products mentioned are necessarily the best available for the purpose.</p>
23
+
24
+ <p>There may be references in this publication to other publications currently under development by NIST in accordance with its assigned statutory responsibilities. The information in this publication, including concepts and methodologies, may be used by Federal agencies even before the completion of such companion publications. Thus, until each publication is completed, current requirements, guidelines, and procedures, where they exist, remain operative. For planning and transition purposes, Federal agencies may wish to closely follow the development of these new publications by NIST.</p>
25
+
26
+ <p>Organizations are encouraged to review all draft publications during public comment periods and provide feedback to NIST. Many NIST cybersecurity publications, other than the ones noted above, are available at <link target="https://csrc.nist.gov/publications"/>
27
+ </authority3>
28
+
29
+ <authority4>
30
+ {% if comment_extended %}
31
+ <p align="center">[{{ comment_extended}}: Comment period extended]</p>
32
+ {% endif %}
33
+
34
+ {% if comment_from and comment_to %}
35
+ <p align="center"><strong>Public comment period: <em>{{ comment_from }}</em> through <em>{{comment_to}}</em></strong></p>
36
+ {% else %}
37
+ {% if comment_from %}
38
+ <p align="center"><strong>Public comment period: from <em>{{ comment_from }}</em></strong></p>
39
+ {% endif %}
40
+ {% endif %}
41
+ </authority4>
42
+
43
+ <authority5>
44
+ <p align="center"><strong>Comments on this publication may be submitted to:</strong></p>
45
+
46
+ <p align="center">National Institute of Standards and Technology <br/>
47
+ Attn: Computer Security Division, Information Technology Laboratory <br/>
48
+ 100 Bureau Drive (Mail Stop 8930) Gaithersburg, MD 20899-8930 <br/>
49
+ Email: <link target="mailto:{{ email }}"/></p>
50
+
51
+ <p align="center">All comments are subject to release under the Freedom of Information Act (FOIA).</p>
52
+ </authority5>
53
+ </authority>
@@ -0,0 +1,42 @@
1
+ module Asciidoctor
2
+ module NIST
3
+ class Converter < Standoc::Converter
4
+ def title_validate(root)
5
+ nil
6
+ end
7
+
8
+ def validate(doc)
9
+ content_validate(doc)
10
+ schema_validate(formattedstr_strip(doc.dup),
11
+ File.join(File.dirname(__FILE__), "nist.rng"))
12
+ end
13
+
14
+ def introduction_validate(doc)
15
+ intro = doc.at("//sections/clause/title")
16
+ intro&.text == "Introduction" or
17
+ warn "First section of document body should be Introduction, "\
18
+ "not #{intro&.text}"
19
+ end
20
+
21
+ REF_SECTIONS_TO_VALIDATE = "//references[not(parent::clause)]/title | "\
22
+ "//clause[descendant::references][not(parent::clause)]/title".freeze
23
+
24
+ def section_validate(doc)
25
+ super
26
+ introduction_validate(doc)
27
+ references_validate(doc)
28
+ end
29
+
30
+ def references_validate(doc)
31
+ f = doc.xpath(REF_SECTIONS_TO_VALIDATE)
32
+ names = f.map { |s| s&.text }
33
+ return if names.empty?
34
+ return if names == ["References"]
35
+ return if names == ["Bibliography"]
36
+ return if names == ["References", "Bibliography"]
37
+ warn "Reference clauses #{names.join(', ')} do not follow expected "\
38
+ "pattern in NIST"
39
+ end
40
+ end
41
+ end
42
+ end
@@ -1,55 +1,16 @@
1
- <h1>Authority</h1>
2
-
3
- <p>This publication has been developed by NIST in accordance with its statutory responsibilities under the Federal Information Security Modernization Act (FISMA) of 2014, 44 U.S.C. § 3551 <i>et seq.</i>, Public Law (P.L.) 113-283. NIST is responsible for developing information security standards and guidelines, including minimum requirements for federal information systems, but such standards and guidelines shall not apply to national security systems without the express approval of appropriate federal officials exercising policy authority over such systems. This guideline is consistent with the requirements of the Office of Management and Budget (OMB) Circular A-130.</p>
4
-
5
- <p>Nothing in this publication should be taken to contradict the standards and guidelines made mandatory and binding on federal agencies by the Secretary of Commerce under statutory authority. Nor should these guidelines be interpreted as altering or superseding the existing authorities of the Secretary of Commerce, Director of the OMB, or any other federal official. This publication may be used by nongovernmental organizations on a voluntary basis and is not subject to copyright in the United States. Attribution would, however, be appreciated by NIST.</p>
6
-
7
- <p align="center">National Institute of Standards and Technology {{ docnumber }} <br/>
8
- Natl. Inst. Stand. Technol. {{ docnumber }}, ({{ revdate_monthyear }}) <br/>
9
- CODEN: NSPUE2</p>
10
-
11
- {% if url %}
12
- <p align="center">This publication is available free of charge from: <br/>
13
- {{ url }}</p>
14
- {% endif %}
15
-
16
- <div style="border-style: solid;">
17
- <p>Any mention of commercial products or reference to commercial organizations is for information only; it does not imply recommendation or endorsement by the United States Government, nor does it imply that the products mentioned are necessarily the best available for the purpose.</p>
18
-
19
- <p>There may be references in this publication to other publications currently under development by NIST in accordance with its assigned statutory responsibilities. The information in this publication, including concepts and methodologies, may be used by Federal agencies even before the completion of such companion publications. Thus, until each publication is completed, current requirements, guidelines, and procedures, where they exist, remain operative. For planning and transition purposes, Federal agencies may wish to closely follow the development of these new publications by NIST.</p>
20
-
21
- <p>Organizations are encouraged to review all draft publications during public comment periods and provide feedback to NIST. Many NIST cybersecurity publications, other than the ones noted above, are available at <a href="https://csrc.nist.gov/publications">https://csrc.nist.gov/publications</a>.
22
- </div>
23
-
24
- {% if comment_extended %}
25
- <p align="center">[{{ comment_extended}}: Comment period extended]</p>
26
- {% endif %}
27
-
28
- {% if comment_from and comment_to %}
29
- <p align="center"><b>Public comment period: <i>{{ comment_from }}</i> through <i>{{comment_to}}</i></b></p>
30
- {% else %}
31
- {% if comment_from %}
32
- <p align="center"><b>Public comment period: from <i>{{ comment_from }}</i></b></p>
33
- {% endif %}
34
- {% endif %}
35
-
36
- <h2>Comments on this publication may be submitted to:</h2>
37
-
38
- <p align="center">National Institute of Standards and Technology <br/>
39
- Attn: Computer Security Division, Information Technology Laboratory <br/>
40
- 100 Bureau Drive (Mail Stop 8930) Gaithersburg, MD 20899-8930 <br/>
41
- Email: <a href="mailto:{{ email }}">{{email}}</a></p>
42
-
43
- <p align="center">All comments are subject to release under the Freedom of Information Act (FOIA).</p>
44
-
45
- {% if tc == "Computer Security" %}
46
- <h1>Reports on Computer Systems Technology</h1>
47
-
48
- <p>The Information Technology Laboratory (ITL) at the National Institute of Standards and Technology (NIST) promotes the U.S. economy and public welfare by providing technical leadership for the Nation's measurement and standards infrastructure. ITL develops tests, test methods, reference data, proof of concept implementations, and technical analyses to advance the development and productive use of information technology. ITL's responsibilities include the development of management, administrative, technical, and physical standards and guidelines for the cost-effective security and privacy of other than national security-related information in Federal information systems. The Special Publication 800-series reports on ITL's research, guidelines, and outreach efforts in information system security, and its collaborative activities with industry, government, and academic organizations.</p>
49
- {% endif %}
1
+ <div id="authority"/>
50
2
 
51
3
  <nav>
52
- <h1 id="content">Contents</h1>
4
+ <p><a href="#top">{{ docidentifier }}</a></p>
5
+ <p>{{ doctitle }}</p>
6
+ <p>{% if doi %}
7
+ <a href="{{doi}}">Authoritative Copy</a>
8
+ {% endif %}
9
+ {% if doi && url %} | {% endif %}
10
+ {% if url %}
11
+ <a href="{{url}}">Details on CSRC</a>
12
+ {% endif %}
13
+ <p><b>Contents</b></p>
53
14
  <div id="toc"></div>
54
15
 
55
16
  </nav>
@@ -13,19 +13,19 @@
13
13
  <header>
14
14
 
15
15
  <!--<div class="WordSection1">-->
16
- <div class="coverpage">
16
+ <div class="coverpage" id="#top">
17
17
  <div class="wrapper-top">
18
18
 
19
19
  <div class="rule-2"></div>
20
20
 
21
21
  <div class="coverpage-doc-identity">
22
22
  <div class="doc-number">
23
- <div>{{ docnumber_long }}</div>
23
+ <div>{{ draft_prefix }} {{ docidentifier_long }}</div>
24
24
  {% if edition %} <div> Revision {{ edition }}</div> {% endif %}
25
25
  <div> {{ draftinfo }}</div>
26
26
  </div>
27
27
 
28
- <div class="coverpage-title">
28
+ <div class="coverpage-title" style="float:left">
29
29
  <span class="title-first">{{ doctitle }}</span>
30
30
  {% if docsubtitle %}
31
31
  <br/><span class="title-second">{{ docsubtitle }}</span>
@@ -34,17 +34,14 @@
34
34
  <br/><span class="title-second">{{ docparttitle }}</span>
35
35
  {% endif %}
36
36
  </div>
37
+ <div style="float:right"><img id="NIST-logo" src="logo.png" alt="National Institute of Standards and Technology"/></div>
37
38
  </div>
38
39
 
39
- <div class="coverpage-logo">
40
- <span>National Institute of Standards and Technology {{ docyear }}</span>
40
+ <div class="coverpage-logo" style="float:left">
41
+ <span>{{ revdate_monthyr }}</span>
41
42
  </div>
42
43
 
43
- <div class="coverpage-tc-name">
44
- <span>{{ subseries }}</span>
45
- </div>
46
-
47
- <div class="rule-thick"></div>
44
+ <div class="rule-thick" style="clear:both"></div>
48
45
 
49
46
  <div class="authors-container">
50
47
  {% for affiliation in authors_affiliations %}
@@ -58,9 +55,9 @@
58
55
  <div class="download-info">
59
56
 
60
57
  This publication is available free of charge from: <br>
61
- <a href="{{url}}">{{ url }}</a>
58
+ <a href="{{doi}}">{{ doi }}</a>
62
59
 
63
- <div class="category">{{ subseries }}</div>
60
+ <div class="category">{{ docclasstitle }}</div>
64
61
 
65
62
  </div>
66
63
 
@@ -69,7 +66,6 @@
69
66
 
70
67
  <div class="logo-wrapper">
71
68
 
72
- <img id="NIST-logo" src="logo.png">
73
69
  <img id="commerce-logo" src="commerce-logo-color.png">
74
70
  </div>
75
71
 
@@ -84,14 +80,12 @@
84
80
  </div>
85
81
 
86
82
  <div class="WordSection11">
87
- <div class="coverpage-stage-block">
88
- <span class="coverpage-stage" id="{{ doctype | downcase | replace: ' ', '-' }}">{{ doctype }}</span>
89
- </div>
90
83
 
84
+ {% if status != "Final" and status != "Public Draft" %}
91
85
  <div class="coverpage-stage-block">
92
86
  <span class="coverpage-maturity" id="{{ status }}">{{ status }}</span>
93
-
94
87
  </div>
88
+ {% endif %}
95
89
 
96
90
 
97
91
  {% if unpublished %}
@@ -109,23 +103,6 @@
109
103
  {% endif %}
110
104
 
111
105
  <div class="info-section">
112
- <div class="copyright">
113
-
114
- <div class="contact-info">
115
- <p class="name">National Institute of Standards and Technology</p>
116
- <p class="address">
117
- Attn: Computer Security Division, Information Technology Laboratory<br/>
118
- 100 Bureau Drive (Mail Stop 8930) Gaithersburg, MD 20899-8930<br/>
119
- United States of America<br/>
120
- <br />
121
- <a href="mailto:{{ email }}">{{ email }}</a><br />
122
- <a href="www.nist.gov">www.nist.gov</a>
123
- </p>
124
- </div>
125
-
126
-
127
- </div>
128
-
129
106
  <div class="rule"></div>
130
107
  </div>
131
108
  </div>
@@ -89,7 +89,8 @@ h1, h2, h3, h4, h5, h6, .h2Annex {
89
89
 
90
90
  dl {
91
91
  display: grid;
92
- grid-template-columns: max-content auto;
92
+ /*grid-template-columns: max-content auto;*/
93
+ grid-template-columns: 25% 75%;
93
94
  }
94
95
 
95
96
  dt {
@@ -276,6 +277,11 @@ table {
276
277
  text-transform: nonce;
277
278
  }
278
279
 
280
+ nav p {
281
+ font-size: 14px;
282
+ padding: 5px 10px;
283
+ }
284
+
279
285
  /*
280
286
  Document types + stages
281
287
  */
@@ -450,6 +456,7 @@ color: rgb(123, 168, 18);
450
456
 
451
457
  .affiliation {
452
458
  font-style: italic;
459
+ margin-bottom: 1em;
453
460
  }
454
461
 
455
462
  /*
@@ -795,9 +802,12 @@ a.footnote-number {
795
802
  */
796
803
 
797
804
  .contact-info {
805
+ width: 280px;
806
+ }
807
+
808
+ .contact-info, .authority5 {
798
809
  padding: 2em;
799
810
  margin-top: 5em;
800
- width: 280px;
801
811
 
802
812
  text-align: left;
803
813
  color: #2677ea!important;
@@ -806,8 +816,14 @@ a.footnote-number {
806
816
 
807
817
  }
808
818
 
819
+ .authority5 h2 {
820
+ text-align: center;
821
+ }
822
+
809
823
  .contact-info a,
810
- .contact-info a:hover {
824
+ .contact-info a:hover,
825
+ .authority5 a,
826
+ .authority5 a:hover {
811
827
  color: #2677ea;
812
828
  }
813
829
 
@@ -958,7 +974,7 @@ h2 p {
958
974
 
959
975
  .coverpage-doc-identity {
960
976
  font-size: 2em;
961
- line-height: 2em;
977
+ line-height: 1.5em;
962
978
  }
963
979
 
964
980
  .coverpage-title .title-second {
@@ -1049,6 +1065,11 @@ To top button
1049
1065
  box-shadow: none;
1050
1066
  }
1051
1067
 
1068
+ .authority3 {
1069
+ border: solid;
1070
+ padding: 1em;
1071
+ }
1072
+
1052
1073
  @page {
1053
1074
  margin: 2cm 1cm;
1054
1075
  }
@@ -1,3 +1,26 @@
1
+ div.authority2 p, div.authority5 p {
2
+ font-family:$headerfont;
3
+ }
4
+
5
+ div.authority3 {
6
+ element:para-border-div;
7
+ border:solid black 1.0pt;
8
+ padding:8.0pt 8.0pt 8.0pt 8.0pt;
9
+ background:#D9D9D9;
10
+ }
11
+
12
+ div.authority3 p {
13
+ margin-top:6.0pt;margin-right:0cm;
14
+ margin-bottom:6.0pt;margin-left:0cm;text-align:left;mso-pagination:widow-orphan;
15
+ mso-hyphenate:auto;background:#D9D9D9;mso-layout-grid-align:auto;mso-vertical-align-alt:
16
+ auto;border:none;mso-border-alt:solid black 1.0pt;padding:0cm;mso-padding-alt:
17
+ 8.0pt 8.0pt 8.0pt 8.0pt;
18
+ }
19
+
20
+ div.authority5 {
21
+ text-align: center;
22
+ }
23
+
1
24
  p.Author, li.Author, div.Author
2
25
  {mso-style-name:Author;
3
26
  mso-style-unhide:no;
@@ -18,7 +41,7 @@ p.Affiliation, li.Affiliation, div.Affiliation
18
41
  mso-style-unhide:no;
19
42
  mso-style-qformat:yes;
20
43
  margin:0cm;
21
- margin-bottom:.0001pt;
44
+ margin-bottom:12.0pt;
22
45
  text-align:right;
23
46
  font-style:italic;
24
47
  mso-pagination:widow-orphan;
@@ -589,6 +612,15 @@ div.Admonition {
589
612
  mso-bidi-theme-font:minor-bidi;
590
613
  mso-ansi-language:EN-AU;
591
614
  }
615
+
616
+ div Admonotion p {
617
+ margin-top:6.0pt;margin-right:0cm;
618
+ margin-bottom:6.0pt;margin-left:0cm;text-align:left;mso-pagination:widow-orphan;
619
+ mso-hyphenate:auto;background:#dddddd;mso-layout-grid-align:auto;mso-vertical-align-alt:
620
+ auto;border:none;mso-border-alt:solid black 1.0pt;padding:0cm;mso-padding-alt:
621
+ 8.0pt 8.0pt 8.0pt 8.0pt;
622
+ }
623
+
592
624
  p.Admonition, li.Admonition
593
625
  {mso-style-priority:99;
594
626
  mso-pagination:widow-orphan;
@@ -656,6 +688,10 @@ p.Formula, li.Formula, div.Formula
656
688
  mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h1;
657
689
  mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef1;
658
690
  mso-paper-source:0;
691
+ {% if status == "Public Draft" %}
692
+ mso-line-numbers-count-by:1;
693
+ mso-line-numbers-restart:continuous;
694
+ {% endif %}
659
695
  }
660
696
  div.WordSection1
661
697
  {page:WordSection1;}
@@ -665,6 +701,10 @@ div.WordSection1
665
701
  mso-header-margin:0.5in;
666
702
  mso-footer-margin:0.5in;
667
703
  mso-page-numbers:roman-lower;
704
+ {% if status == "Public Draft" %}
705
+ mso-line-numbers-count-by:1;
706
+ mso-line-numbers-restart:continuous;
707
+ {% endif %}
668
708
  mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2;
669
709
  mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
670
710
  mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef2;
@@ -678,6 +718,10 @@ div.WordSection2
678
718
  mso-header-margin:0.5in;
679
719
  mso-footer-margin:0.5in;
680
720
  mso-page-numbers:1;
721
+ {% if status == "Public Draft" %}
722
+ mso-line-numbers-count-by:1;
723
+ mso-line-numbers-restart:continuous;
724
+ {% endif %}
681
725
  mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2;
682
726
  mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
683
727
  mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef3;
@@ -1,8 +1,8 @@
1
1
  <script>
2
2
  //TOC generation
3
3
  $('#toc').toc({
4
- 'selectors': 'h1,h2:not(.TermNum)', //elements to use as headings
5
- 'container': 'main', //element to find all selectors in
4
+ 'selectors': toclevel(), //elements to use as headings
5
+ 'container': 'body', //element to find all selectors in
6
6
  'smoothScrolling': true, //enable or disable smooth scrolling on click
7
7
  'prefix': 'toc', //prefix for anchor tags and class names
8
8
  'onHighlight': function(el) {}, //called when a new section is highlighted
@@ -1,8 +1,8 @@
1
1
  <script>
2
2
  //TOC generation
3
3
  $('#toc').toc({
4
- 'selectors': 'h1,h2:not(.TermNum)', //elements to use as headings
5
- 'container': 'main', //element to find all selectors in
4
+ 'selectors': toclevel(), //elements to use as headings
5
+ 'container': 'body', //element to find all selectors in
6
6
  'smoothScrolling': true, //enable or disable smooth scrolling on click
7
7
  'prefix': 'toc', //prefix for anchor tags and class names
8
8
  'onHighlight': function(el) {}, //called when a new section is highlighted