metanorma-nist 0.2.9 → 0.2.10

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 +4 -4
  2. data/.github/workflows/macos.yml +3 -2
  3. data/.github/workflows/ubuntu.yml +3 -2
  4. data/.github/workflows/windows.yml +3 -2
  5. data/lib/asciidoctor/nist/basicdoc.rng +14 -2
  6. data/lib/asciidoctor/nist/isodoc.rng +6 -6
  7. data/lib/asciidoctor/nist/isostandard.rng +7 -4
  8. data/lib/isodoc/nist/html/nist.scss +1 -1
  9. data/lib/isodoc/nist/html/nist_cswp.scss +1 -1
  10. data/lib/metanorma/nist/version.rb +1 -1
  11. data/metanorma-nist.gemspec +0 -1
  12. metadata +2 -16
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 6078cd636ca24db811529a026c324f4c86252ca08eefff7bf7ec32af86d28ec8
4
- data.tar.gz: 2be8abf10e94df1164a1f885c3d944813e89337d822c09528a1a8ac8041ee591
3
+ metadata.gz: 5a26f12758a0930fa38d84162c26122ba2fadd5b519ebfaf5bc9b2df0d3008a4
4
+ data.tar.gz: b89c1a6d17f7899ef7c4cd11700ed60d0c402ad891a679f3c96732f4c50088ee
5
5
  SHA512:
6
- metadata.gz: 2324ac3828b7fb1aab2892dbf362bcb7debac2d3bb608652c54ae175a86506b05821a3424dc334261c168998adad6725741967ed124c35b269d93fd21434d91b
7
- data.tar.gz: 454a9b7a52affeaceed28ca2aeeca746e101ec287f69af13aa67df88fa7e6fcb9771407c68a6f9f2984c2ba1ba17b36c4d0ea965b466a9ed73d27bdacafc5166
6
+ metadata.gz: 8bb15f1320bad6569a35f6a0d65791c3d12b9726f53cfcaf982157e19ded2e3e1c59c849b111174bd15bbb093723087db0d3722885968e911aab1bd121626807
7
+ data.tar.gz: b06e45fd042adb8228c4c8ed75210547dab5fa45708ded8f7bb7c0d0fe83119773b8523b55b6373bcdae044420c376463b3e261279b14f2d89d90bce3c95b846
data/.github/workflows/macos.yml CHANGED
@@ -2,13 +2,14 @@
2
2
  # use ci-master https://github.com/metanorma/metanorma-build-scripts
3
3
  name: macos
4
4
 
5
- on: [push]
5
+ on: [push, pull_request]
6
6
 
7
7
  jobs:
8
8
  test-macos:
9
9
  name: Test on Ruby ${{ matrix.ruby }} macOS
10
10
  runs-on: macos-latest
11
11
  strategy:
12
+ fail-fast: false
12
13
  matrix:
13
14
  ruby: [ '2.6', '2.5', '2.4' ]
14
15
  steps:
@@ -20,7 +21,7 @@ jobs:
20
21
  architecture: 'x64'
21
22
  - name: Update gems
22
23
  run: |
23
- sudo gem install bundler -v "~> 2" --force
24
+ sudo gem install bundler --force
24
25
  bundle install --jobs 4 --retry 3
25
26
  - name: Use Node
26
27
  uses: actions/setup-node@v1
data/.github/workflows/ubuntu.yml CHANGED
@@ -2,13 +2,14 @@
2
2
  # use ci-master https://github.com/metanorma/metanorma-build-scripts
3
3
  name: ubuntu
4
4
 
5
- on: [push]
5
+ on: [push, pull_request]
6
6
 
7
7
  jobs:
8
8
  test-linux:
9
9
  name: Test on Ruby ${{ matrix.ruby }} Ubuntu
10
10
  runs-on: ubuntu-latest
11
11
  strategy:
12
+ fail-fast: false
12
13
  matrix:
13
14
  ruby: [ '2.6', '2.5', '2.4' ]
14
15
  steps:
