metanorma-nist 0.0.6 → 0.0.7

Sign up to get free protection for your applications and to get access to all the features.
Files changed (20) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +12 -9
  3. data/README.adoc +15 -6
  4. data/lib/asciidoctor/nist/biblio.rng +17 -12
  5. data/lib/asciidoctor/nist/cleanup.rb +19 -16
  6. data/lib/asciidoctor/nist/converter.rb +15 -8
  7. data/lib/asciidoctor/nist/front.rb +9 -6
  8. data/lib/asciidoctor/nist/nist.rng +16 -7
  9. data/lib/asciidoctor/nist/nist_intro.xml +2 -0
  10. data/lib/isodoc/nist/html/header.html +2 -2
  11. data/lib/isodoc/nist/html/nist.scss +15 -0
  12. data/lib/isodoc/nist/html/word_nist_titlepage.html +340 -106
  13. data/lib/isodoc/nist/html_convert.rb +3 -28
  14. data/lib/isodoc/nist/i18n-en.yaml +3 -0
  15. data/lib/isodoc/nist/metadata.rb +27 -19
  16. data/lib/isodoc/nist/pdf_convert.rb +2 -2
  17. data/lib/isodoc/nist/word_convert.rb +2 -2
  18. data/lib/metanorma/nist/version.rb +1 -1
  19. data/metanorma-nist.gemspec +1 -1
  20. metadata +17 -17
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: a296f752c16a5279fad1ac980465232967eee37122eb4f746109b4b6d27ff3e6
4
- data.tar.gz: a9171483b061e88d6113149a523e04d6d18a8da3aa2edeeb5dfd999cad68bde9
3
+ metadata.gz: c33703816b129a163ed528ae9f88590992ed9af79ec108551e2ee830b88182a9
4
+ data.tar.gz: 3c56c38e0c20b61fe99743d29cf537f886082f4310c2e4941ad53912d7495b24
5
5
  SHA512:
6
- metadata.gz: 70afce02c91127a9e83bf4e38f34d7562dd48eb844efac9e13995717022b927f9d4431bb2fde216f9ac3cb2c18a6dffaf330cd74a84f138bfd7daa8071d13702
7
- data.tar.gz: c82dcd587d815256fd895edb0fa4ff73502e6d6a15507bfa22fb5ce0a40efcde5381b0dbe9ccb253c02fbe5de078c95cd3e0899e857314d6d59f48e89a494de3
6
+ metadata.gz: b2d94690c495ca2172d024ea3f9200dd879170f1f880b6840ab9195dea195da63fc515fbb8395877725ba839249186d7b43979d75afc7345ecc456fcb68ee47b
7
+ data.tar.gz: b858e830d7ac872bd5cbbf3aff5aa8ecfbd8d5fa37fbd95d2a979fce4c8eafcf8352eb2c4f9e52b3026930e99e2b775480eebfff3b2b947b37943f97825df2fa
data/.travis.yml CHANGED
@@ -1,15 +1,18 @@
1
- dist: trusty
2
- sudo: false
3
1
  language: ruby
2
+ cache: bundler
3
+ os:
4
+ - linux
5
+ - osx
4
6
  rvm:
5
- - 2.5
6
- - 2.4
7
- - 2.3
8
- - ruby-head
7
+ - 2.5
8
+ - 2.4
9
+ - 2.3
10
+ - ruby-head
9
11
  before_install:
10
- - gem install bundler -v 2.0.1
11
- - travis_retry sudo apt-get update
12
- - curl -L https://raw.githubusercontent.com/metanorma/metanorma-linux-setup/master/ubuntu-install-puppeteer.sh | bash
12
+ - nvm install 8
13
+ - npm install -g puppeteer
14
+ - gem install bundler -v 2.0.1
15
+ - bundle update
13
16
  matrix:
14
17
  allow_failures:
15
18
  - rvm: ruby-head
data/README.adoc CHANGED
@@ -149,11 +149,15 @@ this attribute will be displayed as part of the heading, prefixed with "Revision
149
149
  `:status:`:: Document status/stage. The permitted types are:
150
150
  +
151
151
  --
152
- * `internal-draft`
153
- * `public-draft`
154
- * `final`
155
- * `retired-draft`
156
- * `withdrawn`
152
+ * `draft-internal`
153
+ * `draft-wip`
154
+ * `draft-prelim`
155
+ * `draft-public`
156
+ * `draft-withdrawn`
157
+ * `draft-retire`
158
+ * `final` (default: document is published)
159
+ * `final-review`
160
+ * `final-withdrawn`
157
161
  --
158
162
 
159
163
  `:fullname{_i}:`, `:affiliation{_i}:`, `:address{_i}`::
@@ -184,7 +188,7 @@ The organizational address of a person who is a contributor to the document.
184
188
 
185
189
  `:obsoleted-date:`::
186
190
  The date at which a document is considered no longer valid (withdrawn). If a document
187
- is not currently withdrawn (as indicated through `:status: withdrawn`),
191
+ is not currently withdrawn (as indicated through `:status: draft-withdrawn`, `status: final-withdrawn`),
188
192
  but will be in the future, that is still indicated in the rendering of the document.
189
193
 
190
194
  === NIST-specific attributes
@@ -285,6 +289,11 @@ One or more corresponding NIST document that this NIST document standard is supe
285
289
  this document may still remain in effect. Comma delimited.
286
290
  Format is document identifier, e.g. _SP 800-53A Rev. 1_
287
291
 
292
+ `:abandoned-date:`::
293
+ The date at which work on a document is abandoned. At that date, the document is considered
294
+ retired (`status: draft-retired`). In NIST, only drafts may be retired. If the document
295
+ is not currently retired (as indicated through `:status: draft-retired`),
296
+ but will be in the future, that is still indicated in the rendering of the document.
288
297
 
289
298
  == Asciidoctor features specific to NIST
290
299
 
data/lib/asciidoctor/nist/biblio.rng CHANGED
@@ -636,22 +636,27 @@
636
636
  <ref name="ISO8601Date"/>
637
637
  </optional>
638
638
  </define>
639
+ <define name="BibliographicDateType">
640
+ <choice>
641
+ <value>published</value>
642
+ <value>accessed</value>
643
+ <value>created</value>
644
+ <value>implemented</value>
645
+ <value>obsoleted</value>
646
+ <value>confirmed</value>
647
+ <value>updated</value>
648
+ <value>issued</value>
649
+ <value>transmitted</value>
650
+ <value>copied</value>
651
+ <value>unchanged</value>
652
+ <value>circulated</value>
653
+ </choice>
654
+ </define>
639
655
  <define name="bdate">
640
656
  <element name="date">
641
657
  <attribute name="type">
642
658
  <choice>
643
- <value>published</value>
644
- <value>accessed</value>
645
- <value>created</value>
646
- <value>implemented</value>
647
- <value>obsoleted</value>
648
- <value>confirmed</value>
649
- <value>updated</value>
650
- <value>issued</value>
651
- <value>transmitted</value>
652
- <value>copied</value>
653
- <value>unchanged</value>
654
- <value>circulated</value>
659
+ <ref name="BibliographicDateType"/>
655
660
  <text/>
656
661
  </choice>
657
662
  </attribute>
data/lib/asciidoctor/nist/cleanup.rb CHANGED
@@ -32,19 +32,7 @@ module Asciidoctor
32
32
  end
33
33
  end
34
34
 
35
- def move_sections_into_preface(x, preface)
36
- abstract = x.at("//abstract")
37
- preface.add_child abstract.remove if abstract
38
- if x.at("//authority")
39
- boilerplate = x.at("//authority")
40
- preface.add_child boilerplate.remove
41
- else
42
- preface.add_child boilerplate(x)
43
- end
44
- foreword = x.at("//foreword")
45
- preface.add_child foreword.remove if foreword
46
- introduction = x.at("//introduction")
47
- preface.add_child introduction.remove if introduction
35
+ def move_clauses_into_preface(x, preface)
48
36
  x.xpath("//clause[@preface]").each do |c|
49
37
  c.delete("preface")
50
38
  title = c&.at("./title")&.text.downcase
@@ -52,6 +40,23 @@ module Asciidoctor
52
40
  c.name = "executivesummary" if title == "executive summary"
53
41
  preface.add_child c.remove
54
42
  end
43
+ end
44
+
45
+ def move_authority_into_preface(x, preface)
46
+ if x.at("//authority")
47
+ boilerplate = x.at("//authority")
48
+ preface.add_child boilerplate.remove
49
+ else
50
+ preface.add_child boilerplate(x)
51
+ end
52
+ end
53
+
54
+ def move_sections_into_preface(x, preface)
55
+ abstract = x.at("//abstract") and preface.add_child abstract.remove
56
+ move_authority_into_preface(x, preface)
57
+ foreword = x.at("//foreword") and preface.add_child foreword.remove
58
+ intro = x.at("//introduction") and preface.add_child intro.remove
59
+ move_clauses_into_preface(x, preface)
55
60
  callforpatentclaims(x, preface)
56
61
  end
57
62
 
@@ -60,7 +65,7 @@ module Asciidoctor
60
65
  docemail = x&.at("//uri[@type = 'email']")&.text || "???"
61
66
  docnumber = x&.at("//docnumber")&.text || "???"
62
67
  status = x&.at("//bibdata/status/stage")&.text
