metanorma-ogc 2.2.3 → 2.2.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (27) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/automerge.yml +31 -0
  3. data/lib/isodoc/ogc/html/htmlstyle.css +1 -1
  4. data/lib/isodoc/ogc/ogc.abstract-specification-topic.xsl +42 -14
  5. data/lib/isodoc/ogc/ogc.best-practice.xsl +42 -14
  6. data/lib/isodoc/ogc/ogc.change-request-supporting-document.xsl +42 -14
  7. data/lib/isodoc/ogc/ogc.community-practice.xsl +42 -14
  8. data/lib/isodoc/ogc/ogc.community-standard.xsl +42 -14
  9. data/lib/isodoc/ogc/ogc.discussion-paper.xsl +42 -14
  10. data/lib/isodoc/ogc/ogc.engineering-report.xsl +42 -14
  11. data/lib/isodoc/ogc/ogc.other.xsl +42 -14
  12. data/lib/isodoc/ogc/ogc.policy.xsl +42 -14
  13. data/lib/isodoc/ogc/ogc.reference-model.xsl +42 -14
  14. data/lib/isodoc/ogc/ogc.release-notes.xsl +42 -14
  15. data/lib/isodoc/ogc/ogc.standard.xsl +42 -14
  16. data/lib/isodoc/ogc/ogc.test-suite.xsl +42 -14
  17. data/lib/isodoc/ogc/ogc.user-guide.xsl +42 -14
  18. data/lib/isodoc/ogc/ogc.white-paper.xsl +26 -9
  19. data/lib/isodoc/ogc/xref.rb +19 -19
  20. data/lib/metanorma/ogc/basicdoc.rng +0 -27
  21. data/lib/metanorma/ogc/biblio-standoc.rng +164 -0
  22. data/lib/metanorma/ogc/biblio.rng +45 -18
  23. data/lib/metanorma/ogc/isodoc.rng +31 -194
  24. data/lib/metanorma/ogc/ogc.rng +1 -74
  25. data/lib/metanorma/ogc/relaton-ogc.rng +82 -0
  26. data/lib/metanorma/ogc/version.rb +1 -1
  27. metadata +5 -2
data/lib/metanorma/ogc/biblio.rng CHANGED
@@ -33,9 +33,10 @@
33
33
  <param name="pattern">([\+\-]?\d{4})((-?)((0[1-9]|1[0-2])((-?)([12]\d|0[1-9]|3[01]))?|W([0-4]\d|5[0-2])(-?[1-7])?|(00[1-9]|0[1-9]\d|[12]\d{2}|3([0-5]\d|6[1-6]))))?</param>
34
34
  </data>
35
35
  </define>
36
- <start>
37
- <ref name="bibitem"/>
38
- </start>
36
+ <!-- start = bibitem -->
37
+ <define name="BibData">
38
+ <ref name="BibliographicItem"/>
39
+ </define>
39
40
  <define name="status">
40
41
  <element name="status">
41
42
  <ref name="stage"/>
@@ -170,27 +171,25 @@
170
171
  </define>
171
172
  <define name="contributor">
172
173
  <element name="contributor">
173
- <zeroOrMore>
174
+ <oneOrMore>
174
175
  <ref name="role"/>
175
- </zeroOrMore>
176
+ </oneOrMore>
176
177
  <ref name="ContributorInfo"/>
177
178
  </element>
178
179
  </define>
179
180
  <define name="role">
180
181
  <element name="role">
181
- <optional>
182
- <attribute name="type">
183
- <choice>
184
- <value>author</value>
185
- <value>performer</value>
186
- <value>publisher</value>
187
- <value>editor</value>
188
- <value>adapter</value>
189
- <value>translator</value>
190
- <value>distributor</value>
191
- </choice>
192
- </attribute>
193
- </optional>
182
+ <attribute name="type">
183
+ <choice>
184
+ <value>author</value>
185
+ <value>performer</value>
186
+ <value>publisher</value>
187
+ <value>editor</value>
188
+ <value>adapter</value>
189
+ <value>translator</value>
190
+ <value>distributor</value>
191
+ </choice>
192
+ </attribute>
194
193
  <zeroOrMore>
195
194
  <ref name="roledescription"/>
196
195
  </zeroOrMore>
@@ -512,6 +511,17 @@
512
511
  </define>
513
512
  <define name="localityStack">
514
513
  <element name="localityStack">
514
+ <optional>
515
+ <attribute name="connective">
516
+ <choice>
517
+ <value>and</value>
518
+ <value>or</value>
519
+ <value>from</value>
520
+ <value>to</value>
521
+ <value/>
522
+ </choice>
523
+ </attribute>
524
+ </optional>
515
525
  <zeroOrMore>
