relaton-ogc 1.13.0 → 1.14.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.github/workflows/rake.yml +0 -1
- data/.github/workflows/release.yml +22 -0
- data/README.adoc +15 -19
- data/grammars/basicdoc.rng +3 -27
- data/grammars/biblio-standoc.rng +164 -0
- data/grammars/biblio.rng +82 -19
- data/grammars/relaton-ogc-compile.rng +11 -0
- data/grammars/{ogc.rng → relaton-ogc.rng} +18 -86
- data/lib/relaton_ogc/hit_collection.rb +3 -1
- data/lib/relaton_ogc/ogc_bibliographic_item.rb +12 -2
- data/lib/relaton_ogc/ogc_bibliography.rb +4 -4
- data/lib/relaton_ogc/scrapper.rb +0 -1
- data/lib/relaton_ogc/version.rb +1 -1
- data/relaton_ogc.gemspec +1 -1
- metadata +12 -11
- data/grammars/isodoc.rng +0 -2807
- data/grammars/reqt.rng +0 -223
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: ba3481b2cd4c2edba451a0b126d48305d7b86864f8a373976767b4fed48532e9
|
|
4
|
+
data.tar.gz: 9f574bfe182a4886cbb063dd2e8bb700777641ffeb3fe3368419bd5073b48b02
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 143a7bc6a666ee1e1ec0b4f573aa67a94ba095b4d3adda52f35921a891ed06dea3e2c7cf8ce934101493890ab2de92ae1e5fd4138fd73b6989685b7ad84cbb5d
|
|
7
|
+
data.tar.gz: cf59738eb30e67134f2c60e704f95bb6bb9cf8958f49494e8cbb0ae0fa54602c8b09a575aa49e619d01b707608100ab71f848bcd1aceb318019c960be0002ca2
|
data/.github/workflows/rake.yml
CHANGED
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
# Auto-generated by Cimas: Do not edit it manually!
|
|
2
|
+
# See https://github.com/metanorma/cimas
|
|
3
|
+
name: release
|
|
4
|
+
|
|
5
|
+
on:
|
|
6
|
+
workflow_dispatch:
|
|
7
|
+
inputs:
|
|
8
|
+
next_version:
|
|
9
|
+
description: |
|
|
10
|
+
Next release version. Possible values: x.y.z, major, minor, patch or pre|rc|etc
|
|
11
|
+
required: true
|
|
12
|
+
default: 'skip'
|
|
13
|
+
push:
|
|
14
|
+
tags: [ v* ]
|
|
15
|
+
|
|
16
|
+
jobs:
|
|
17
|
+
release:
|
|
18
|
+
uses: relaton/support/.github/workflows/release.yml@master
|
|
19
|
+
with:
|
|
20
|
+
next_version: ${{ github.event.inputs.next_version }}
|
|
21
|
+
secrets:
|
|
22
|
+
rubygems-api-key: ${{ secrets.RELATON_CI_RUBYGEMS_API_KEY }}
|
data/README.adoc
CHANGED
|
@@ -50,31 +50,27 @@ item = hits[0].fetch
|
|
|
50
50
|
[source,ruby]
|
|
51
51
|
----
|
|
52
52
|
item.to_xml
|
|
53
|
-
=> "<bibitem id="19-025r1" type="standard">
|
|
53
|
+
=> "<bibitem id="19-025r1" type="standard" schema-version="v1.2.1">
|
|
54
|
+
<fetched>2022-12-04</fetched>
|
|
54
55
|
<title type="title-main" format="text/plain" language="en" script="Latn">Development of Spatial Data Infrastructures for Marine Data Management</title>
|
|
55
56
|
<title type="main" format="text/plain" language="en" script="Latn">Development of Spatial Data Infrastructures for Marine Data Management</title>
|
|
56
|
-
<uri type="obp">https://portal.
|
|
57
|
-
<docidentifier type="OGC">19-025r1</docidentifier>
|
|
58
|
-
<date type="published">
|
|
59
|
-
<on>2019</on>
|
|
60
|
-
</date>
|
|
57
|
+
<uri type="obp">https://portal.ogc.org/files/?artifact_id=88037</uri>
|
|
58
|
+
<docidentifier type="OGC" primary="true">19-025r1</docidentifier>
|
|
61
59
|
...
|
|
62
60
|
</bibitem>"
|
|
63
61
|
----
|
|
64
|
-
With argument `bibdata: true` it
|
|
62
|
+
With argument `bibdata: true` it outputs XML wrapped by `bibdata` element and adds flavor `ext` element.
|
|
65
63
|
[source,ruby]
|
|
66
64
|
----
|
|
67
65
|
item.to_xml bibdata: true
|
|
68
|
-
=> "<bibdata type="standard">
|
|
66
|
+
=> "<bibdata type="standard" schema-version="v1.2.1">
|
|
67
|
+
<fetched>2022-12-04</fetched>
|
|
69
68
|
<title type="title-main" format="text/plain" language="en" script="Latn">Development of Spatial Data Infrastructures for Marine Data Management</title>
|
|
70
69
|
<title type="main" format="text/plain" language="en" script="Latn">Development of Spatial Data Infrastructures for Marine Data Management</title>
|
|
71
|
-
<uri type="obp">https://portal.
|
|
72
|
-
<docidentifier type="OGC">19-025r1</docidentifier>
|
|
73
|
-
<date type="published\">
|
|
74
|
-
<on>2019</on>
|
|
75
|
-
</date>
|
|
70
|
+
<uri type="obp">https://portal.ogc.org/files/?artifact_id=88037</uri>
|
|
71
|
+
<docidentifier type="OGC" primary="true">19-025r1</docidentifier>
|
|
76
72
|
...
|
|
77
|
-
<ext>
|
|
73
|
+
<ext schema-version="v1.0.1">
|
|
78
74
|
<doctype>engineering-report</doctype>
|
|
79
75
|
<editorialgroup>
|
|
80
76
|
<committee>technical</committee>
|
|
@@ -96,8 +92,8 @@ RelatonOgc::OgcBibliography.get "OGC 19-025r1", "2019", {}
|
|
|
96
92
|
=== Create bibliographic item from XML
|
|
97
93
|
[source,ruby]
|
|
98
94
|
----
|
|
99
|
-
RelatonOgc::XMLParser.from_xml File.read('spec/fixtures/
|
|
100
|
-
=> #<RelatonOgc::OgcBibliographicItem:
|
|
95
|
+
RelatonOgc::XMLParser.from_xml File.read('spec/fixtures/12_128r14.xml')
|
|
96
|
+
=> #<RelatonOgc::OgcBibliographicItem:0x00007fd2b1078718
|
|
101
97
|
...
|
|
102
98
|
----
|
|
103
99
|
|
|
@@ -125,13 +121,13 @@ RelatonOgc::OgcBibliographicItem.from_hash hash
|
|
|
125
121
|
|
|
126
122
|
=== Fetch data
|
|
127
123
|
|
|
128
|
-
This gem uses the https://raw.githubusercontent.com/opengeospatial/NamingAuthority/master/incubation/bibliography/bibliography.json dataset as a data
|
|
124
|
+
This gem uses the https://raw.githubusercontent.com/opengeospatial/NamingAuthority/master/incubation/bibliography/bibliography.json dataset as a data source.
|
|
129
125
|
|
|
130
|
-
The method `RelatonOgc::DataFetcher.fetch(output: "data", format: "yaml")` fetches all the documents from the
|
|
126
|
+
The method `RelatonOgc::DataFetcher.fetch(output: "data", format: "yaml")` fetches all the documents from the dataset and saves them to the `./data` folder in YAML format.
|
|
131
127
|
Arguments:
|
|
132
128
|
|
|
133
129
|
- `output` - folder to save documents (default './data').
|
|
134
|
-
- `format` - format in which the documents are saved.
|
|
130
|
+
- `format` - the format in which the documents are saved. Possible formats are: `yaml`, `xml` (default `yaml`).
|
|
135
131
|
|
|
136
132
|
[source,ruby]
|
|
137
133
|
----
|
data/grammars/basicdoc.rng
CHANGED
|
@@ -1,10 +1,5 @@
|
|
|
1
1
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
2
|
<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
|
|
3
|
-
<include href="biblio.rng">
|
|
4
|
-
<start>
|
|
5
|
-
<ref name="document"/>
|
|
6
|
-
</start>
|
|
7
|
-
</include>
|
|
8
3
|
<define name="document">
|
|
9
4
|
<element name="document">
|
|
10
5
|
<optional>
|
|
@@ -688,6 +683,9 @@
|
|
|
688
683
|
</define>
|
|
689
684
|
<define name="underline">
|
|
690
685
|
<element name="underline">
|
|
686
|
+
<optional>
|
|
687
|
+
<attribute name="style"/>
|
|
688
|
+
</optional>
|
|
691
689
|
<zeroOrMore>
|
|
692
690
|
<ref name="PureTextElement"/>
|
|
693
691
|
</zeroOrMore>
|
|
@@ -1125,26 +1123,4 @@
|
|
|
1125
1123
|
</zeroOrMore>
|
|
1126
1124
|
</element>
|
|
1127
1125
|
</define>
|
|
1128
|
-
<define name="ext">
|
|
1129
|
-
<element name="ext">
|
|
1130
|
-
<ref name="BibDataExtensionType"/>
|
|
1131
|
-
</element>
|
|
1132
|
-
</define>
|
|
1133
|
-
<define name="BibDataExtensionType">
|
|
1134
|
-
<ref name="doctype"/>
|
|
1135
|
-
</define>
|
|
1136
|
-
<define name="doctype">
|
|
1137
|
-
<element name="doctype">
|
|
1138
|
-
<ref name="DocumentType"/>
|
|
1139
|
-
</element>
|
|
1140
|
-
</define>
|
|
1141
|
-
<define name="DocumentType">
|
|
1142
|
-
<value>document</value>
|
|
1143
|
-
</define>
|
|
1144
|
-
<define name="BibData">
|
|
1145
|
-
<ref name="BibliographicItem"/>
|
|
1146
|
-
<optional>
|
|
1147
|
-
<ref name="ext"/>
|
|
1148
|
-
</optional>
|
|
1149
|
-
</define>
|
|
1150
1126
|
</grammar>
|
|
@@ -0,0 +1,164 @@
|
|
|
1
|
+
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
|
+
<grammar xmlns="http://relaxng.org/ns/structure/1.0">
|
|
3
|
+
<!--
|
|
4
|
+
Add-ons to biblio.rnc for standoc model: defines the extension point BibDataExtensionType
|
|
5
|
+
of relaton
|
|
6
|
+
|
|
7
|
+
Specialisations as for biblio.rnc. Extension point can be redefined completely for a flavour of standoc
|
|
8
|
+
(SDO); but other elements in Bibdata can only be extended (more specialised vocabularies for Bibdata)
|
|
9
|
+
-->
|
|
10
|
+
<include href="biblio.rng">
|
|
11
|
+
<define name="BibData">
|
|
12
|
+
<ref name="BibliographicItem"/>
|
|
13
|
+
<optional>
|
|
14
|
+
<ref name="ext"/>
|
|
15
|
+
</optional>
|
|
16
|
+
</define>
|
|
17
|
+
</include>
|
|
18
|
+
<define name="ext">
|
|
19
|
+
<element name="ext">
|
|
20
|
+
<ref name="BibDataExtensionType"/>
|
|
21
|
+
</element>
|
|
22
|
+
</define>
|
|
23
|
+
<define name="BibDataExtensionType">
|
|
24
|
+
<optional>
|
|
25
|
+
<attribute name="schema-version"/>
|
|
26
|
+
</optional>
|
|
27
|
+
<ref name="doctype"/>
|
|
28
|
+
<optional>
|
|
29
|
+
<ref name="docsubtype"/>
|
|
30
|
+
</optional>
|
|
31
|
+
<optional>
|
|
32
|
+
<ref name="editorialgroup"/>
|
|
33
|
+
</optional>
|
|
34
|
+
<zeroOrMore>
|
|
35
|
+
<ref name="ics"/>
|
|
36
|
+
</zeroOrMore>
|
|
37
|
+
<zeroOrMore>
|
|
38
|
+
<ref name="structuredidentifier"/>
|
|
39
|
+
</zeroOrMore>
|
|
40
|
+
</define>
|
|
41
|
+
<define name="doctype">
|
|
42
|
+
<element name="doctype">
|
|
43
|
+
<optional>
|
|
44
|
+
<attribute name="abbreviation"/>
|
|
45
|
+
</optional>
|
|
46
|
+
<ref name="DocumentType"/>
|
|
47
|
+
</element>
|
|
48
|
+
</define>
|
|
49
|
+
<define name="DocumentType">
|
|
50
|
+
<text/>
|
|
51
|
+
</define>
|
|
52
|
+
<define name="docsubtype">
|
|
53
|
+
<element name="subdoctype">
|
|
54
|
+
<ref name="DocumentSubtype"/>
|
|
55
|
+
</element>
|
|
56
|
+
</define>
|
|
57
|
+
<define name="DocumentSubtype">
|
|
58
|
+
<text/>
|
|
59
|
+
</define>
|
|
60
|
+
<define name="editorialgroup">
|
|
61
|
+
<element name="editorialgroup">
|
|
62
|
+
<oneOrMore>
|
|
63
|
+
<ref name="technical-committee"/>
|
|
64
|
+
</oneOrMore>
|
|
65
|
+
</element>
|
|
66
|
+
</define>
|
|
67
|
+
<define name="technical-committee">
|
|
68
|
+
<element name="technical-committee">
|
|
69
|
+
<ref name="IsoWorkgroup"/>
|
|
70
|
+
</element>
|
|
71
|
+
</define>
|
|
72
|
+
<define name="IsoWorkgroup">
|
|
73
|
+
<optional>
|
|
74
|
+
<attribute name="number"/>
|
|
75
|
+
</optional>
|
|
76
|
+
<optional>
|
|
77
|
+
<attribute name="type"/>
|
|
78
|
+
</optional>
|
|
79
|
+
<optional>
|
|
80
|
+
<attribute name="identifier"/>
|
|
81
|
+
</optional>
|
|
82
|
+
<optional>
|
|
83
|
+
<attribute name="prefix"/>
|
|
84
|
+
</optional>
|
|
85
|
+
<text/>
|
|
86
|
+
</define>
|
|
87
|
+
<define name="ics">
|
|
88
|
+
<element name="ics">
|
|
89
|
+
<element name="code">
|
|
90
|
+
<text/>
|
|
91
|
+
</element>
|
|
92
|
+
<optional>
|
|
93
|
+
<element name="text">
|
|
94
|
+
<text/>
|
|
95
|
+
</element>
|
|
96
|
+
</optional>
|
|
97
|
+
</element>
|
|
98
|
+
</define>
|
|
99
|
+
<define name="structuredidentifier">
|
|
100
|
+
<element name="structuredidentifier">
|
|
101
|
+
<optional>
|
|
102
|
+
<attribute name="type"/>
|
|
103
|
+
</optional>
|
|
104
|
+
<oneOrMore>
|
|
105
|
+
<element name="agency">
|
|
106
|
+
<text/>
|
|
107
|
+
</element>
|
|
108
|
+
</oneOrMore>
|
|
109
|
+
<optional>
|
|
110
|
+
<element name="class">
|
|
111
|
+
<text/>
|
|
112
|
+
</element>
|
|
113
|
+
</optional>
|
|
114
|
+
<element name="docnumber">
|
|
115
|
+
<text/>
|
|
116
|
+
</element>
|
|
117
|
+
<optional>
|
|
118
|
+
<element name="partnumber">
|
|
119
|
+
<text/>
|
|
120
|
+
</element>
|
|
121
|
+
</optional>
|
|
122
|
+
<optional>
|
|
123
|
+
<element name="edition">
|
|
124
|
+
<text/>
|
|
125
|
+
</element>
|
|
126
|
+
</optional>
|
|
127
|
+
<optional>
|
|
128
|
+
<element name="version">
|
|
129
|
+
<text/>
|
|
130
|
+
</element>
|
|
131
|
+
</optional>
|
|
132
|
+
<optional>
|
|
133
|
+
<element name="supplementtype">
|
|
134
|
+
<text/>
|
|
135
|
+
</element>
|
|
136
|
+
</optional>
|
|
137
|
+
<optional>
|
|
138
|
+
<element name="supplementnumber">
|
|
139
|
+
<text/>
|
|
140
|
+
</element>
|
|
141
|
+
</optional>
|
|
142
|
+
<optional>
|
|
143
|
+
<element name="amendment">
|
|
144
|
+
<text/>
|
|
145
|
+
</element>
|
|
146
|
+
</optional>
|
|
147
|
+
<optional>
|
|
148
|
+
<element name="corrigendum">
|
|
149
|
+
<text/>
|
|
150
|
+
</element>
|
|
151
|
+
</optional>
|
|
152
|
+
<optional>
|
|
153
|
+
<element name="language">
|
|
154
|
+
<text/>
|
|
155
|
+
</element>
|
|
156
|
+
</optional>
|
|
157
|
+
<optional>
|
|
158
|
+
<element name="year">
|
|
159
|
+
<text/>
|
|
160
|
+
</element>
|
|
161
|
+
</optional>
|
|
162
|
+
</element>
|
|
163
|
+
</define>
|
|
164
|
+
</grammar>
|
data/grammars/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
|
-
|
|
37
|
-
|
|
38
|
-
|
|
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"/>
|
|
@@ -73,8 +74,14 @@
|
|
|
73
74
|
<text/>
|
|
74
75
|
</element>
|
|
75
76
|
</define>
|
|
76
|
-
<define name="
|
|
77
|
+
<define name="locale">
|
|
77
78
|
<a:documentation>ISO-639</a:documentation>
|
|
79
|
+
<element name="locale">
|
|
80
|
+
<text/>
|
|
81
|
+
</element>
|
|
82
|
+
</define>
|
|
83
|
+
<define name="script">
|
|
84
|
+
<a:documentation>ISO-3166</a:documentation>
|
|
78
85
|
<element name="script">
|
|
79
86
|
<text/>
|
|
80
87
|
</element>
|
|
@@ -93,6 +100,9 @@
|
|
|
93
100
|
<!-- multiple languages and scripts possible: comma delimit them if so -->
|
|
94
101
|
<attribute name="language"/>
|
|
95
102
|
</optional>
|
|
103
|
+
<optional>
|
|
104
|
+
<attribute name="locale"/>
|
|
105
|
+
</optional>
|
|
96
106
|
<optional>
|
|
97
107
|
<attribute name="script"/>
|
|
98
108
|
</optional>
|
|
@@ -136,6 +146,9 @@
|
|
|
136
146
|
<!-- multiple languages and scripts possible: comma delimit them if so -->
|
|
137
147
|
<attribute name="language"/>
|
|
138
148
|
</optional>
|
|
149
|
+
<optional>
|
|
150
|
+
<attribute name="locale"/>
|
|
151
|
+
</optional>
|
|
139
152
|
<optional>
|
|
140
153
|
<attribute name="script"/>
|
|
141
154
|
</optional>
|
|
@@ -158,27 +171,30 @@
|
|
|
158
171
|
</define>
|
|
159
172
|
<define name="contributor">
|
|
160
173
|
<element name="contributor">
|
|
161
|
-
<
|
|
174
|
+
<oneOrMore>
|
|
162
175
|
<ref name="role"/>
|
|
163
|
-
</
|
|
176
|
+
</oneOrMore>
|
|
164
177
|
<ref name="ContributorInfo"/>
|
|
165
178
|
</element>
|
|
166
179
|
</define>
|
|
167
180
|
<define name="role">
|
|
168
181
|
<element name="role">
|
|
169
|
-
<
|
|
170
|
-
<
|
|
171
|
-
<
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
</
|
|
180
|
-
|
|
181
|
-
|
|
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
|
+
<value>realizer</value>
|
|
192
|
+
<value>owner</value>
|
|
193
|
+
<value>authorizer</value>
|
|
194
|
+
<value>enabler</value>
|
|
195
|
+
<value>subject</value>
|
|
196
|
+
</choice>
|
|
197
|
+
</attribute>
|
|
182
198
|
<zeroOrMore>
|
|
183
199
|
<ref name="roledescription"/>
|
|
184
200
|
</zeroOrMore>
|
|
@@ -500,6 +516,17 @@
|
|
|
500
516
|
</define>
|
|
501
517
|
<define name="localityStack">
|
|
502
518
|
<element name="localityStack">
|
|
519
|
+
<optional>
|
|
520
|
+
<attribute name="connective">
|
|
521
|
+
<choice>
|
|
522
|
+
<value>and</value>
|
|
523
|
+
<value>or</value>
|
|
524
|
+
<value>from</value>
|
|
525
|
+
<value>to</value>
|
|
526
|
+
<value/>
|
|
527
|
+
</choice>
|
|
528
|
+
</attribute>
|
|
529
|
+
</optional>
|
|
503
530
|
<zeroOrMore>
|
|
504
531
|
<ref name="locality"/>
|
|
505
532
|
</zeroOrMore>
|
|
@@ -512,6 +539,17 @@
|
|
|
512
539
|
</define>
|
|
513
540
|
<define name="sourceLocalityStack">
|
|
514
541
|
<element name="sourceLocalityStack">
|
|
542
|
+
<optional>
|
|
543
|
+
<attribute name="connective">
|
|
544
|
+
<choice>
|
|
545
|
+
<value>and</value>
|
|
546
|
+
<value>or</value>
|
|
547
|
+
<value>from</value>
|
|
548
|
+
<value>to</value>
|
|
549
|
+
<value/>
|
|
550
|
+
</choice>
|
|
551
|
+
</attribute>
|
|
552
|
+
</optional>
|
|
515
553
|
<zeroOrMore>
|
|
516
554
|
<ref name="sourceLocality"/>
|
|
517
555
|
</zeroOrMore>
|
|
@@ -614,6 +652,9 @@
|
|
|
614
652
|
<ref name="BibItemType"/>
|
|
615
653
|
</attribute>
|
|
616
654
|
</optional>
|
|
655
|
+
<optional>
|
|
656
|
+
<attribute name="schema-version"/>
|
|
657
|
+
</optional>
|
|
617
658
|
<optional>
|
|
618
659
|
<ref name="fetched"/>
|
|
619
660
|
</optional>
|
|
@@ -650,6 +691,9 @@
|
|
|
650
691
|
<zeroOrMore>
|
|
651
692
|
<ref name="language"/>
|
|
652
693
|
</zeroOrMore>
|
|
694
|
+
<zeroOrMore>
|
|
695
|
+
<ref name="locale"/>
|
|
696
|
+
</zeroOrMore>
|
|
653
697
|
<zeroOrMore>
|
|
654
698
|
<ref name="script"/>
|
|
655
699
|
</zeroOrMore>
|
|
@@ -705,6 +749,9 @@
|
|
|
705
749
|
<ref name="BibItemType"/>
|
|
706
750
|
</attribute>
|
|
707
751
|
</optional>
|
|
752
|
+
<optional>
|
|
753
|
+
<attribute name="schema-version"/>
|
|
754
|
+
</optional>
|
|
708
755
|
<optional>
|
|
709
756
|
<ref name="fetched"/>
|
|
710
757
|
</optional>
|
|
@@ -741,6 +788,9 @@
|
|
|
741
788
|
<zeroOrMore>
|
|
742
789
|
<ref name="language"/>
|
|
743
790
|
</zeroOrMore>
|
|
791
|
+
<zeroOrMore>
|
|
792
|
+
<ref name="locale"/>
|
|
793
|
+
</zeroOrMore>
|
|
744
794
|
<zeroOrMore>
|
|
745
795
|
<ref name="script"/>
|
|
746
796
|
</zeroOrMore>
|
|
@@ -854,6 +904,15 @@
|
|
|
854
904
|
<optional>
|
|
855
905
|
<attribute name="type"/>
|
|
856
906
|
</optional>
|
|
907
|
+
<optional>
|
|
908
|
+
<attribute name="language"/>
|
|
909
|
+
</optional>
|
|
910
|
+
<optional>
|
|
911
|
+
<attribute name="locale"/>
|
|
912
|
+
</optional>
|
|
913
|
+
<optional>
|
|
914
|
+
<attribute name="script"/>
|
|
915
|
+
</optional>
|
|
857
916
|
<data type="anyURI"/>
|
|
858
917
|
</define>
|
|
859
918
|
<define name="DateType">
|
|
@@ -882,6 +941,7 @@
|
|
|
882
941
|
<value>vote-started</value>
|
|
883
942
|
<value>vote-ended</value>
|
|
884
943
|
<value>announced</value>
|
|
944
|
+
<value>stable-until</value>
|
|
885
945
|
</choice>
|
|
886
946
|
</define>
|
|
887
947
|
<define name="bdate">
|
|
@@ -930,6 +990,9 @@
|
|
|
930
990
|
<optional>
|
|
931
991
|
<attribute name="language"/>
|
|
932
992
|
</optional>
|
|
993
|
+
<optional>
|
|
994
|
+
<attribute name="locale"/>
|
|
995
|
+
</optional>
|
|
933
996
|
<optional>
|
|
934
997
|
<attribute name="script"/>
|
|
935
998
|
</optional>
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
|
+
<grammar xmlns="http://relaxng.org/ns/structure/1.0">
|
|
3
|
+
<include href="basicdoc.rng"/>
|
|
4
|
+
<include href="relaton-ogc.rng"/>
|
|
5
|
+
<start>
|
|
6
|
+
<choice>
|
|
7
|
+
<ref name="bibitem"/>
|
|
8
|
+
<ref name="bibdata"/>
|
|
9
|
+
</choice>
|
|
10
|
+
</start>
|
|
11
|
+
</grammar>
|
|
@@ -1,14 +1,6 @@
|
|
|
1
1
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
2
|
<grammar xmlns="http://relaxng.org/ns/structure/1.0">
|
|
3
|
-
|
|
4
|
-
Currently we inherit from a namespaced grammar, isostandard. Until we inherit from isodoc,
|
|
5
|
-
we cannot have a new default namespace: we will end up with a grammar with two different
|
|
6
|
-
namespaces, one for isostandard and one for csand additions. And we do not want that.
|
|
7
|
-
-->
|
|
8
|
-
<include href="isodoc.rng">
|
|
9
|
-
<start>
|
|
10
|
-
<ref name="ogc-standard"/>
|
|
11
|
-
</start>
|
|
3
|
+
<include href="biblio-standoc.rng">
|
|
12
4
|
<define name="DocumentType">
|
|
13
5
|
<choice>
|
|
14
6
|
<value>abstract-specification-topic</value>
|
|
@@ -26,6 +18,20 @@
|
|
|
26
18
|
<value>user-guide</value>
|
|
27
19
|
<value>white-paper</value>
|
|
28
20
|
<value>test-suite</value>
|
|
21
|
+
<value>draft-standard</value>
|
|
22
|
+
</choice>
|
|
23
|
+
</define>
|
|
24
|
+
<define name="DocumentSubtype">
|
|
25
|
+
<choice>
|
|
26
|
+
<value>conceptual-model</value>
|
|
27
|
+
<value>conceptual-model-and-encoding</value>
|
|
28
|
+
<value>conceptual-model-and-implementation</value>
|
|
29
|
+
<value>encoding</value>
|
|
30
|
+
<value>extension</value>
|
|
31
|
+
<value>implementation</value>
|
|
32
|
+
<value>profile</value>
|
|
33
|
+
<value>profile-with-extension</value>
|
|
34
|
+
<value>general</value>
|
|
29
35
|
</choice>
|
|
30
36
|
</define>
|
|
31
37
|
<define name="editorialgroup">
|
|
@@ -40,6 +46,9 @@
|
|
|
40
46
|
</element>
|
|
41
47
|
</define>
|
|
42
48
|
<define name="BibDataExtensionType">
|
|
49
|
+
<optional>
|
|
50
|
+
<attribute name="schema-version"/>
|
|
51
|
+
</optional>
|
|
43
52
|
<optional>
|
|
44
53
|
<ref name="doctype"/>
|
|
45
54
|
</optional>
|
|
@@ -51,52 +60,7 @@
|
|
|
51
60
|
<ref name="ics"/>
|
|
52
61
|
</zeroOrMore>
|
|
53
62
|
</define>
|
|
54
|
-
<define name="preface">
|
|
55
|
-
<element name="preface">
|
|
56
|
-
<optional>
|
|
57
|
-
<ref name="abstract"/>
|
|
58
|
-
</optional>
|
|
59
|
-
<ref name="foreword"/>
|
|
60
|
-
<optional>
|
|
61
|
-
<ref name="submitters"/>
|
|
62
|
-
</optional>
|
|
63
|
-
</element>
|
|
64
|
-
</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
63
|
</include>
|
|
79
|
-
<define name="TextElement" combine="choice">
|
|
80
|
-
<ref name="hi"/>
|
|
81
|
-
</define>
|
|
82
|
-
<define name="PureTextElement" combine="choice">
|
|
83
|
-
<ref name="hi"/>
|
|
84
|
-
</define>
|
|
85
|
-
<define name="hi">
|
|
86
|
-
<element name="hi">
|
|
87
|
-
<zeroOrMore>
|
|
88
|
-
<choice>
|
|
89
|
-
<ref name="PureTextElement"/>
|
|
90
|
-
<ref name="stem"/>
|
|
91
|
-
</choice>
|
|
92
|
-
</zeroOrMore>
|
|
93
|
-
</element>
|
|
94
|
-
</define>
|
|
95
|
-
<define name="submitters">
|
|
96
|
-
<element name="submitters">
|
|
97
|
-
<ref name="Basic-Section"/>
|
|
98
|
-
</element>
|
|
99
|
-
</define>
|
|
100
64
|
<define name="committee">
|
|
101
65
|
<element name="committee">
|
|
102
66
|
<choice>
|
|
@@ -116,36 +80,4 @@
|
|
|
116
80
|
<ref name="IsoWorkgroup"/>
|
|
117
81
|
</element>
|
|
118
82
|
</define>
|
|
119
|
-
<define name="ogc-standard">
|
|
120
|
-
<element name="ogc-standard">
|
|
121
|
-
<attribute name="version"/>
|
|
122
|
-
<attribute name="type">
|
|
123
|
-
<choice>
|
|
124
|
-
<value>semantic</value>
|
|
125
|
-
<value>presentation</value>
|
|
126
|
-
</choice>
|
|
127
|
-
</attribute>
|
|
128
|
-
<ref name="bibdata"/>
|
|
129
|
-
<zeroOrMore>
|
|
130
|
-
<ref name="termdocsource"/>
|
|
131
|
-
</zeroOrMore>
|
|
132
|
-
<optional>
|
|
133
|
-
<ref name="misccontainer"/>
|
|
134
|
-
</optional>
|
|
135
|
-
<optional>
|
|
136
|
-
<ref name="boilerplate"/>
|
|
137
|
-
</optional>
|
|
138
|
-
<ref name="preface"/>
|
|
139
|
-
<oneOrMore>
|
|
140
|
-
<ref name="sections"/>
|
|
141
|
-
</oneOrMore>
|
|
142
|
-
<zeroOrMore>
|
|
143
|
-
<ref name="annex"/>
|
|
144
|
-
</zeroOrMore>
|
|
145
|
-
<ref name="bibliography"/>
|
|
146
|
-
<zeroOrMore>
|
|
147
|
-
<ref name="indexsect"/>
|
|
148
|
-
</zeroOrMore>
|
|
149
|
-
</element>
|
|
150
|
-
</define>
|
|
151
83
|
</grammar>
|