metanorma-ogc 0.2.8 → 0.2.9

Sign up to get free protection for your applications and to get access to all the features.
Files changed (14) 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/README.adoc +2 -3
  6. data/lib/asciidoctor/ogc/basicdoc.rng +17 -2
  7. data/lib/asciidoctor/ogc/biblio.rng +11 -4
  8. data/lib/asciidoctor/ogc/isodoc.rng +6 -6
  9. data/lib/asciidoctor/ogc/isostandard.rng +10 -5
  10. data/lib/asciidoctor/ogc/ogc.rng +24 -11
  11. data/lib/isodoc/ogc/html/ogc.scss +1 -1
  12. data/lib/metanorma/ogc/version.rb +1 -1
  13. data/metanorma-ogc.gemspec +0 -1
  14. metadata +2 -16
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 7f445d36f0ad3b59ddb508a02ca1ca10a9d5bd11a8b1801eacabd9e65a11be8d
4
- data.tar.gz: 59738a68ffd41eb0a372d238069fb93bf3f1f3536c38a087364ec9f5ec24246b
3
+ metadata.gz: d41c94f6c5235bd9608de229a92f399595a1884d3d02ab39d8e8fe8deb0354bf
4
+ data.tar.gz: 6cf593114c1695d886c65f3a9a104fbe25b3db30cd18f3a3e99a05947c70f42d
5
5
  SHA512:
6
- metadata.gz: fa9dafae47b31024aeeabf37a3ef5c029f4bb21a076b1bd0f18c75b75fed2db551122781d6b341b35716e0e66fa4d01a9d245641ce4c4520cf265ed8b65e55a2
7
- data.tar.gz: 92dbb5dca9f69df3b206432bb65c1302bcc81e2233b37e1b63342d01b55d1c3810eb979da3a316475d4f5600ead2c2f53a0c587806455a703c4853f26bcf42b6
6
+ metadata.gz: 5dbd25ed142e0c53ca3243cab6ea8b7a0de156ab90d7687d9b49b17c48a3c6006f9039515c3b93990e2d865c632eb1042fb66d9a5c55d96669a7aec036c738d0
7
+ data.tar.gz: 150a39555ef6af6c6748d2fd267292b8033dfa3576482e23b8b271662883d06b5138050f24fc4ef010d82dbf22c981789e84400ad03c53b6061faa995aaca325
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/README.adoc CHANGED
@@ -86,7 +86,6 @@ See https://www.metanorma.com/author/ogc/[Write Open Geospatial Consortium docum
86
86
 
87
87
  == Examples
88
88
 
89
- * link:spec/examples/rfc6350.adoc[] is an Metanorma AsciiDoc version of https://tools.ietf.org/html/rfc6350[RFC 6350].
90
- * link:spec/examples/rfc6350.html[] is an HTML file generated from the Asciidoctor.
91
- * link:spec/examples/rfc6350.doc[] is a Word document generated from the Asciidoctor.
89
+ * Example documents are avalable at the https://github.com/metanorma/mn-samples-ogc[mn-samples-ogc] repository.
90
+ * Document templates are available at the https://github.com/metanorma/mn-templates-ogc[mn-templates-ogc] repository.
92
91
 
data/lib/asciidoctor/ogc/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>
@@ -284,6 +284,9 @@
284
284
  <attribute name="id">
285
285
  <data type="ID"/>
286
286
  </attribute>
287
+ <optional>
288
+ <attribute name="alt"/>
289
+ </optional>
287
290
  <optional>
288
291
  <ref name="tname"/>
289
292
  </optional>
@@ -564,6 +567,7 @@
564
567
  <ref name="pagebreak"/>
565
568
  <ref name="bookmark"/>
566
569
  <ref name="image"/>
570
+ <ref name="index"/>
567
571
  </choice>
568
572
  </define>
569
573
  <define name="PureTextElement">
@@ -688,6 +692,17 @@
688
692
  <empty/>
689
693
  </element>
690
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>
691
706
  <!-- bare ID element, used for referencing arbitrary spans of text -->
692
707
  <define name="bookmark">
693
708
  <element name="bookmark">
data/lib/asciidoctor/ogc/biblio.rng CHANGED
@@ -34,7 +34,7 @@
34
34
  </data>
35
35
  </define>
36
36
  <start>
37
- <ref name="relaton_collection"/>
37
+ <ref name="bibitem"/>
38
38
  </start>
39
39
  <define name="status">
40
40
  <element name="status">
@@ -278,10 +278,12 @@
278
278
  </define>
279
279
  <define name="organization">
280
280
  <element name="organization">
281
- <ref name="orgname"/>
282
- <optional>
281
+ <oneOrMore>
282
+ <ref name="orgname"/>
283
+ </oneOrMore>
284
+ <zeroOrMore>
283
285
  <ref name="subdivision"/>
284
- </optional>
286
+ </zeroOrMore>
285
287
  <optional>
286
288
  <ref name="abbreviation"/>
287
289
  </optional>
@@ -357,6 +359,9 @@
357
359
  </define>
358
360
  <define name="phone">
359
361
  <element name="phone">
362
+ <optional>
363
+ <attribute name="type"/>
364
+ </optional>
360
365
  <text/>
361
366
  </element>
362
367
  </define>
@@ -1024,6 +1029,8 @@
1024
1029
  <value>correctedBy</value>
1025
1030
  <value>revises</value>
1026
1031
  <value>revisedBy</value>