516
526
  <ref name="locality"/>
517
527
  </zeroOrMore>
@@ -524,6 +534,17 @@
524
534
  </define>
525
535
  <define name="sourceLocalityStack">
526
536
  <element name="sourceLocalityStack">
537
+ <optional>
538
+ <attribute name="connective">
539
+ <choice>
540
+ <value>and</value>
541
+ <value>or</value>
542
+ <value>from</value>
543
+ <value>to</value>
544
+ <value/>
545
+ </choice>
546
+ </attribute>
547
+ </optional>
527
548
  <zeroOrMore>
528
549
  <ref name="sourceLocality"/>
529
550
  </zeroOrMore>
@@ -626,6 +647,9 @@
626
647
  <ref name="BibItemType"/>
627
648
  </attribute>
628
649
  </optional>
650
+ <optional>
651
+ <attribute name="schema-version"/>
652
+ </optional>
629
653
  <optional>
630
654
  <ref name="fetched"/>
631
655
  </optional>
@@ -720,6 +744,9 @@
720
744
  <ref name="BibItemType"/>
721
745
  </attribute>
722
746
  </optional>
747
+ <optional>
748
+ <attribute name="schema-version"/>
749
+ </optional>
723
750
  <optional>
724
751
  <ref name="fetched"/>
725
752
  </optional>
data/lib/metanorma/ogc/isodoc.rng CHANGED
@@ -19,19 +19,7 @@
19
19
  -->
20
20
  <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
21
21
  <include href="reqt.rng"/>
22
- <!-- include "biblio.rnc" { } -->
23
22
  <include href="basicdoc.rng">
24
- <start>
25
- <ref name="standard-document"/>
26
- </start>
27
- <define name="doctype">
28
- <element name="doctype">
29
- <optional>
30
- <attribute name="abbreviation"/>
31
- </optional>
32
- <ref name="DocumentType"/>
33
- </element>
34
- </define>
35
23
  <define name="admonition">
36
24
  <element name="admonition">
37
25
  <attribute name="type">
@@ -117,24 +105,6 @@
117
105
  </optional>
118
106
  </element>
119
107
  </define>
120
- <define name="bibitem">
121
- <element name="bibitem">
122
- <attribute name="id">
123
- <data type="ID"/>
124
- </attribute>
125
- <optional>
126
- <attribute name="hidden">
127
- <data type="boolean"/>
128
- </attribute>
129
- </optional>
130
- <optional>
131
- <attribute name="suppress_identifier">
132
- <data type="boolean"/>
133
- </attribute>
134
- </optional>
135
- <ref name="BibliographicItem"/>
136
- </element>
137
- </define>
138
108
  <define name="section-title">
139
109
  <element name="title">
140
110
  <zeroOrMore>
@@ -205,6 +175,15 @@
205
175
  <data type="boolean"/>
206
176
  </attribute>
207
177
  </optional>
178
+ <optional>
179
+ <attribute name="style">
180
+ <choice>
181
+ <value>basic</value>
182
+ <value>full</value>
183
+ <value>short</value>
184
+ </choice>
185
+ </attribute>
186
+ </optional>
208
187
  <ref name="XrefBody"/>
209
188
  </element>
210
189
  </define>
@@ -239,42 +218,6 @@
239
218
  <ref name="PureTextElement"/>
240
219
  </oneOrMore>
241
220
  </define>
242
- <define name="localityStack">
243
- <element name="localityStack">
244
- <optional>
245
- <attribute name="connective">
246
- <choice>
247
- <value>and</value>
248
- <value>or</value>
249
- <value>from</value>
250
- <value>to</value>
251
- <value/>
252
- </choice>
253
- </attribute>
254
- </optional>
255
- <zeroOrMore>
256
- <ref name="locality"/>
257
- </zeroOrMore>
258
- </element>
259
- </define>
260
- <define name="sourceLocalityStack">
261
- <element name="sourceLocalityStack">
262
- <optional>
263
- <attribute name="connective">
264
- <choice>
265
- <value>and</value>
266
- <value>or</value>
267
- <value>from</value>
268
- <value>to</value>
269
- <value/>
270
- </choice>
271
- </attribute>
272
- </optional>
273
- <zeroOrMore>
274
- <ref name="sourceLocality"/>
275
- </zeroOrMore>
276
- </element>
277
- </define>
278
221
  <define name="ul">
279
222
  <element name="ul">
280
223
  <attribute name="id">
@@ -818,21 +761,6 @@
818
761
  </zeroOrMore>
819
762
  </element>