63
- published = status.nil? || status == "final"
68
+ published = status.nil? || /^final/.match(status)
64
69
  preface.add_child patent_text(published, docemail, docnumber)
65
70
  end
66
71
  end
@@ -77,8 +82,6 @@ module Asciidoctor
77
82
  end
78
83
 
79
84
  def make_preface(x, s)
80
- #if x.at("//foreword | //introduction | //abstract | //preface") ||
81
- # @callforpatentclaims
82
85
  preface = s.add_previous_sibling("<preface/>").first
83
86
  move_sections_into_preface(x, preface)
84
87
  summ = x.at("//executivesummary") and preface.add_child summ.remove
data/lib/asciidoctor/nist/converter.rb CHANGED
@@ -35,25 +35,32 @@ module Asciidoctor
35
35
  super
36
36
  end
37
37
 
38
- def errata(node)
38
+ def errata1(node)
39
39
  cols = []
40
40
  node.rows[:head][-1].each { |c| cols << c.text.downcase }
41
41
  table = []
42
42
  node.rows[:body].each do |r|
43
43
  row = {}
44
- r.each_with_index do |c, i|
45
- row[cols[i]] = c.content.join("")
46
- end
44
+ r.each_with_index { |c, i| row[cols[i]] = c.content.join("") }
47
45
  table << row
48
46
  end
47
+ table
48
+ end
49
+
50
+ def errata_row(row, entry)
51
+ row.date { |x| x << entry["date"] }
52
+ row.type { |x| x << entry["type"] }
53
+ row.change { |x| x << entry["change"] }
54
+ row.pages { |x| x << entry["pages"] }
55
+ end
56
+
57
+ def errata(node)
58
+ table = errata1(node)
49
59
  noko do |xml|
50
60
  xml.errata do |errata|
51
61
  table.each do |entry|
52
62
  errata.row do |row|
53
- row.date { |x| x << entry["date"] }
54
- row.type { |x| x << entry["type"] }
55
- row.change { |x| x << entry["change"] }
56
- row.pages { |x| x << entry["pages"] }
63
+ errata_row(row, entry)
57
64
  end
58
65
  end
59
66
  end
data/lib/asciidoctor/nist/front.rb CHANGED
@@ -10,6 +10,10 @@ module Asciidoctor
10
10
  #
11
11
  class Converter < Standoc::Converter
12
12
 
13
+ def datetypes
14
+ super << "abandoned"
15
+ end
16
+
13
17
  def title_subtitle(node, t, at)
14
18
  return unless node.attr("title-sub")
15
19
  t.title(**attr_code(at.merge(type: "subtitle"))) do |t1|
@@ -60,7 +64,8 @@ module Asciidoctor
60
64
  def metadata_id_compose(node, xml, dn0)
61
65
  return unless dn0
62
66
  dn = add_id_parts(dn0, node.attr("series"), node.attr("edition"), false)
63
- dn_long = add_id_parts(dn0, node.attr("series"), node.attr("edition"), true)
67
+ dn_long = add_id_parts(dn0, node.attr("series"), node.attr("edition"),
68
+ true)
64
69
  xml.docidentifier dn, **attr_code(type: "nist")
65
70
  xml.docidentifier dn_long, **attr_code(type: "nist-long")
66
71
  end
@@ -140,7 +145,8 @@ module Asciidoctor
140
145
  series || return
141
146
  series and xml.series **{ type: "main" } do |s|
142
147
  s.title (SERIES.dig(series.to_sym) || series)
143
- SERIES_ABBR.dig(series.to_sym) and s.abbreviation SERIES_ABBR.dig(series.to_sym)
148
+ SERIES_ABBR.dig(series.to_sym) and
149
+ s.abbreviation SERIES_ABBR.dig(series.to_sym)
144
150
  end
145
151
  end
146
152
 
@@ -159,10 +165,7 @@ module Asciidoctor
159
165
  docs = node.attr(type) || return
160
166
  docs.split(/,/).each do |d|
161
167
  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
168
+ fetch_ref(r, d, nil, {})
166
169
  end
167
170
  end
168
171
  end
data/lib/asciidoctor/nist/nist.rng CHANGED
@@ -80,6 +80,9 @@
80
80
  <value>supersededBy</value>
81
81
  </choice>
82
82
  </define>
83
+ <define name="BibliographicDateType" combine="choice">
84
+ <value>abandoned</value>
85
+ </define>
83
86
  <define name="TitleType" combine="choice">
84
87
  <value>document-class</value>
85
88
  </define>
@@ -93,11 +96,15 @@
93
96
  <define name="stage">
94
97
  <element name="stage">
95
98
  <choice>
96
- <value>internal-draft</value>
97
- <value>public-draft</value>
99
+ <value>draft-internal</value>
100
+ <value>draft-wip</value>
101
+ <value>draft-prelim</value>
102
+ <value>draft-public</value>
103
+ <value>draft-retire</value>
104
+ <value>draft-withdrawn</value>
98
105
  <value>final</value>
99
- <value>retired-draft</value>
100
- <value>withdrawn</value>
106
+ <value>final-review</value>
107
+ <value>final-withdrawn</value>
101
108
  </choice>
102
109
  </element>
103
110
  </define>
@@ -323,9 +330,11 @@
323
330
  <element name="authority3">
324
331
  <ref name="Basic-Section"/>
325
332
  </element>
326
- <element name="authority4">
327
- <ref name="Basic-Section"/>
328
- </element>
333
+ <optional>
334
+ <element name="authority4">
335
+ <ref name="Basic-Section"/>
336
+ </element>
337
+ </optional>
329
338
  <element name="authority5">
330
339
  <ref name="Basic-Section"/>
331
340
  </element>
data/lib/asciidoctor/nist/nist_intro.xml CHANGED
@@ -26,6 +26,7 @@ CODEN: NSPUE2</p>
26
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
27
  </authority3>
28
28
 
29
+ {% if unpublished %}
29
30
  <authority4>
30
31
  {% if comment_extended %}
31
32
  <p align="center">[{{ comment_extended}}: Comment period extended]</p>
@@ -39,6 +40,7 @@ CODEN: NSPUE2</p>
39
40
  {% endif %}
40
41
  {% endif %}
41
42
  </authority4>
43
+ {% endif %}
42
44
 
43
45
  <authority5>
44
46
  <p align="center"><strong>Comments on this publication may be submitted to:</strong></p>
data/lib/isodoc/nist/html/header.html CHANGED
@@ -80,7 +80,7 @@ normal'><span lang=EN-GB><span style='mso-special-character:footnote-continuatio
80
80
  <div style='mso-element:header' id=eh2>
81
81
 
82
82
  <p class=MsoHeader align=left style='text-align:left;line-height:12.0pt;font-size:9pt;
83
- mso-line-height-rule:exactly'><span lang=EN-GB>{{ docnumber }}<span style='mso-tab-count:
83
+ mso-line-height-rule:exactly'><span lang=EN-GB>{{ draft_prefix }}{{ docnumber }}<span style='mso-tab-count:
84
84
  1'></span>{{ doctitle }}</span></p>
85
85
 
86
86
  </div>
@@ -88,7 +88,7 @@ mso-line-height-rule:exactly'><span lang=EN-GB>{{ docnumber }}<span style='mso-t
88
88
  <div style='mso-element:header' id=h2>
89
89
 
90
90
  <p class=MsoHeader align=left style='text-align:left;line-height:12.0pt;font-size:9pt;
91
- mso-line-height-rule:exactly'><span lang=EN-GB>{{ docnumber }}<span style='mso-tab-count:
91
+ mso-line-height-rule:exactly'><span lang=EN-GB>{{ draft_prefix }}{{ docnumber }}<span style='mso-tab-count:
92
92
  1'></span>{{ doctitle }}</span></p>
93
93
 
94
94
  </div>
data/lib/isodoc/nist/html/nist.scss CHANGED
@@ -21,6 +21,21 @@ div.authority5 {
21
21
  text-align: center;
22
22
  }
23
23
 
24
+ p.Default, li.Default, div.Default
25
+ {mso-style-name:Default;
26
+ mso-style-unhide:no;
27
+ mso-style-parent:"";
28
+ margin:0cm;
29
+ margin-bottom:.0001pt;
30
+ mso-pagination:widow-orphan;
31
+ mso-layout-grid-align:none;
32
+ text-autospace:none;
33
+ font-size:10.0pt;
34
+ font-family:"Times New Roman",serif;
35
+ mso-fareast-font-family:"Times New Roman";
36
+ mso-bidi-font-family:"Times New Roman";
37
+ mso-ansi-language:EN-US;
38
+ mso-fareast-language:EN-US;}
24
39
  p.Author, li.Author, div.Author