@@ -20,7 +21,7 @@ jobs:
20
21
  architecture: 'x64'
21
22
  - name: Update gems
22
23
  run: |
23
- gem install bundler -v "~> 2"
24
+ gem install bundler
24
25
  bundle install --jobs 4 --retry 3
25
26
  - name: Use Node
26
27
  uses: actions/setup-node@v1
data/.github/workflows/windows.yml CHANGED
@@ -2,13 +2,14 @@
2
2
  # use ci-master https://github.com/metanorma/metanorma-build-scripts
3
3
  name: windows
4
4
 
5
- on: [push]
5
+ on: [push, pull_request]
6
6
 
7
7
  jobs:
8
8
  test-windows:
9
9
  name: Test on Ruby ${{ matrix.ruby }} Windows
10
10
  runs-on: windows-latest
11
11
  strategy:
12
+ fail-fast: false
12
13
  matrix:
13
14
  ruby: [ '2.6', '2.5', '2.4' ]
14
15
  steps:
@@ -21,7 +22,7 @@ jobs:
21
22
  - name: Update gems
22
23
  shell: pwsh
23
24
  run: |
24
- gem install bundler -v "~> 2"
25
+ gem install bundler
25
26
  bundle config --local path vendor/bundle
26
27
  bundle update
27
28
  bundle install --jobs 4 --retry 3
data/lib/asciidoctor/nist/basicdoc.rng CHANGED
@@ -52,9 +52,9 @@
52
52
  <optional>
53
53
  <ref name="section-title"/>
54
54
  </optional>
55
- <optional>
55
+ <zeroOrMore>
56
56
  <ref name="BasicBlock"/>
57
- </optional>
57
+ </zeroOrMore>
58
58
  <zeroOrMore>
59
59
  <ref name="note"/>
60
60
  </zeroOrMore>
@@ -567,6 +567,7 @@
567
567
  <ref name="pagebreak"/>
568
568
  <ref name="bookmark"/>
569
569
  <ref name="image"/>
570
+ <ref name="index"/>
570
571
  </choice>
571
572
  </define>
572
573
  <define name="PureTextElement">
@@ -691,6 +692,17 @@
691
692
  <empty/>
692
693
  </element>
693
694
  </define>
695
+ <define name="index">
696
+ <element name="index">
697
+ <attribute name="primary"/>
698
+ <optional>
699
+ <attribute name="secondary"/>
700
+ </optional>
701
+ <optional>
702
+ <attribute name="tertiary"/>
703
+ </optional>
704
+ </element>
705
+ </define>
694
706
  <!-- bare ID element, used for referencing arbitrary spans of text -->
695
707
  <define name="bookmark">
696
708
  <element name="bookmark">
data/lib/asciidoctor/nist/isodoc.rng CHANGED
@@ -207,9 +207,9 @@
207
207
  </optional>
208
208
  <choice>
209
209
  <group>
210
- <optional>
210
+ <zeroOrMore>
211
211
  <ref name="BasicBlock"/>
212
- </optional>
212
+ </zeroOrMore>
213
213
  <zeroOrMore>
214
214
  <ref name="note"/>
215
215
  </zeroOrMore>
@@ -244,9 +244,9 @@
244
244
  </optional>
245
245
  <choice>
246
246
  <group>
247
- <optional>
247
+ <zeroOrMore>
248
248
  <ref name="BasicBlock"/>
249
- </optional>
249
+ </zeroOrMore>
250
250
  <zeroOrMore>
251
251
  <ref name="note"/>
252
252
  </zeroOrMore>
@@ -289,9 +289,9 @@
289
289
  </optional>
290
290
  <choice>
291
291
  <group>
292
- <optional>
292
+ <zeroOrMore>
293
293
  <ref name="BasicBlock"/>
294
- </optional>
294
+ </zeroOrMore>
295
295
  <zeroOrMore>
296
296
  <ref name="note"/>
297
297
  </zeroOrMore>
data/lib/asciidoctor/nist/isostandard.rng CHANGED
@@ -76,10 +76,12 @@
76
76
  <define name="sections">