820
763
  </define>
821
- <define name="BibDataExtensionType">
822
- <ref name="doctype"/>
823
- <optional>
824
- <ref name="docsubtype"/>
825
- </optional>
826
- <optional>
827
- <ref name="editorialgroup"/>
828
- </optional>
829
- <zeroOrMore>
830
- <ref name="ics"/>
831
- </zeroOrMore>
832
- <zeroOrMore>
833
- <ref name="structuredidentifier"/>
834
- </zeroOrMore>
835
- </define>
836
764
  <!-- TitleType = text -->
837
765
  <define name="sections">
838
766
  <element name="sections">
@@ -872,7 +800,7 @@
872
800
  <ref name="BasicBlock"/>
873
801
  </zeroOrMore>
874
802
  <zeroOrMore>
875
- <ref name="bibitem"/>
803
+ <ref name="doc_bibitem"/>
876
804
  <zeroOrMore>
877
805
  <ref name="note"/>
878
806
  </zeroOrMore>
@@ -1210,6 +1138,24 @@
1210
1138
  </define>
1211
1139
  </include>
1212
1140
  <!-- end overrides -->
1141
+ <define name="doc_bibitem">
1142
+ <element name="bibitem">
1143
+ <attribute name="id">
1144
+ <data type="ID"/>
1145
+ </attribute>
1146
+ <optional>
1147
+ <attribute name="hidden">
1148
+ <data type="boolean"/>
1149
+ </attribute>
1150
+ </optional>
1151
+ <optional>
1152
+ <attribute name="suppress_identifier">
1153
+ <data type="boolean"/>
1154
+ </attribute>
1155
+ </optional>
1156
+ <ref name="BibliographicItem"/>
1157
+ </element>
1158
+ </define>
1213
1159
  <define name="image" combine="choice">
1214
1160
  <element name="svg">
1215
1161
  <oneOrMore>
@@ -1228,14 +1174,6 @@
1228
1174
  <value>tag</value>
1229
1175
  </choice>
1230
1176
  </define>
1231
- <define name="docsubtype">
1232
- <element name="subdoctype">
1233
- <ref name="DocumentSubtype"/>
1234
- </element>
1235
- </define>
1236
- <define name="DocumentSubtype">
1237
- <text/>
1238
- </define>
1239
1177
  <define name="colgroup">
1240
1178
  <element name="colgroup">
1241
1179
  <oneOrMore>
@@ -1597,45 +1535,6 @@
1597
1535
  </choice>
1598
1536
  </element>
1599
1537
  </define>
1600
- <define name="editorialgroup">
1601
- <element name="editorialgroup">
1602
- <oneOrMore>
1603
- <ref name="technical-committee"/>
1604
- </oneOrMore>
1605
- </element>
1606
- </define>
1607
- <define name="technical-committee">
1608
- <element name="technical-committee">
1609
- <ref name="IsoWorkgroup"/>
1610
- </element>
1611
- </define>
1612
- <define name="IsoWorkgroup">
1613
- <optional>
1614
- <attribute name="number"/>
1615
- </optional>
1616
- <optional>
1617
- <attribute name="type"/>
1618
- </optional>
1619
- <optional>
1620
- <attribute name="identifier"/>
1621
- </optional>
1622
- <optional>
1623
- <attribute name="prefix"/>
1624
- </optional>
1625
- <text/>
1626
- </define>
1627
- <define name="ics">
1628
- <element name="ics">
1629
- <element name="code">
1630
- <text/>
1631
- </element>
1632
- <optional>
1633
- <element name="text">
1634
- <text/>
1635
- </element>
1636
- </optional>
1637
- </element>
1638
- </define>
1639
1538
  <define name="standard-document">
1640
1539
  <element name="standard-document">
1641
1540
  <attribute name="version"/>
@@ -2466,71 +2365,6 @@
2466
2365
  </optional>
2467
2366
  </element>
2468
2367
  </define>
