metanorma-nist 0.1.4 → 0.1.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (12) hide show
  1. checksums.yaml +5 -5
  2. data/README.adoc +8 -8
  3. data/lib/asciidoctor/nist/basicdoc.rng +992 -0
  4. data/lib/asciidoctor/nist/biblio.rng +4 -4
  5. data/lib/asciidoctor/nist/converter.rb +10 -7
  6. data/lib/asciidoctor/nist/front.rb +0 -8
  7. data/lib/asciidoctor/nist/isodoc.rng +52 -388
  8. data/lib/asciidoctor/nist/isostandard.rng +77 -23
  9. data/lib/asciidoctor/nist/nist.rng +6 -8
  10. data/lib/isodoc/nist/metadata.rb +1 -1
  11. data/lib/metanorma/nist/version.rb +1 -1
  12. metadata +5 -4
data/lib/asciidoctor/nist/isostandard.rng CHANGED
@@ -92,6 +92,12 @@
92
92
  <data type="ID"/>
93
93
  </attribute>
94
94
  </optional>
95
+ <optional>
96
+ <attribute name="language"/>
97
+ </optional>
98
+ <optional>
99
+ <attribute name="script"/>
100
+ </optional>
95
101
  <optional>
96
102
  <attribute name="obligation">
97
103
  <choice>
@@ -118,6 +124,12 @@
118
124
  <data type="ID"/>
119
125
  </attribute>
120
126
  </optional>
127
+ <optional>
128
+ <attribute name="language"/>
129
+ </optional>
130
+ <optional>
131
+ <attribute name="script"/>
132
+ </optional>
121
133
  <optional>
122
134
  <attribute name="obligation">
123
135
  <choice>
@@ -149,6 +161,12 @@
149
161
  <data type="ID"/>
150
162
  </attribute>
151
163
  </optional>
164
+ <optional>
165
+ <attribute name="language"/>
166
+ </optional>
167
+ <optional>
168
+ <attribute name="script"/>
169
+ </optional>
152
170
  <optional>
153
171
  <attribute name="inline-header">
154
172
  <data type="boolean"/>
@@ -212,6 +230,12 @@
212
230
  <data type="ID"/>
213
231
  </attribute>
214
232
  </optional>
233
+ <optional>
234
+ <attribute name="language"/>
235
+ </optional>
236
+ <optional>
237
+ <attribute name="script"/>
238
+ </optional>
215
239
  <optional>
216
240
  <attribute name="obligation">
217
241
  <choice>
@@ -230,6 +254,12 @@
230
254
  <data type="ID"/>
231
255
  </attribute>
232
256
  </optional>
257
+ <optional>
258
+ <attribute name="language"/>
259
+ </optional>
260
+ <optional>
261
+ <attribute name="script"/>
262
+ </optional>
233
263
  <optional>
234
264
  <attribute name="obligation">
235
265
  <choice>
@@ -303,6 +333,12 @@
303
333
  <data type="ID"/>
304
334
  </attribute>
305
335
  </optional>
336
+ <optional>
337
+ <attribute name="language"/>
338
+ </optional>
339
+ <optional>
340
+ <attribute name="script"/>
341
+ </optional>
306
342
  <optional>
307
343
  <attribute name="inline-header">
308
344
  <data type="boolean"/>
@@ -525,6 +561,29 @@
525
561
  <value>guide</value>
526
562
  </choice>
527
563
  </define>
564
+ <define name="structuredidentifier">
565
+ <element name="structuredidentifier">
566
+ <optional>
567
+ <attribute name="type"/>
568
+ </optional>
569
+ <group>
570
+ <ref name="documentnumber"/>
571
+ <optional>
572
+ <ref name="tc-documentnumber"/>
573
+ </optional>
574
+ </group>
575
+ </element>
576
+ </define>
577
+ <define name="foreword">
578
+ <element name="foreword">
579
+ <ref name="Basic-Section"/>
580
+ </element>
581
+ </define>
582
+ <define name="introduction">
583
+ <element name="introduction">
584
+ <ref name="Content-Section"/>
585
+ </element>
586
+ </define>
528
587
  </include>
529
588
  <!-- end overrides -->
530
589
  <!--
@@ -581,29 +640,6 @@
581
640
  <ref name="Basic-Section"/>
582
641
  </element>
583
642
  </define>