25
40
  {mso-style-name:Author;
26
41
  mso-style-unhide:no;
data/lib/isodoc/nist/html/word_nist_titlepage.html CHANGED
@@ -1,21 +1,284 @@
1
- <p class="ReportNumber"><span lang="EN-US">{{ draft_prefix }} {{ docidentifier_long }}
2
- {% if edition %} <br/> Revision {{ edition }} {% endif %}
1
+ {% if status == "Internal Draft" %}
2
+
3
+ <p class="Default"><b><span style='font-size:20.0pt;'>Draft </span></b></p>
4
+
5
+ <p class="Default"><b><span style='font-size:20.0pt;'>&#xa0;</span></b></p>
6
+
7
+ <p class="Default"><b style='mso-bidi-font-weight:normal'><span
8
+ style='font-size:18.0pt;'>{{ docidentifier_long | replace: "Revision", "<br/>Revision" }}
9
+ {% if draftinfo %}
10
+ <br/>{{ draftinfo }}
11
+ {% endif %}
12
+ </span></b></p>
13
+
14
+ <p class="MsoNormal" style='margin-top:18.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:0cm;mso-pagination:none;mso-layout-grid-align:none;text-autospace:none;font-size:20.0pt;'><span lang="EN-US"><b>{{ doctitle }}</b>
15
+ </span></p>
16
+
17
+ {% if docsubtitle %}
18
+ <p class="MsoNormal" style='margin-top:18.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:0cm;mso-pagination:none;mso-layout-grid-align:none;text-autospace:none;font-size:18.0pt;'><span lang="EN-US"><b>{{ docsubtitle }}</b></span></p>
19
+ {% endif %}
20
+ {% if docparttitle %}
21
+ <p class="MsoNormal" style='margin-top:18.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:0cm;mso-pagination:none;mso-layout-grid-align:none;text-autospace:none;font-size:18.0pt;'><span lang="EN-US"><b><i>{{ docparttitle }}</i></b></span></p>
22
+ {% endif %}
23
+
24
+ <p class="Default" align="right" style='text-align:right'><span
25
+ style='font-size:14.0pt;font-family:"Times New Roman",serif;color:black;mso-themecolor:text1'>&#xa0;</span></p>
26
+
27
+ <div style='mso-element:para-border-div;border:solid windowtext 1.5pt;padding:8.0pt 4.0pt 8.0pt 4.0pt'>
28
+
29
+ <p class="Default" align="center" style='text-align:center;border:none;mso-border-alt:solid windowtext 1.5pt;padding:0cm;mso-padding-alt:8.0pt 4.0pt 8.0pt 4.0pt'><b style='mso-bidi-font-weight:normal'><span lang="EN-US" style='font-size:24.0pt;font-family:"Times New Roman",serif;color:black;mso-themecolor:text1'>Internal
30
+ Draft</span></b></p>
31
+
32
+ </div>
33
+ <p class="Default" align="right" style='text-align:right'><v:shapetype id="_x0000_t202"
34
+ coordsize="21600,21600" o:spt="202" path="m,l,21600r21600,l21600,xe">
35
+ <v:stroke joinstyle="miter"/>
36
+ <v:path gradientshapeok="t" o:connecttype="rect"/>
37
+ </v:shapetype><v:shape id="Text_x0020_Box_x0020_2" o:spid="_x0000_s1033"
38
+ type="#_x0000_t202" style='position:absolute;left:0;text-align:left;margin-left:-5.85pt;margin-top:21.2pt;width:478.85pt;height:90.4pt;z-index:251663360;visibility:visible;mso-wrap-style:square;mso-width-percent:0;mso-height-percent:0;mso-wrap-distance-left:9pt;mso-wrap-distance-top:3.6pt;mso-wrap-distance-right:9pt;mso-wrap-distance-bottom:3.6pt;mso-position-horizontal:absolute;mso-position-horizontal-relative:text;mso-position-vertical:absolute;mso-position-vertical-relative:text;mso-width-percent:0;mso-height-percent:0;mso-width-relative:margin;mso-height-relative:margin;v-text-anchor:top' o:gfxdata="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
68
+ ">
69
+ <v:textbox>
70
+ <div>
71
+ <p class="Default" align="center" style='text-align:center'><b
72
+ style='mso-bidi-font-weight:normal'><span lang="EN-US" style='font-size:12.0pt'>Warning for Internal
73
+ Draft</span></b></p>
74
+ <p class="Default" align="center" style='text-align:center'><span lang="EN-US"
75
+ style='font-size:14.0pt'>&#xa0;</span></p>
76
+ <p class="Default" align="center" style='text-align:center'><span lang="EN-US"
77
+ style='font-size:14.0pt;mso-fareast-font-family:"Times New Roman"'>This
78
+ document is currently under development and is <br/>
79
+ <b style='mso-bidi-font-weight:normal'>NOT INTENDED FOR PUBLIC RELEASE.</b></span></p>
80
+ <p class="Default" style='text-align:justify;text-justify:inter-ideograph'><span
81
+ lang="EN-US">&#xa0;</span></p>
82
+ </div>
83
+ </v:textbox>
84
+ <w:wrap type="square"/>
85
+ </v:shape><span lang="EN-US" style='font-size:14.0pt;font-family:"Times New Roman",serif;color:black;mso-themecolor:text1'></span></p>
86
+ <p class="Default" align="right" style='text-align:right'><span lang="EN-US"
87
+ style='font-family:"Times New Roman",serif;color:black;mso-themecolor:text1'>&#xa0;</span></p>
88
+
89
+ <p class="Default" align="right" style='text-align:right'><span lang="EN-US"
90
+ style='font-size:14.0pt'>&#xa0;</span></p>
91
+
92
+ <p class="Default" align="right" style='text-align:right'><span lang="EN-US"
93
+ style='font-size:14.0pt'>&#xa0;</span></p>
94
+
95
+ <p class="Default" align="right" style='text-align:right'><span lang="EN-US"
96
+ style='font-size:14.0pt'>&#xa0;</span></p>
97
+
98
+ <p class="Default" align="right" style='text-align:right'><span lang="EN-US"
99
+ style='font-size:14.0pt'>&#xa0;</span></p>
100
+
101
+ <p class="Default" align="right" style='text-align:right'><span lang="EN-US"
102
+ style='font-size:14.0pt'>&#xa0;</span></p>
103
+
104
+ <p class="Default" align="right" style='text-align:right'><span lang="EN-US"
105
+ style='font-size:14.0pt'>&#xa0;</span></p>
106
+
107
+ <p class="Default" align="right" style='text-align:right'><span lang="EN-US"
108
+ style='font-size:14.0pt'>&#xa0;</span></p>
109
+
110
+ <div style='mso-element:para-border-div;border-top:solid windowtext 1.5pt;border-left:none;border-bottom:solid windowtext 1.5pt;border-right:none;padding:1.0pt 0cm 1.0pt 0cm'>
111
+
112
+ <p class="MsoNormal" align="center" style='text-align:center;border:none;mso-border-top-alt:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;padding:0cm;mso-padding-alt:1.0pt 0cm 1.0pt 0cm'><span lang="EN-US"
113
+ style='font-size:16.0pt;font-family:"Arial",sans-serif;mso-ansi-language:EN-US;letter-spacing:10.0pt'>{{ docclasstitle | upcase }}</span></p>
114
+
115
+ </div>
116
+
117
+ {% elsif status == "Work In Progress Draft" %}
118
+
119
+ <p class="Default"><b style='mso-bidi-font-weight:normal'><span lang="EN-US"
120
+ style='font-size:20.0pt;font-family:"Times New Roman",serif'>Draft </span></b></p>
121
+
122
+ <p class="Default"><b style='mso-bidi-font-weight:normal'><span lang="EN-US"
123
+ style='font-size:20.0pt;font-family:"Times New Roman",serif'><o:p>&#xa0;</o:p></span></b></p>
124
+
125
+ <p class="Default"><b style='mso-bidi-font-weight:normal'><span
126
+ style='font-size:18.0pt;'>{{ docidentifier_long | replace: "Revision", "<br/>Revision" }}
127
+ {% if draftinfo %}
128
+ <br/>{{ draftinfo }}
129
+ {% endif %}
130
+ </span></b></p>
131
+
132
+ <p class="MsoNormal" style='margin-top:18.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:0cm;mso-pagination:none;mso-layout-grid-align:none;text-autospace:none;font-size:20.0pt;'><span lang="EN-US"><b>{{ doctitle }}</b>
133
+ </span></p>
134
+
135
+ {% if docsubtitle %}
136
+ <p class="MsoNormal" style='margin-top:18.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:0cm;mso-pagination:none;mso-layout-grid-align:none;text-autospace:none;font-size:18.0pt;'><span lang="EN-US"><b>{{ docsubtitle }}</b></span></p>
137
+ {% endif %}
138
+ {% if docparttitle %}
139
+ <p class="MsoNormal" style='margin-top:18.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:0cm;mso-pagination:none;mso-layout-grid-align:none;text-autospace:none;font-size:18.0pt;'><span lang="EN-US"><b><i>{{ docparttitle }}</i></b></span></p>
140
+ {% endif %}
141
+
142
+ <p class="Default" align="right" style='text-align:right'><span lang="EN-US"
143
+ style='font-size:14.0pt;font-family:"Times New Roman",serif;color:black;
144
+ mso-themecolor:text1'><o:p>&#xa0;</o:p></span></p>
145
+
146
+ <div style='mso-element:para-border-div;border:solid windowtext 1.5pt;
147
+ padding:8.0pt 4.0pt 8.0pt 4.0pt'>
148
+
149
+ <p class="Default" align="center" style='text-align:center;border:none;mso-border-alt:
150
+ solid windowtext 1.5pt;padding:0cm;mso-padding-alt:8.0pt 4.0pt 8.0pt 4.0pt'><v:shape
151
+ id="_x0000_s1031" type="#_x0000_t202" style='position:absolute;left:0;text-align:left;margin-left:-5.7pt;margin-top:67.9pt;width:478.85pt;height:129.2pt;z-index:251667456;visibility:visible;mso-wrap-style:square;mso-width-percent:0;mso-height-percent:0;mso-wrap-distance-left:9pt;mso-wrap-distance-top:3.6pt;mso-wrap-distance-right:9pt;mso-wrap-distance-bottom:3.6pt;mso-position-horizontal:absolute;mso-position-horizontal-relative:text;mso-position-vertical:absolute;mso-position-vertical-relative:text;mso-width-percent:0;mso-height-percent:0;mso-width-relative:margin;mso-height-relative:margin;v-text-anchor:top'
152
+ o:gfxdata="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
182
+ ">
183
+ <v:textbox>
184
+ <div>
185
+ <p class="Default" align="center" style='text-align:center'><b
186
+ style='mso-bidi-font-weight:normal;font-size:12.0pt;'><span lang="EN-US">Warning for
187
+ Work-in-progress Draft</span></b></p>
188
+ <p class="Default"><span lang="EN-US"><o:p>&#xa0;</o:p></span></p>
189
+ <p class="Default" style='text-align:justify;text-justify:inter-ideograph;font-size:12.0pt;'><span
190
+ lang="EN-US" style='mso-fareast-font-family:"Times New Roman"'>{{ draft-wip-boilerplate }}</span></p>
191
+ </div>
192
+ </v:textbox>
193
+ <w:wrap type="square"/>
194
+ </v:shape><b style='mso-bidi-font-weight:normal'><span lang="EN-US"
195
+ style='font-size:24.0pt;font-family:"Times New Roman",serif;color:black;
196
+ mso-themecolor:text1'>Work-in-Progress Draft</span></b></p>
197
+
198
+ </div>
199
+
200
+ <p class="Default" align="right" style='text-align:right'><span lang="EN-US"
201
+ style='font-size:14.0pt;font-family:"Times New Roman",serif;color:black;
202
+ mso-themecolor:text1'><o:p>&#xa0;</o:p></span></p>
203
+
204
+ <p class="Default" align="right" style='text-align:right'><span lang="EN-US"
205
+ style='font-family:"Times New Roman",serif;color:black;mso-themecolor:text1'><o:p>&#xa0;</o:p></span></p>
206
+
207
+ <p class="Default" align="right" style='text-align:right'><span lang="EN-US"
208
+ style='font-family:"Times New Roman",serif;color:black;mso-themecolor:text1'><o:p>&#xa0;</o:p></span></p>
209
+
210
+ <p class="Default" align="right" style='text-align:right'><span lang="EN-US"
211
+ style='font-family:"Times New Roman",serif;color:black;mso-themecolor:text1'><o:p>&#xa0;</o:p></span></p>
212
+
213
+ <p class="MsoNormal" align="right" style='text-align:right'><span lang="EN-US"
214
+ style='font-size:14.0pt'><o:p>&#xa0;</o:p></span></p>
215
+
216
+ <p class="MsoNormal" align="right" style='text-align:right'><span lang="EN-US"
217
+ style='font-size:14.0pt'><span style='mso-spacerun:yes'> </span></span></p>
218
+
219
+ <div style='mso-element:para-border-div;border-top:solid windowtext 1.5pt;
220
+ border-left:none;border-bottom:solid windowtext 1.5pt;border-right:none;
221
+ padding:1.0pt 0cm 1.0pt 0cm'>
222
+
223
+ <p class="MsoNormal" align="center" style='text-align:center;border:none;mso-border-top-alt:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;padding:0cm;mso-padding-alt:1.0pt 0cm 1.0pt 0cm'><span lang="EN-US"
224
+ style='font-size:16.0pt;font-family:"Arial",sans-serif;mso-ansi-language:EN-US;letter-spacing:10.0pt'>{{ docclasstitle | upcase }}</span></p>
225
+
226
+
227
+ </div>
228
+
229
+ <p class="MsoNormal" style='margin-bottom:0cm;margin-bottom:.0001pt'><v:shapetype
230
+ id="_x0000_t75" coordsize="21600,21600" o:spt="75" o:preferrelative="t"
231
+ path="m@4@5l@4@11@9@11@9@5xe" filled="f" stroked="f">
232
+ <v:stroke joinstyle="miter"/>
233
+ <v:formulas>
234
+ <v:f eqn="if lineDrawn pixelLineWidth 0"/>
235
+ <v:f eqn="sum @0 1 0"/>
236
+ <v:f eqn="sum 0 0 @1"/>
237
+ <v:f eqn="prod @2 1 2"/>
238
+ <v:f eqn="prod @3 21600 pixelWidth"/>
239
+ <v:f eqn="prod @3 21600 pixelHeight"/>
240
+ <v:f eqn="sum @0 0 1"/>
241
+ <v:f eqn="prod @6 1 2"/>
242
+ <v:f eqn="prod @7 21600 pixelWidth"/>
243
+ <v:f eqn="sum @8 21600 0"/>
244
+ <v:f eqn="prod @7 21600 pixelHeight"/>
245
+ <v:f eqn="sum @10 21600 0"/>
246
+ </v:formulas>
247
+ <v:path o:extrusionok="f" gradientshapeok="t" o:connecttype="rect"/>
248
+ <o:lock v:ext="edit" aspectratio="t"/>
249
+ </v:shapetype><v:shape id="image_x0020_2" o:spid="_x0000_s1026" type="#_x0000_t75"
250
+ alt="NIST Identifier: NIST, National Institute of Standards and Technology, U.S. Department of Commerce"
251
+ style='position:absolute;margin-left:127.95pt;margin-top:0;width:179.15pt;height:75.95pt;z-index:251659264;visibility:visible;mso-wrap-style:square;mso-width-percent:0;mso-height-percent:0;mso-wrap-distance-left:12pt;mso-wrap-distance-top:0;mso-wrap-distance-right:12pt;mso-wrap-distance-bottom:0;mso-position-horizontal:right;mso-position-horizontal-relative:text;mso-position-vertical:bottom;mso-position-vertical-relative:margin;mso-width-percent:0;mso-height-percent:0;mso-width-relative:page;mso-height-relative:page'
252
+ o:allowoverlap="f">
253
+ <v:imagedata src="logo.png"
254
+ o:title=" NIST, National Institute of Standards and Technology, U.S"/>
255
+ <o:lock v:ext="edit" aspectratio="f"/>
256
+ <w:wrap type="square" anchory="margin"/>
257
+ </v:shape></p>
258
+
259
+
260
+
261
+
262
+
263
+ {% else %}
264
+
265
+ <p class="ReportNumber"><span lang="EN-US">{{ draft_prefix }} {{ docidentifier_long | replace: "Revision", "<br/>Revision" }}
3
266
  {% if draftinfo %}
4
267
  <br/>{{ draftinfo }}
5
268
  {% endif %}
6
- <o:p></o:p></span></p>
269
+ </span></p>
7
270
 
8
271
  <div style='mso-element:para-border-div;border:none;border-top:double windowtext 4.5pt;
9
272
  mso-border-top-alt:thin-thick-small-gap windowtext 4.5pt;padding:6.0pt 0cm 0cm 0cm'>
10
273
 
11
274
  <p class="CoverTitle"><span lang="EN-US">{{ doctitle }}
12
- <o:p></o:p></span></p>
275
+ </span></p>
13
276
 
14
277
  {% if docsubtitle %}
15
- <p class="CoverSubtitle"><span lang="EN-US">{{ docsubtitle }}<o:p></o:p></span></p>
278
+ <p class="CoverSubtitle"><span lang="EN-US">{{ docsubtitle }}</span></p>
16
279
  {% endif %}
17
280
  {% if docparttitle %}
18
- <p class="CoverSubtitle"><span lang="EN-US">{{ docparttitle }}<o:p></o:p></span></p>
281
+ <p class="CoverSubtitle"><span lang="EN-US">{{ docparttitle }}</span></p>
19
282
  {% endif %}
20
283
 
21
284
  <div style='mso-element:para-border-div;border:none;border-top:solid black 1.5pt;
@@ -23,7 +286,7 @@ mso-border-top-themecolor:text1;padding:1.0pt 0cm 0cm 0cm'>
23
286
 
24
287
  <p class="MsoNormal" style='border:none;mso-border-top-alt:solid black 1.5pt;
25
288
  mso-border-top-themecolor:text1;padding:0cm;mso-padding-alt:1.0pt 0cm 0cm 0cm'><span
26
- lang="EN-US" style='font-size:14.0pt;color:black;mso-themecolor:text1'>&#xa0;<o:p></o:p></span></p>
289
+ lang="EN-US" style='font-size:14.0pt;color:black;mso-themecolor:text1'>&#xa0;</span></p>
27
290
 
28
291
  </div>
29
292
 
@@ -33,31 +296,31 @@ lang="EN-US" style='font-size:14.0pt;color:black;mso-themecolor:text1'>&#xa0;<o:
33
296
 
34
297
  <p class="MsoNormal" align="right" style='text-align:right;mso-pagination:widow-orphan;
35
298
  mso-hyphenate:auto;text-autospace:none;mso-vertical-align-alt:auto;margin-bottom:0.0pt'><span
36
- lang="EN-US" style='font-size:14.0pt;color:black'>&#xa0;<o:p></o:p></span></p>
299
+ lang="EN-US" style='font-size:14.0pt;color:black'>&#xa0;</span></p>
37
300
  <p class="MsoNormal" align="right" style='text-align:right;mso-pagination:widow-orphan;
38
301
  mso-hyphenate:auto;text-autospace:none;mso-vertical-align-alt:auto;margin-bottom:0.0pt'><span
39
- lang="EN-US" style='font-size:14.0pt;color:black'>&#xa0;<o:p></o:p></span></p>
302
+ lang="EN-US" style='font-size:14.0pt;color:black'>&#xa0;</span></p>
40
303
 
41
304
 
42
305
  {% if doi %}
43
306
  <p class="MsoNormal" align="right" style='text-align:right;mso-pagination:widow-orphan;
44
307
  mso-hyphenate:auto;text-autospace:none;mso-vertical-align-alt:auto;margin-bottom:0.0pt'><span
45
308
  lang="EN-US" style='font-size:14.0pt;color:black'>This publication is available
46
- free of charge from:<o:p></o:p></span></p>
309
+ free of charge from:</span></p>
47
310
  <p class="MsoNormal" align="right" style='text-align:right;mso-pagination:widow-orphan;
48
311
  mso-hyphenate:auto;text-autospace:none;mso-vertical-align-alt:auto;margin-bottom:0.0pt'><span
49
- lang="EN-US" style='font-size:14.0pt;color:black'>{{ doi }}<o:p></o:p></span></p>
312
+ lang="EN-US" style='font-size:14.0pt;color:black'>{{ doi }}</span></p>
50
313
  {% endif %}
51
314
 
52
315
  <p class="MsoNormal" align="right" style='text-align:right;mso-pagination:widow-orphan;
53
316
  mso-hyphenate:auto;text-autospace:none;mso-vertical-align-alt:auto;margin-bottom:0.0pt'><span
54
- lang="EN-US" style='font-size:14.0pt;color:black'>&#xa0;<o:p></o:p></span></p>
317
+ lang="EN-US" style='font-size:14.0pt;color:black'>&#xa0;</span></p>
55
318
  <p class="MsoNormal" align="right" style='text-align:right;mso-pagination:widow-orphan;
56
319
  mso-hyphenate:auto;text-autospace:none;mso-vertical-align-alt:auto;margin-bottom:0.0pt'><span
57
- lang="EN-US" style='font-size:14.0pt;color:black'>&#xa0;<o:p></o:p></span></p>
320
+ lang="EN-US" style='font-size:14.0pt;color:black'>&#xa0;</span></p>
58
321
  <p class="MsoNormal" align="right" style='text-align:right;mso-pagination:widow-orphan;
59
322
  mso-hyphenate:auto;text-autospace:none;mso-vertical-align-alt:auto;margin-bottom:0.0pt'><span
60
- lang="EN-US" style='font-size:14.0pt;color:black'>&#xa0;<o:p></o:p></span></p>
323
+ lang="EN-US" style='font-size:14.0pt;color:black'>&#xa0;</span></p>
61
324
 
62
325
 
63
326
  <div style='mso-element:para-border-div;border-top:solid windowtext 1.5pt;
@@ -67,13 +330,13 @@ padding:1.0pt 0cm 1.0pt 0cm'>
67
330
  <p class="MsoNormal" align="center" style='text-align:center;border:none;
68
331
  mso-border-top-alt:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;
69
332
  padding:0cm;mso-padding-alt:1.0pt 0cm 1.0pt 0cm'><span lang="EN-US"
70
- style='font-size:16.0pt;font-family:"Arial",sans-serif;mso-ansi-language:EN-US;letter-spacing:10.0pt'>{{ docclasstitle }}<o:p></o:p></span></p>
333
+ style='font-size:16.0pt;font-family:"Arial",sans-serif;mso-ansi-language:EN-US;letter-spacing:10.0pt'>{{ docclasstitle | upcase }}</span></p>
71
334
 
72
335
 
73
336
  </div>
74
337
 
75
338
  <p class="MsoNormal"><span lang="EN-US" style='font-size:14.0pt'><span
76
- style='mso-spacerun:yes'> </span><o:p></o:p></span></p>
339
+ style='mso-spacerun:yes'> </span></span></p>
77
340
 
78
341
  <p class="MsoNormal" style='margin-bottom:0cm;margin-bottom:.0001pt'><v:shapetype
79
342
  id="_x0000_t75" coordsize="21600,21600" o:spt="75" o:preferrelative="t"
@@ -97,14 +360,7 @@ style='mso-spacerun:yes'> </span><o:p></o:p></span></p>
97
360
  <o:lock v:ext="edit" aspectratio="t"/>
98
361
  </v:shapetype><v:shape id="image_x0020_2" o:spid="_x0000_s1026" type="#_x0000_t75"
99
362
  alt="NIST Identifier: NIST, National Institute of Standards and Technology, U.S. Department of Commerce"
100
- style='position:absolute;margin-left:127.95pt;margin-top:0;width:179.15pt;
101
- height:75.95pt;z-index:251659264;visibility:visible;mso-wrap-style:square;
102
- mso-width-percent:0;mso-height-percent:0;mso-wrap-distance-left:12pt;
103
- mso-wrap-distance-top:0;mso-wrap-distance-right:12pt;
104
- mso-wrap-distance-bottom:0;mso-position-horizontal:right;
105
- mso-position-horizontal-relative:text;mso-position-vertical:bottom;
106
- mso-position-vertical-relative:margin;mso-width-percent:0;
107
- mso-height-percent:0;mso-width-relative:page;mso-height-relative:page'
363
+ style='position:absolute;margin-left:127.95pt;margin-top:0;width:179.15pt;height:75.95pt;z-index:251659264;visibility:visible;mso-wrap-style:square;mso-width-percent:0;mso-height-percent:0;mso-wrap-distance-left:12pt;mso-wrap-distance-top:0;mso-wrap-distance-right:12pt;mso-wrap-distance-bottom:0;mso-position-horizontal:right;mso-position-horizontal-relative:text;mso-position-vertical:bottom;mso-position-vertical-relative:margin;mso-width-percent:0;mso-height-percent:0;mso-width-relative:page;mso-height-relative:page'
108
364
  o:allowoverlap="f">
109
365
  <v:imagedata src="logo.png"
110
366
  o:title=" NIST, National Institute of Standards and Technology, U.S"/>
@@ -115,138 +371,116 @@ style='mso-spacerun:yes'> </span><o:p></o:p></span></p>
115
371
 
116
372
  </div>
117
373
 
374
+ {% endif %}
375
+
376
+
377
+
378
+
379
+
380
+
381
+
382
+
383
+
384
+
118
385
  <div>
119
386
 
120
- <span lang="EN-US" style='font-size:14.0pt;font-family:"Times New Roman",serif;
121
- mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US;mso-fareast-language:
122
- EN-US;mso-bidi-language:AR-SA'><br clear="all" style='page-break-before:always;'/>
387
+ <span lang="EN-US" style='font-size:14.0pt;font-family:"Times New Roman",serif;mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US;mso-fareast-language:EN-US;mso-bidi-language:AR-SA'><br clear="all" style='page-break-before:always;'/>
123
388
  </span>
124
389
 
125
- <p class="MsoNormal" align="right" style='text-align:right;line-height:90%;
126
- mso-pagination:widow-orphan;mso-hyphenate:auto;mso-layout-grid-align:auto;
127
- mso-vertical-align-alt:auto'><b style='mso-bidi-font-weight:normal'><span
390
+ <p class="MsoNormal" align="right" style='text-align:right;line-height:90%;mso-pagination:widow-orphan;mso-hyphenate:auto;mso-layout-grid-align:auto;mso-vertical-align-alt:auto'><b style='mso-bidi-font-weight:normal'><span
128
391
  lang="EN-US" style='font-size:20.0pt;mso-bidi-font-size:12.0pt;line-height:90%'>
129
- {{ draft_prefix }} {{ docidentifier_long }}
392
+ {{ draft_prefix }} {{ docidentifier_long | replace: "Revision", "<br/>Revision" }}
130
393
  {% if draftinfo %}
131
394
  <br/>{{ draftinfo }}
132
395
  {% endif %}
133
- <o:p></o:p></span></b></p>
396
+ </span></b></p>
134
397
 
135
- <p class="MsoNormal" align="right" style='text-align:right;mso-pagination:widow-orphan;
136
- mso-hyphenate:auto;text-autospace:none;mso-vertical-align-alt:auto;margin-bottom:0.0pt'><span
137
- lang="EN-US" style='font-size:14.0pt;color:black'>&#xa0;<o:p></o:p></span></p>
398
+ <p class="MsoNormal" align="right" style='text-align:right;mso-pagination:widow-orphan;mso-hyphenate:auto;text-autospace:none;mso-vertical-align-alt:auto;margin-bottom:0.0pt'><span
399
+ lang="EN-US" style='font-size:14.0pt;color:black'>&#xa0;</span></p>
138
400
 
139
- <p class="CxSpMiddle" align="right" style='margin-top:18.0pt;margin-right:
140
- 0cm;margin-bottom:6.0pt;margin-left:0cm;mso-add-space:auto;text-align:right'><b
141
- style='mso-bidi-font-weight:normal'><span lang="EN-US" style='font-size:28.0pt;
142
- mso-bidi-font-size:12.0pt;color:black;position:relative;top:-4.0pt;mso-text-raise:
143
- 4.0pt;letter-spacing:-.5pt;mso-font-kerning:10.0pt'>{{ doctitle }}<o:p></o:p></span></b></p>
401
+ <p class="CxSpMiddle" align="right" style='margin-top:18.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:0cm;mso-add-space:auto;text-align:right'><b
402
+ style='mso-bidi-font-weight:normal'><span lang="EN-US" style='font-size:28.0pt;mso-bidi-font-size:12.0pt;color:black;position:relative;top:-4.0pt;mso-text-raise:4.0pt;letter-spacing:-.5pt;mso-font-kerning:10.0pt'>{{ doctitle }}</span></b></p>
144
403
 
145
404
  {% if docsubtitle %}
146
- <p class="CxSpMiddle" align="right" style='margin-top:18.0pt;margin-right:
147
- 0cm;margin-bottom:6.0pt;margin-left:0cm;mso-add-space:auto;text-align:right'><i
148
- style='mso-bidi-font-weight:normal'><span lang="EN-US" style='font-size:18.0pt;
149
- mso-bidi-font-size:12.0pt;color:black;position:relative'>{{ docsubtitle }}<o:p></o:p></span></i></p>
405
+ <p class="CxSpMiddle" align="right" style='margin-top:18.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:0cm;mso-add-space:auto;text-align:right'><i
406
+ style='mso-bidi-font-weight:normal'><span lang="EN-US" style='font-size:18.0pt;mso-bidi-font-size:12.0pt;color:black;position:relative'>{{ docsubtitle }}</span></i></p>
150
407
  {% endif %}
151
408
 
152
409
  </div>
153
410
 
154
- <span lang="EN-US" style='font-size:14.0pt;font-family:"Times New Roman",serif;
155
- mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US;mso-fareast-language:
156
- EN-US;mso-bidi-language:AR-SA;margin-bottom:0.0pt'><br clear="all" style='page-break-before:auto;'/>
411
+ <span lang="EN-US" style='font-size:14.0pt;font-family:"Times New Roman",serif;mso-fareast-font-family:"Times New Roman";mso-ansi-language:EN-US;mso-fareast-language:EN-US;mso-bidi-language:AR-SA;margin-bottom:0.0pt'><br clear="all" style='page-break-before:auto;'/>
157
412
  </span>
158
413
 
159
414
  <div class="authors-container">
160
415
  {% for affiliation in authors_affiliations %}
161
416
  {% for author in affiliation[1] %}
162
- <p class="Author">{{ author }}</div>
417
+ <p class="Author">{{ author }}</p>
163
418
  {% endfor %}
164
- <p class="Affiliation">{{affiliation[0]}}</div>
419
+ <p class="Affiliation">{{affiliation[0]}}</p>
165
420
  {% endfor %}
166
421
  </div>
167
422
 
168
- <span lang="EN-US" style='font-size:14.0pt;font-family:"Times New Roman",serif;
169
- mso-fareast-font-family:"Times New Roman";color:black;mso-ansi-language:EN-US;
170
- mso-fareast-language:EN-US;mso-bidi-language:AR-SA;margin-bottom:0.0pt'><br clear="all"
423
+ <span lang="EN-US" style='font-size:14.0pt;font-family:"Times New Roman",serif;mso-fareast-font-family:"Times New Roman";color:black;mso-ansi-language:EN-US;mso-fareast-language:EN-US;mso-bidi-language:AR-SA;margin-bottom:0.0pt'><br clear="all"
171
424
  style='page-break-before:auto;'/>
172
425
  </span>
173
426
 
174
427
 
175
- <p class="MsoNormal" align="right" style='text-align:right;mso-pagination:widow-orphan;
176
- mso-hyphenate:auto;text-autospace:none;mso-vertical-align-alt:auto;margin-bottom:0.0pt'><span
177
- lang="EN-US" style='font-size:14.0pt;color:black'>&#xa0;<o:p></o:p></span></p>
178
- <p class="MsoNormal" align="right" style='text-align:right;mso-pagination:widow-orphan;
179
- mso-hyphenate:auto;text-autospace:none;mso-vertical-align-alt:auto;margin-bottom:0.0pt'><span
180
- lang="EN-US" style='font-size:14.0pt;color:black'>&#xa0;<o:p></o:p></span></p>
181
- <p class="MsoNormal" align="right" style='text-align:right;mso-pagination:widow-orphan;
182
- mso-hyphenate:auto;text-autospace:none;mso-vertical-align-alt:auto;margin-bottom:0.0pt'><span
183
- lang="EN-US" style='font-size:14.0pt;color:black'>&#xa0;<o:p></o:p></span></p>
428
+ <p class="MsoNormal" align="right" style='text-align:right;mso-pagination:widow-orphan;mso-hyphenate:auto;text-autospace:none;mso-vertical-align-alt:auto;margin-bottom:0.0pt'><span
429
+ lang="EN-US" style='font-size:14.0pt;color:black'>&#xa0;</span></p>
430
+ <p class="MsoNormal" align="right" style='text-align:right;mso-pagination:widow-orphan;mso-hyphenate:auto;text-autospace:none;mso-vertical-align-alt:auto;margin-bottom:0.0pt'><span
431
+ lang="EN-US" style='font-size:14.0pt;color:black'>&#xa0;</span></p>
432
+ <p class="MsoNormal" align="right" style='text-align:right;mso-pagination:widow-orphan;mso-hyphenate:auto;text-autospace:none;mso-vertical-align-alt:auto;margin-bottom:0.0pt'><span
433
+ lang="EN-US" style='font-size:14.0pt;color:black'>&#xa0;</span></p>
184
434
 
185
435
  {% if url %}
186
- <p class="MsoNormal" align="right" style='text-align:right;mso-pagination:widow-orphan;
187
- mso-hyphenate:auto;text-autospace:none;mso-vertical-align-alt:auto;margin-bottom:0.0pt'><span
436
+ <p class="MsoNormal" align="right" style='text-align:right;mso-pagination:widow-orphan;mso-hyphenate:auto;text-autospace:none;mso-vertical-align-alt:auto;margin-bottom:0.0pt'><span
188
437
  lang="EN-US" style='font-size:14.0pt;color:black'>This publication is available
189
- free of charge from:<o:p></o:p></span></p>
190
- <p class="MsoNormal" align="right" style='text-align:right;mso-pagination:widow-orphan;
191
- mso-hyphenate:auto;text-autospace:none;mso-vertical-align-alt:auto;margin-bottom:0.0pt'><span
192
- lang="EN-US" style='font-size:14.0pt;color:black'>{{ url }}<o:p></o:p></span></p>
438
+ free of charge from:</span></p>
439
+ <p class="MsoNormal" align="right" style='text-align:right;mso-pagination:widow-orphan;mso-hyphenate:auto;text-autospace:none;mso-vertical-align-alt:auto;margin-bottom:0.0pt'><span
440
+ lang="EN-US" style='font-size:14.0pt;color:black'>{{ url }}</span></p>
193
441
  {% endif %}
194
442
 
195
- <p class="MsoNormal" align="right" style='text-align:right;mso-pagination:widow-orphan;
196
- mso-hyphenate:auto;text-autospace:none;mso-vertical-align-alt:auto;margin-bottom:0.0pt'><span
197
- lang="EN-US" style='font-size:14.0pt;color:black'>&#xa0;<o:p></o:p></span></p>
198
- <p class="MsoNormal" align="right" style='text-align:right;mso-pagination:widow-orphan;
199
- mso-hyphenate:auto;text-autospace:none;mso-vertical-align-alt:auto;margin-bottom:0.0pt'><span
200
- lang="EN-US" style='font-size:14.0pt;color:black'>&#xa0;<o:p></o:p></span></p>
443
+ <p class="MsoNormal" align="right" style='text-align:right;mso-pagination:widow-orphan;mso-hyphenate:auto;text-autospace:none;mso-vertical-align-alt:auto;margin-bottom:0.0pt'><span
444
+ lang="EN-US" style='font-size:14.0pt;color:black'>&#xa0;</span></p>
445
+ <p class="MsoNormal" align="right" style='text-align:right;mso-pagination:widow-orphan;mso-hyphenate:auto;text-autospace:none;mso-vertical-align-alt:auto;margin-bottom:0.0pt'><span
446
+ lang="EN-US" style='font-size:14.0pt;color:black'>&#xa0;</span></p>
201
447
 
202
- <p class="MsoNormal" align="right" style='text-align:right;mso-pagination:widow-orphan;
203
- mso-hyphenate:auto;text-autospace:none;mso-vertical-align-alt:auto;margin-bottom:0.0pt'><span
204
- lang="EN-US" style='font-size:14.0pt;color:black'>{{ revdate_monthyear }}<o:p></o:p></span></p>
448
+ <p class="MsoNormal" align="right" style='text-align:right;mso-pagination:widow-orphan;mso-hyphenate:auto;text-autospace:none;mso-vertical-align-alt:auto;margin-bottom:0.0pt'><span
449
+ lang="EN-US" style='font-size:14.0pt;color:black'>{{ revdate_monthyear }}</span></p>
205
450
 
206
- <p class="MsoNormal" align="right" style='text-align:right;mso-pagination:widow-orphan;
207
- mso-hyphenate:auto;text-autospace:none;mso-vertical-align-alt:auto;margin-bottom:0.0pt'><span
208
- lang="EN-US" style='font-size:14.0pt;color:black'>&#xa0;<o:p></o:p></span></p>
209
- <p class="MsoNormal" align="right" style='text-align:right;mso-pagination:widow-orphan;
210
- mso-hyphenate:auto;text-autospace:none;mso-vertical-align-alt:auto;margin-bottom:0.0pt'><span
211
- lang="EN-US" style='font-size:14.0pt;color:black'>&#xa0;<o:p></o:p></span></p>
451
+ <p class="MsoNormal" align="right" style='text-align:right;mso-pagination:widow-orphan;mso-hyphenate:auto;text-autospace:none;mso-vertical-align-alt:auto;margin-bottom:0.0pt'><span
452
+ lang="EN-US" style='font-size:14.0pt;color:black'>&#xa0;</span></p>
453
+ <p class="MsoNormal" align="right" style='text-align:right;mso-pagination:widow-orphan;mso-hyphenate:auto;text-autospace:none;mso-vertical-align-alt:auto;margin-bottom:0.0pt'><span
454
+ lang="EN-US" style='font-size:14.0pt;color:black'>&#xa0;</span></p>
212
455
 
213
- <p class="MsoNormal" align="right" style='text-align:right;mso-pagination:widow-orphan;
214
- mso-hyphenate:auto;text-autospace:none;mso-vertical-align-alt:auto;margin-bottom:0.0pt'>
456
+ <p class="MsoNormal" align="right" style='text-align:right;mso-pagination:widow-orphan;mso-hyphenate:auto;text-autospace:none;mso-vertical-align-alt:auto;margin-bottom:0.0pt'>
215
457
  <img width="91" height="90"
216
458
  src="deptofcommerce.png"
217
459
  alt="Seal of the U.S. Department of Commerce"/>
218
460
  </p>
219
461
 
220
- <p class="MsoNormal" align="right" style='text-align:right;mso-pagination:widow-orphan;
221
- mso-hyphenate:auto;text-autospace:none;mso-vertical-align-alt:auto;margin-bottom:0.0pt'><span
222
- lang="EN-US" style='font-size:11.0pt;color:black'>&#xa0;<o:p></o:p></span></p>
223
- <p class="MsoNormal" align="right" style='text-align:right;mso-pagination:widow-orphan;
224
- mso-hyphenate:auto;text-autospace:none;mso-vertical-align-alt:auto;margin-bottom:0.0pt'><span
225
- lang="EN-US" style='font-size:11.0pt;color:black'>&#xa0;<o:p></o:p></span></p>
462
+ <p class="MsoNormal" align="right" style='text-align:right;mso-pagination:widow-orphan;mso-hyphenate:auto;text-autospace:none;mso-vertical-align-alt:auto;margin-bottom:0.0pt'><span
463
+ lang="EN-US" style='font-size:11.0pt;color:black'>&#xa0;</span></p>
464
+ <p class="MsoNormal" align="right" style='text-align:right;mso-pagination:widow-orphan;mso-hyphenate:auto;text-autospace:none;mso-vertical-align-alt:auto;margin-bottom:0.0pt'><span
465
+ lang="EN-US" style='font-size:11.0pt;color:black'>&#xa0;</span></p>
226
466
 
227
467
 
228
- <p class="MsoNormal" align="right" style='text-align:right;mso-pagination:widow-orphan;
229
- mso-hyphenate:auto;text-autospace:none;mso-vertical-align-alt:auto;margin-bottom:0.0pt'><span
230
- lang="EN-US" style='font-size:11.0pt;color:black'
231
- >U.S. Department of Commerce<o:p></o:p></span></p>
468
+ <p class="MsoNormal" align="right" style='text-align:right;mso-pagination:widow-orphan;mso-hyphenate:auto;text-autospace:none;mso-vertical-align-alt:auto;margin-bottom:0.0pt'><span
469
+ lang="EN-US" style='font-size:11.0pt;color:black'>U.S. Department of Commerce</span></p>
232
470
 
233
- <p class="MsoNormal" align="right" style='text-align:right;mso-pagination:widow-orphan;
234
- mso-hyphenate:auto;text-autospace:none;mso-vertical-align-alt:auto;margin-bottom:0.0pt'><i><span
471
+ <p class="MsoNormal" align="right" style='text-align:right;mso-pagination:widow-orphan;mso-hyphenate:auto;text-autospace:none;mso-vertical-align-alt:auto;margin-bottom:0.0pt'><i><span
235
472
  lang="EN-US" style='font-size:10.0pt;color:black'
236
- >Wilbur L. Ross, Jr., Secretary<o:p></o:p></span></i></p>
473
+ >Wilbur L. Ross, Jr., Secretary</span></i></p>
237
474
 
238
- <p class="MsoNormal" align="right" style='text-align:right;mso-pagination:widow-orphan;
239
- mso-hyphenate:auto;text-autospace:none;mso-vertical-align-alt:auto;margin-bottom:0.0pt'><span
240
- lang="EN-US" style='font-size:10.0pt;color:black'>&#xa0;<o:p></o:p></span></p>
475
+ <p class="MsoNormal" align="right" style='text-align:right;mso-pagination:widow-orphan;mso-hyphenate:auto;text-autospace:none;mso-vertical-align-alt:auto;margin-bottom:0.0pt'><span
476
+ lang="EN-US" style='font-size:10.0pt;color:black'>&#xa0;</span></p>
241
477
 
242
- <p class="MsoNormal" align="right" style='text-align:right;mso-pagination:widow-orphan;
243
- mso-hyphenate:auto;text-autospace:none;mso-vertical-align-alt:auto;margin-bottom:0.0pt'><span
478
+ <p class="MsoNormal" align="right" style='text-align:right;mso-pagination:widow-orphan;mso-hyphenate:auto;text-autospace:none;mso-vertical-align-alt:auto;margin-bottom:0.0pt'><span
244
479
  lang="EN-US" style='font-size:10.0pt;color:black'
245
- >National Institute of Standards and Technology <o:p></o:p></span></p>
480
+ >National Institute of Standards and Technology </span></p>
246
481
 
247
- <p class="MsoNormal" align="right" style='text-align:right;mso-pagination:widow-orphan;
248
- mso-hyphenate:auto;text-autospace:none;mso-vertical-align-alt:auto;margin-bottom:0.0pt'><i><span
482
+ <p class="MsoNormal" align="right" style='text-align:right;mso-pagination:widow-orphan;mso-hyphenate:auto;text-autospace:none;mso-vertical-align-alt:auto;margin-bottom:0.0pt'><i><span
249
483
  lang="EN-US" style='font-size:10.0pt;color:black'
250
484
  >Walter Copan, NIST Director and Under Secretary of Commerce for Standards and Technology</span></i><b><span
251
- lang="EN-US" style='font-size:10.0pt'><o:p></o:p></span></b></p>
485
+ lang="EN-US" style='font-size:10.0pt'></span></b></p>
252
486
 
data/lib/isodoc/nist/html_convert.rb CHANGED
@@ -153,7 +153,7 @@ module IsoDoc
153
153
  return false unless c.name == "reviewernote"
154
154
  status = isoxml&.at(ns("//bibdata/status/stage"))&.text
155
155
  return true if status.nil?
156
- return ["final", "withdrawn"].include? status
156
+ /^final/.match status
157
157
  end
158
158
 
159
159
  def term_defs_boilerplate(div, source, term, preface)
@@ -340,7 +340,8 @@ module IsoDoc
340
340
  end
341
341
  end
342
342
 
343
- MIDDLE_CLAUSE = "//clause[parent::sections]|//terms[parent::sections]".freeze
343
+ MIDDLE_CLAUSE = "//clause[parent::sections] | "\
344
+ "//terms[parent::sections]".freeze
344
345
 
345
346
  def middle(isoxml, out)
346
347
  middle_title(out)
@@ -386,32 +387,6 @@ module IsoDoc
386
387
  end
387
388
  end
388
389
 
389
- =begin
390
- def prefaceprefix(nodes)
391
- i = 0
392
- nodes.each do |n|
393
- case n.name
394
- when "executivesummary" then @anchors[n["id"]][:prefix] = "ES"
395
- when "abstract" then @anchors[n["id"]][:prefix] = "ABS"
396
- when "reviewernote" then @anchors[n["id"]][:prefix] = "NTR"
397
- else
398
- @anchors[n["id"]][:prefix] = "PR" + i.to_s
399
- i += 1
400
- end
401
- end
402
- end
403
-
404
- def middle_section_asset_names(d)
405
- prefaceprefix(d.xpath("//xmlns:preface/child::*"))
406
- d.xpath("//xmlns:preface/child::*").each do |s|
407
- hierarchical_asset_names(s, @anchors[s["id"]][:prefix])
408
- end
409
- d.xpath("//xmlns:sections/child::*").each do |s|
410
- hierarchical_asset_names(s, @anchors[s["id"]][:label])
411
- end
412
- end
413
- =end
414
-
415
390
  def middle_section_asset_names(d)
416
391
  middle_sections =
417
392
  "//xmlns:preface/child::* | //xmlns:sections/child::*"
data/lib/isodoc/nist/i18n-en.yaml CHANGED
@@ -1,2 +1,5 @@
1
1
  clause: Section
2
2
  annex: Appendix
3
+ draft-wip-boilerplate: This document is currently under development. The draft is not yet complete, and organizations should not attempt to implement it. The content is in an early stage of development, rough, incomplete and experimental; it has not been extensively edited or vetted. This provides an insider view of the iterative process to develop the content and it gives NIST an opportunity to share early thoughts, ideas, and approaches with the community. NIST welcomes early informal feedback and comments, which will be adjudicated after the specified public comment period.
4
+ draft-prelim-boilerplate: This document incorporates comments from the work-in-progress draft. It is a relatively cohesive document and is considered stable, although there are gaps in the content and the overall document is incomplete. Some changes are expected. Organizations may consider experimenting with guidelines, with the understanding that they will identify gaps and challenges. NIST welcomes early informal feedback and comments, which will be adjudicated after the specified public comment period; a full public draft is expected to follow.
5
+ draft-public-boilerplate: This draft represents a complete document that is released for public comment as part of NIST’s official review process, in support of an open and transparent process for developing guidelines and standards. The language is normalized and is consistent throughout the document. Comments received during previous review cycles (if any) have been adjudicated and are addressed in this release. Early adopters may attempt to implement the guidelines in a test or development environment; however, comments received on this draft may cause NIST to determine that a subsequent public draft and comment period is necessary. The content of this document will not be considered as “final” until formally published and announced by NIST.
data/lib/isodoc/nist/metadata.rb CHANGED
@@ -1,5 +1,4 @@
1
1
  require "isodoc"
2
- require "twitter_cldr"
3
2
 
4
3
  module IsoDoc
5
4
  module NIST
@@ -36,26 +35,32 @@ module IsoDoc
36
35
  set(:docidentifier, docid)
37
36
  set(:docidentifier_long, docid_long)
38
37
  d = draft_prefix(isoxml) and set(:draft_prefix, d)
38
+ d = iter_code(isoxml) and set(:iteration_code, d)
39
39
  set(:docnumber, docnumber)
40
40
  end
41
41
 
42
42
  def draft_prefix(isoxml)
43
43
  docstatus = isoxml.at(ns("//bibdata/status/stage"))&.text
44
- return nil unless docstatus &&
45
- !%w(final withdrawn).include?(docstatus)
46
- iter = isoxml.at(ns("//bibdata/status/iteration"))&.text
44
+ return nil unless docstatus && /^draft/.match(docstatus)
45
+ iter = iter_code(isoxml)
47
46
  prefix = "DRAFT "
48
- /^\d+$/.match iter and
49
- iter = iter.to_i.localize.to_rbnf_s("OrdinalRules", "digits-ordinal")
50
- prefix += "(#{iter}) " if iter
47
+ iter and prefix += "(#{iter}) "
51
48
  prefix
52
49
  end
53
50
 
51
+ def iter_code(isoxml)
52
+ docstatus = isoxml.at(ns("//bibdata/status/stage"))&.text
53
+ return nil unless docstatus == "draft-public"
54
+ iter = isoxml.at(ns("//bibdata/status/iteration"))&.text || "1"
55
+ return "IPD" if iter == "1"
56
+ return "FPD" if iter.downcase == "final"
57
+ "#{iter}PD"
58
+ end
59
+
54
60
  def draftinfo(draft, revdate)
55
61
  draftinfo = ""
56
62
  if draft
57
63
  draftinfo = " #{@labels["draft_label"]} #{draft}"
58
- #draftinfo += ", #{revdate}" if revdate
59
64
  end
60
65
  IsoDoc::Function::I18n::l10n(draftinfo, @lang, @script)
61
66
  end
@@ -63,23 +68,26 @@ module IsoDoc
63
68
  def docstatus(isoxml, _out)
64
69
  docstatus = isoxml.at(ns("//bibdata/status/stage"))&.text
65
70
  iter = isoxml.at(ns("//bibdata/status/iteration"))&.text
66
- docstatus = adjust_docstatus(docstatus, iter)
67
- set(:unpublished, docstatus != "final")
71
+ set(:unpublished, !/^draft/.match(docstatus).nil?)
68
72
  set(:iteration, iter) if iter
69
73
  set(:status, status_print(docstatus || "final"))
70
74
  end
71
75
 
72
- def adjust_docstatus(status, iter)
73
- return status unless iter and status
74
- status = "initial-public-draft" if status == "public-draft" &&
75
- (iter == "1" || iter == "initial")
76
- status = "final-public-draft" if status == "public-draft" &&
77
- (iter == "final")
78
- status
76
+ def status_print(status)
77
+ case status
78
+ when "draft-internal" then "Internal Draft"
79
+ when "draft-wip" then "Work In Progress Draft"
80
+ when "draft-prelim" then "Preliminary Draft"
81
+ when "draft-public" then "Public Draft"
82
+ when "draft-retire" then "Retired Draft"
83
+ when "draft-withdrawn" then "Withdrawn Draft"
84
+ when "final" then "Final"
85
+ when "final-review" then "Under Review"
86
+ when "final-withdrawn" then "Withdrawn"
87
+ end
79
88
  end
80
89
 
81
90
  def version(isoxml, _out)
82
- #require "byebug"; byebug
83
91
  super
84
92
  revdate = get[:revdate]
85
93
  set(:revdate_monthyear, monthyr(revdate))
@@ -142,7 +150,7 @@ module IsoDoc
142
150
  def relations1(isoxml, type)
143
151
  ret = []
144
152
  isoxml.xpath(ns("//bibdata/relation[@type = '#{type}']")).each do |x|
145
- ret << x.at(ns(".//docidentifier")).text if x.at(ns(".//docidentifier"))
153
+ id = x&.at(ns(".//docidentifier"))&.text and ret << id
146
154
  end
147
155
  ret
148
156
  end
data/lib/isodoc/nist/pdf_convert.rb CHANGED
@@ -128,9 +128,9 @@ module IsoDoc
128
128
 
129
129
  def skip_render(c, isoxml)
130
130
  return false unless c.name == "reviewernote"
131
- status = isoxml&.at(ns("//bibdata/status"))&.text
131
+ status = isoxml&.at(ns("//bibdata/status/stage"))&.text
132
132
  return true if status.nil?
133
- return ["published", "withdrawn"].include? status
133
+ /^final/.match status
134
134
  end
135
135
 
136
136
  def term_defs_boilerplate(div, source, term, preface)
data/lib/isodoc/nist/word_convert.rb CHANGED
@@ -270,9 +270,9 @@ module IsoDoc
270
270
 
271
271
  def skip_render(c, isoxml)
272
272
  return false unless c.name == "reviewernote"
273
- status = isoxml&.at(ns("//bibdata/status"))&.text
273
+ status = isoxml&.at(ns("//bibdata/status/stage"))&.text
274
274
  return true if status.nil?
275
- return ["published", "withdrawn"].include? status
275
+ /^final/.match status
276
276
  end
277
277
 
278
278
  def term_defs_boilerplate(div, source, term, preface)
data/lib/metanorma/nist/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module NIST
3
- VERSION = "0.0.6"
3
+ VERSION = "0.0.7"
4
4
  end
5
5
  end
data/metanorma-nist.gemspec CHANGED
@@ -29,7 +29,6 @@ Gem::Specification.new do |spec|
29
29
 
30
30
  spec.add_dependency "metanorma-standoc", "~> 1.1.0"
31
31
  spec.add_dependency "isodoc", "~> 0.9.0"
32
- spec.add_dependency "twitter_cldr"
33
32
 
34
33
  spec.add_development_dependency "bundler", "~> 2.0.1"
35
34
  spec.add_development_dependency "byebug", "~> 9.1"
@@ -42,4 +41,5 @@ Gem::Specification.new do |spec|
42
41
  spec.add_development_dependency "simplecov", "~> 0.15"
43
42
  spec.add_development_dependency "timecop", "~> 0.9"
44
43
  spec.add_development_dependency "metanorma", "~> 0.3.0"
44
+ spec.add_development_dependency "nistbib", "~> 0.1.0"
45
45
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-nist
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.6
4
+ version: 0.0.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2019-04-04 00:00:00.000000000 Z
11
+ date: 2019-04-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: asciidoctor
@@ -80,20 +80,6 @@ dependencies:
80
80
  - - "~>"
81
81
  - !ruby/object:Gem::Version
82
82
  version: 0.9.0
83
- - !ruby/object:Gem::Dependency
84
- name: twitter_cldr
85
- requirement: !ruby/object:Gem::Requirement
86
- requirements:
87
- - - ">="
88
- - !ruby/object:Gem::Version
89
- version: '0'
90
- type: :runtime
91
- prerelease: false
92
- version_requirements: !ruby/object:Gem::Requirement
93
- requirements:
94
- - - ">="
95
- - !ruby/object:Gem::Version
96
- version: '0'
97
83
  - !ruby/object:Gem::Dependency
98
84
  name: bundler
99
85
  requirement: !ruby/object:Gem::Requirement
@@ -248,9 +234,23 @@ dependencies:
248
234
  - - "~>"
249
235
  - !ruby/object:Gem::Version
250
236
  version: 0.3.0
237
+ - !ruby/object:Gem::Dependency
238
+ name: nistbib
239
+ requirement: !ruby/object:Gem::Requirement
240
+ requirements:
241
+ - - "~>"
242
+ - !ruby/object:Gem::Version
243
+ version: 0.1.0
244
+ type: :development
245
+ prerelease: false
246
+ version_requirements: !ruby/object:Gem::Requirement
247
+ requirements:
248
+ - - "~>"
249
+ - !ruby/object:Gem::Version
250
+ version: 0.1.0
251
251
  description: 'Metanorma NIST gem.
252
252
 
253
- '
253
+ '
254
254
  email:
255
255
  - open.source@ribose.com
256
256
  executables: []