2469
- <define name="structuredidentifier">
2470
- <element name="structuredidentifier">
2471
- <optional>
2472
- <attribute name="type"/>
2473
- </optional>
2474
- <oneOrMore>
2475
- <element name="agency">
2476
- <text/>
2477
- </element>
2478
- </oneOrMore>
2479
- <optional>
2480
- <element name="class">
2481
- <text/>
2482
- </element>
2483
- </optional>
2484
- <element name="docnumber">
2485
- <text/>
2486
- </element>
2487
- <optional>
2488
- <element name="partnumber">
2489
- <text/>
2490
- </element>
2491
- </optional>
2492
- <optional>
2493
- <element name="edition">
2494
- <text/>
2495
- </element>
2496
- </optional>
2497
- <optional>
2498
- <element name="version">
2499
- <text/>
2500
- </element>
2501
- </optional>
2502
- <optional>
2503
- <element name="supplementtype">
2504
- <text/>
2505
- </element>
2506
- </optional>
2507
- <optional>
2508
- <element name="supplementnumber">
2509
- <text/>
2510
- </element>
2511
- </optional>
2512
- <optional>
2513
- <element name="amendment">
2514
- <text/>
2515
- </element>
2516
- </optional>
2517
- <optional>
2518
- <element name="corrigendum">
2519
- <text/>
2520
- </element>
2521
- </optional>
2522
- <optional>
2523
- <element name="language">
2524
- <text/>
2525
- </element>
2526
- </optional>
2527
- <optional>
2528
- <element name="year">
2529
- <text/>
2530
- </element>
2531
- </optional>
2532
- </element>
2533
- </define>
2534
2368
  <define name="term-clause">
2535
2369
  <element name="clause">
2536
2370
  <optional>
@@ -2804,4 +2638,7 @@
2804
2638
  </attribute>
2805
2639
  </element>
2806
2640
  </define>
2641
+ <start>
2642
+ <ref name="standard-document"/>
2643
+ </start>
2807
2644
  </grammar>
data/lib/metanorma/ogc/ogc.rng CHANGED
@@ -5,52 +5,11 @@
5
5
  we cannot have a new default namespace: we will end up with a grammar with two different
6
6
  namespaces, one for isostandard and one for csand additions. And we do not want that.
7
7
  -->
8
+ <include href="relaton-ogc.rng"/>
8
9
  <include href="isodoc.rng">
9
10
  <start>
10
11
  <ref name="ogc-standard"/>
11
12
  </start>
12
- <define name="DocumentType">
13
- <choice>
14
- <value>abstract-specification-topic</value>
15
- <value>best-practice</value>
16
- <value>change-request-supporting-document</value>
17
- <value>community-practice</value>
18
- <value>community-standard</value>
19
- <value>discussion-paper</value>
20
- <value>engineering-report</value>
21
- <value>other</value>
22
- <value>policy</value>
23
- <value>reference-model</value>
24
- <value>release-notes</value>
25
- <value>standard</value>
26
- <value>user-guide</value>
27
- <value>white-paper</value>
28
- <value>test-suite</value>
29
- </choice>
30
- </define>
31
- <define name="editorialgroup">
32
- <element name="editorialgroup">
33
- <ref name="committee"/>
34
- <optional>
35
- <ref name="subcommittee"/>
36
- </optional>
37
- <optional>
38
- <ref name="workgroup"/>
39
- </optional>
40
- </element>
41
- </define>
42
- <define name="BibDataExtensionType">
43
- <optional>
44
- <ref name="doctype"/>
45
- </optional>
46
- <optional>
47
- <ref name="docsubtype"/>
48
- </optional>
49
- <ref name="editorialgroup"/>
50
- <zeroOrMore>
51
- <ref name="ics"/>
52
- </zeroOrMore>
53
- </define>
54
13
  <define name="preface">
55
14
  <element name="preface">
56
15
  <optional>
@@ -62,19 +21,6 @@
62
21
  </optional>
63
22
  </element>
64
23
  </define>
65
- <define name="DocumentSubtype">
66
- <choice>
67
- <value>conceptual-model</value>
68
- <value>conceptual-model-and-encoding</value>
69
- <value>conceptual-model-and-implementation</value>
70
- <value>encoding</value>
71
- <value>extension</value>
72
- <value>implementation</value>
73
- <value>profile</value>
74
- <value>profile-with-extension</value>
75
- <value>general</value>
76
- </choice>
77
- </define>
78
24
  </include>
79
25
  <define name="TextElement" combine="choice">
80
26
  <ref name="hi"/>
@@ -97,25 +43,6 @@
97
43
  <ref name="Basic-Section"/>
98
44
  </element>
99
45
  </define>
100
- <define name="committee">
101
- <element name="committee">
102
- <choice>
103
- <value>technical</value>
104
- <value>planning</value>
105
- <value>strategic-member-advisory</value>
106
- </choice>
107
- </element>
108
- </define>
109
- <define name="subcommittee">
110
- <element name="subcommittee">
111
- <ref name="IsoWorkgroup"/>
112
- </element>
113
- </define>
114
- <define name="workgroup">
115
- <element name="workgroup">
116
- <ref name="IsoWorkgroup"/>
117
- </element>
118
- </define>
119
46
  <define name="ogc-standard">
120
47
  <element name="ogc-standard">