584
- <define name="foreword">
585
- <element name="foreword">
586
- <ref name="Basic-Section"/>
587
- </element>
588
- </define>
589
- <define name="introduction">
590
- <element name="introduction">
591
- <ref name="Content-Section"/>
592
- </element>
593
- </define>
594
- <define name="structuredidentifier">
595
- <element name="structuredidentifier">
596
- <optional>
597
- <attribute name="type"/>
598
- </optional>
599
- <group>
600
- <ref name="documentnumber"/>
601
- <optional>
602
- <ref name="tc-documentnumber"/>
603
- </optional>
604
- </group>
605
- </element>
606
- </define>
607
643
  <define name="documentnumber">
608
644
  <element name="project-number">
609
645
  <optional>
@@ -662,6 +698,12 @@
662
698
  <data type="ID"/>
663
699
  </attribute>
664
700
  </optional>
701
+ <optional>
702
+ <attribute name="language"/>
703
+ </optional>
704
+ <optional>
705
+ <attribute name="script"/>
706
+ </optional>
665
707
  <optional>
666
708
  <attribute name="inline-header">
667
709
  <data type="boolean"/>
@@ -723,6 +765,12 @@
723
765
  <data type="ID"/>
724
766
  </attribute>
725
767
  </optional>
768
+ <optional>
769
+ <attribute name="language"/>
770
+ </optional>
771
+ <optional>
772
+ <attribute name="script"/>
773
+ </optional>
726
774
  <optional>
727
775
  <attribute name="inline-header">
728
776
  <data type="boolean"/>
@@ -755,6 +803,12 @@
755
803
  <data type="ID"/>
756
804
  </attribute>
757
805
  </optional>
806
+ <optional>
807
+ <attribute name="language"/>
808
+ </optional>
809
+ <optional>
810
+ <attribute name="script"/>
811
+ </optional>
758
812
  <optional>
759
813
  <attribute name="inline-header">
760
814
  <data type="boolean"/>
data/lib/asciidoctor/nist/nist.rng CHANGED
@@ -129,6 +129,12 @@
129
129
  <data type="ID"/>
130
130
  </attribute>
131
131
  </optional>
132
+ <optional>
133
+ <attribute name="language"/>
134
+ </optional>
135
+ <optional>
136
+ <attribute name="script"/>
137
+ </optional>
132
138
  <optional>
133
139
  <attribute name="inline-header">
134
140
  <data type="boolean"/>
@@ -167,19 +173,11 @@
167
173
  <optional>
168
174
  <ref name="doctype"/>
169
175
  </optional>
170
- <oneOrMore>
171
- <ref name="bkeyword"/>
172
- </oneOrMore>
173
176
  <optional>
174
177
  <ref name="commentperiod"/>
175
178
  </optional>
176
179
  </define>
177
180
  </include>
178
- <define name="bkeyword">
179
- <element name="keyword">
180
- <text/>
181
- </element>
182
- </define>
183
181
  <define name="commentperiod">
184
182
  <element name="commentperiod">
185
183
  <element name="from">
data/lib/isodoc/nist/metadata.rb CHANGED
@@ -215,7 +215,7 @@ module IsoDoc
215
215
 
216
216
  def keywords(ixml, _out)
217
217
  keywords = []
218
- ixml.xpath(ns("//bibdata/ext/keyword")).each do |kw|
218
+ ixml.xpath(ns("//bibdata/keyword")).each do |kw|
219
219
  keywords << kw.text
220
220
  end
221
221
  set(:keywords, keywords)
data/lib/metanorma/nist/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module NIST
3
- VERSION = "0.1.4"
3
+ VERSION = "0.1.5"
4
4
  end
5
5
  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.1.4
4
+ version: 0.1.5
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-07-30 00:00:00.000000000 Z
11
+ date: 2019-08-05 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: asciidoctor
@@ -278,7 +278,7 @@ dependencies:
278
278
  version: 0.3.0
279
279
  description: 'Metanorma NIST gem.
280
280
 
281
- '
281
+ '
282
282
  email:
283
283
  - open.source@ribose.com
284
284
  executables: []
@@ -298,6 +298,7 @@ files:
298
298
  - bin/rspec
299
299
  - bin/setup
300
300
  - lib/asciidoctor/nist.rb
301
+ - lib/asciidoctor/nist/basicdoc.rng
301
302
  - lib/asciidoctor/nist/biblio.rng
302
303
  - lib/asciidoctor/nist/boilerplate.rb
303
304
  - lib/asciidoctor/nist/cleanup.rb
@@ -354,7 +355,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
354
355
  version: '0'
355
356
  requirements: []
356
357
  rubyforge_project:
357
- rubygems_version: 2.5.2.3
358
+ rubygems_version: 2.7.6
358
359
  signing_key:
359
360
  specification_version: 4
360
361
  summary: Metanorma NIST gem.