1032
+ <value>describes</value>
1033
+ <value>describedBy</value>
1027
1034
  </choice>
1028
1035
  </define>
1029
1036
  <define name="docrelation">
data/lib/asciidoctor/ogc/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/ogc/isostandard.rng CHANGED
@@ -6,7 +6,9 @@
6
6
  </start>
7
7
  <define name="organization">
8
8
  <element name="organization">
9
- <ref name="orgname"/>
9
+ <oneOrMore>
10
+ <ref name="orgname"/>
11
+ </oneOrMore>
10
12
  <optional>
11
13
  <ref name="abbreviation"/>
12
14
  </optional>
@@ -74,10 +76,12 @@
74
76
  <define name="sections">
75
77
  <element name="sections">
76
78
  <ref name="clause"/>
77
- <choice>
78
- <ref name="term-clause"/>
79
- <ref name="terms"/>
80
- </choice>
79
+ <optional>
80
+ <choice>
81
+ <ref name="term-clause"/>
82
+ <ref name="terms"/>
83
+ </choice>
84
+ </optional>
81
85
  <optional>
82
86
  <ref name="definitions"/>
83
87
  </optional>
@@ -395,6 +399,7 @@
395
399
  </optional>
396
400
  <choice>
397
401
  <ref name="image"/>
402
+ <ref name="pre"/>
398
403
  <oneOrMore>
399
404
  <ref name="subfigure"/>
400
405
  </oneOrMore>
data/lib/asciidoctor/ogc/ogc.rng CHANGED
@@ -51,21 +51,34 @@
51
51
  </define>
52
52
  <define name="DocumentType">
53
53
  <choice>
54
- <value>standard</value>
55
- <value>standard-with-suite</value>
56
54
  <value>abstract-specification</value>
57
- <value>community-standard</value>
58
- <value>profile</value>
59
55
  <value>best-practice</value>
60
- <value>engineering-report</value>
56
+ <value>candidate-standard</value>
57
+ <value>conformance-class</value>
58
+ <value>change-request</value>
59
+ <value>community-practice</value>
60
+ <value>community-standard</value>
61
61
  <value>discussion-paper</value>
62
- <value>reference-model</value>
63
- <value>user-guide</value>
62
+ <value>draft-discussion-paper</value>
63
+ <value>interoperability-program-report</value>
64
+ <value>implementation-standard</value>
65
+ <value>implementation-standard-corrigendum</value>
66
+ <value>extension-package-standard</value>
67
+ <value>notes</value>
68
+ <value>ogc-reference-model</value>
69
+ <value>profile-corrigendum</value>
70
+ <value>public-engineering-report</value>
64
71
  <value>policy</value>
65
- <value>guide</value>
66
- <value>amendment</value>
67
- <value>technical-corrigendum</value>
68
- <value>administrative</value>
72
+ <value>policy-name-type-specification</value>
73
+ <value>primer</value>
74
+ <value>profile</value>
75
+ <value>request-for-comment</value>
76
+ <value>retired</value>
77
+ <value>standard-application-profile</value>
78
+ <value>test-suite</value>
79
+ <value>whitepaper</value>
80
+ <value>approved-technical-baseline</value>
81
+ <value>recommendation-paper</value>
69
82
  </choice>
70
83
  </define>
71
84
  <define name="editorialgroup">
data/lib/isodoc/ogc/html/ogc.scss CHANGED
@@ -25,7 +25,7 @@ p.pseudocode, li.pseudocode, div.pseudocode
25
25
  text-align:left;
26
26
  mso-pagination:widow-orphan;
27
27
  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;
28
- font-size:10.0pt;
28
+ font-size:10.5pt;
29
29
  font-family:$bodyfont;
30
30
  mso-fareast-font-family:Calibri;
31
31
  mso-bidi-font-family:"Courier New";
data/lib/metanorma/ogc/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Ogc
3
- VERSION = "0.2.8"
3
+ VERSION = "0.2.9"
4
4
  end
5
5
  end
data/metanorma-ogc.gemspec CHANGED
@@ -30,7 +30,6 @@ Gem::Specification.new do |spec|
30
30
  spec.add_dependency "isodoc", "~> 1.0.0"
31
31
  spec.add_dependency "iso-639"
32
32
 
33
- spec.add_development_dependency "bundler", "~> 2.0.1"
34
33
  spec.add_development_dependency "byebug", "~> 9.1"
35
34
  spec.add_development_dependency "equivalent-xml", "~> 0.6"
36
35
  spec.add_development_dependency "guard", "~> 2.14"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-ogc
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.8
4
+ version: 0.2.9
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-11-19 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
@@ -80,20 +80,6 @@ dependencies:
80
80
  - - ">="
81
81
  - !ruby/object:Gem::Version
82
82
  version: '0'
83
- - !ruby/object:Gem::Dependency
84
- name: bundler
85
- requirement: !ruby/object:Gem::Requirement
86
- requirements:
87
- - - "~>"
88
- - !ruby/object:Gem::Version
89
- version: 2.0.1
90
- type: :development
91
- prerelease: false
92
- version_requirements: !ruby/object:Gem::Requirement
93
- requirements:
94
- - - "~>"
95
- - !ruby/object:Gem::Version
96
- version: 2.0.1
97
83
  - !ruby/object:Gem::Dependency
98
84
  name: byebug
99
85
  requirement: !ruby/object:Gem::Requirement