121
48
  <attribute name="version"/>
data/lib/metanorma/ogc/relaton-ogc.rng ADDED
@@ -0,0 +1,82 @@
1
+ <?xml version="1.0" encoding="UTF-8"?>
2
+ <grammar xmlns="http://relaxng.org/ns/structure/1.0">
3
+ <include href="biblio-standoc.rng">
4
+ <define name="DocumentType">
5
+ <choice>
6
+ <value>abstract-specification-topic</value>
7
+ <value>best-practice</value>
8
+ <value>change-request-supporting-document</value>
9
+ <value>community-practice</value>
10
+ <value>community-standard</value>
11
+ <value>discussion-paper</value>
12
+ <value>engineering-report</value>
13
+ <value>other</value>
14
+ <value>policy</value>
15
+ <value>reference-model</value>
16
+ <value>release-notes</value>
17
+ <value>standard</value>
18
+ <value>user-guide</value>
19
+ <value>white-paper</value>
20
+ <value>test-suite</value>
21
+ </choice>
22
+ </define>
23
+ <define name="DocumentSubtype">
24
+ <choice>
25
+ <value>conceptual-model</value>
26
+ <value>conceptual-model-and-encoding</value>
27
+ <value>conceptual-model-and-implementation</value>
28
+ <value>encoding</value>
29
+ <value>extension</value>
30
+ <value>implementation</value>
31
+ <value>profile</value>
32
+ <value>profile-with-extension</value>
33
+ <value>general</value>
34
+ </choice>
35
+ </define>
36
+ <define name="editorialgroup">
37
+ <element name="editorialgroup">
38
+ <ref name="committee"/>
39
+ <optional>
40
+ <ref name="subcommittee"/>
41
+ </optional>
42
+ <optional>
43
+ <ref name="workgroup"/>
44
+ </optional>
45
+ </element>
46
+ </define>
47
+ <define name="BibDataExtensionType">
48
+ <optional>
49
+ <attribute name="schema-version"/>
50
+ </optional>
51
+ <optional>
52
+ <ref name="doctype"/>
53
+ </optional>
54
+ <optional>
55
+ <ref name="docsubtype"/>
56
+ </optional>
57
+ <ref name="editorialgroup"/>
58
+ <zeroOrMore>
59
+ <ref name="ics"/>
60
+ </zeroOrMore>
61
+ </define>
62
+ </include>
63
+ <define name="committee">
64
+ <element name="committee">
65
+ <choice>
66
+ <value>technical</value>
67
+ <value>planning</value>
68
+ <value>strategic-member-advisory</value>
69
+ </choice>
70
+ </element>
71
+ </define>
72
+ <define name="subcommittee">
73
+ <element name="subcommittee">
74
+ <ref name="IsoWorkgroup"/>
75
+ </element>
76
+ </define>
77
+ <define name="workgroup">
78
+ <element name="workgroup">
79
+ <ref name="IsoWorkgroup"/>
80
+ </element>
81
+ </define>
82
+ </grammar>
data/lib/metanorma/ogc/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Ogc
3
- VERSION = "2.2.3".freeze
3
+ VERSION = "2.2.5".freeze
4
4
  end
5
5
  end
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: 2.2.3
4
+ version: 2.2.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: 2022-09-26 00:00:00.000000000 Z
11
+ date: 2022-10-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: iso-639
@@ -215,6 +215,7 @@ executables: []
215
215
  extensions: []
216
216
  extra_rdoc_files: []
217
217
  files:
218
+ - ".github/workflows/automerge.yml"
218
219
  - ".github/workflows/rake.yml"
219
220
  - ".github/workflows/release.yml"
220
221
  - ".gitignore"
@@ -282,6 +283,7 @@ files:
282
283
  - lib/metanorma-ogc.rb
283
284
  - lib/metanorma/ogc.rb
284
285
  - lib/metanorma/ogc/basicdoc.rng
286
+ - lib/metanorma/ogc/biblio-standoc.rng
285
287
  - lib/metanorma/ogc/biblio.rng
286
288
  - lib/metanorma/ogc/boilerplate.xml
287
289
  - lib/metanorma/ogc/cleanup.rb
@@ -290,6 +292,7 @@ files:
290
292
  - lib/metanorma/ogc/isodoc.rng
291
293
  - lib/metanorma/ogc/ogc.rng
292
294
  - lib/metanorma/ogc/processor.rb
295
+ - lib/metanorma/ogc/relaton-ogc.rng
293
296
  - lib/metanorma/ogc/reqt.rng
294
297
  - lib/metanorma/ogc/validate.rb
295
298
  - lib/metanorma/ogc/version.rb