77
77
  <element name="sections">
78
78
  <ref name="clause"/>
79
- <choice>
80
- <ref name="term-clause"/>
81
- <ref name="terms"/>
82
- </choice>
79
+ <optional>
80
+ <choice>
81
+ <ref name="term-clause"/>
82
+ <ref name="terms"/>
83
+ </choice>
84
+ </optional>
83
85
  <optional>
84
86
  <ref name="definitions"/>
85
87
  </optional>
@@ -397,6 +399,7 @@
397
399
  </optional>
398
400
  <choice>
399
401
  <ref name="image"/>
402
+ <ref name="pre"/>
400
403
  <oneOrMore>
401
404
  <ref name="subfigure"/>
402
405
  </oneOrMore>
data/lib/isodoc/nist/html/nist.scss CHANGED
@@ -195,7 +195,7 @@ p.pseudocode, li.pseudocode, div.pseudocode
195
195
  text-align:left;
196
196
  mso-pagination:widow-orphan;
197
197
  tab-stops:45.8pt 91.6pt 137.4pt 183.2pt 229.0pt 274.8pt 320.6pt 366.4pt 412.2pt 458.0pt 503.8pt 549.6pt 595.4pt 641.2pt 687.0pt 732.8pt;
198
- font-size:10.0pt;
198
+ font-size:12.0pt;
199
199
  font-family:$bodyfont;
200
200
  mso-fareast-font-family:Calibri;
201
201
  mso-bidi-font-family:"Courier New";
data/lib/isodoc/nist/html/nist_cswp.scss CHANGED
@@ -154,7 +154,7 @@ p.pseudocode, li.pseudocode, div.pseudocode
154
154
  text-align:left;
155
155
  mso-pagination:widow-orphan;
156
156
  tab-stops:45.8pt 91.6pt 137.4pt 183.2pt 229.0pt 274.8pt 320.6pt 366.4pt 412.2pt 458.0pt 503.8pt 549.6pt 595.4pt 641.2pt 687.0pt 732.8pt;
157
- font-size:10.0pt;
157
+ font-size:12.0pt;
158
158
  font-family:$bodyfont;
159
159
  mso-fareast-font-family:Calibri;
160
160
  mso-bidi-font-family:"Courier New";
data/lib/metanorma/nist/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module NIST
3
- VERSION = "0.2.9"
3
+ VERSION = "0.2.10"
4
4
  end
5
5
  end
data/metanorma-nist.gemspec CHANGED
@@ -33,7 +33,6 @@ Gem::Specification.new do |spec|
33
33
  spec.add_dependency "isodoc", "~> 1.0.0"
34
34
  #spec.add_dependency "relaton-nist", "~> 0.3.0"
35
35
 
36
- spec.add_development_dependency "bundler", "~> 2.0.1"
37
36
  spec.add_development_dependency "byebug", "~> 9.1"
38
37
  spec.add_development_dependency "equivalent-xml", "~> 0.6"
39
38
  spec.add_development_dependency "guard", "~> 2.14"
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.2.9
4
+ version: 0.2.10
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-12-13 00:00:00.000000000 Z
11
+ date: 2019-12-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: htmlentities
@@ -94,20 +94,6 @@ dependencies:
94
94
  - - "~>"
95
95
  - !ruby/object:Gem::Version
96
96
  version: 1.0.0
97
- - !ruby/object:Gem::Dependency
98
- name: bundler
99
- requirement: !ruby/object:Gem::Requirement
100
- requirements:
101
- - - "~>"
102
- - !ruby/object:Gem::Version
103
- version: 2.0.1
104
- type: :development
105
- prerelease: false
106
- version_requirements: !ruby/object:Gem::Requirement
107
- requirements:
108
- - - "~>"
109
- - !ruby/object:Gem::Version
110
- version: 2.0.1
111
97
  - !ruby/object:Gem::Dependency
112
98
  name: byebug
113
99
  requirement: !ruby/object:Gem::Requirement