relaton-gb 1.12.1 → 1.14.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/workflows/rake.yml +0 -1
- data/.github/workflows/release.yml +22 -0
- data/README.adoc +24 -69
- data/grammars/basicdoc.rng +3 -27
- data/grammars/biblio-standoc.rng +164 -0
- data/grammars/biblio.rng +90 -24
- data/grammars/relaton-gb-compile.rng +11 -0
- data/grammars/relaton-gb.rng +297 -0
- data/lib/relaton_gb/gb_bibliographic_item.rb +10 -5
- data/lib/relaton_gb/t_scrapper.rb +4 -4
- data/lib/relaton_gb/version.rb +1 -1
- data/relaton_gb.gemspec +1 -1
- metadata +8 -8
- data/grammars/gbstandard.rng +0 -316
- data/grammars/isodoc.rng +0 -2781
- data/grammars/isostandard.rng +0 -514
- 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: bbeb1dfc83ab0140069905c65ebf8692f6df81dfe22671fedb6625ba4a53f829
|
|
4
|
+
data.tar.gz: 9af4552cec23b9a17f070a189eac9b408f50c721592bd193497cf45889a5dc99
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: '069cc2fdab709c560c5bfed46df413dfe32910c016c4ef20c5eac1b749251d26a70094bccab42bb8e78a317b57acefad71d5ab9a67f613547661a738e7656328'
|
|
7
|
+
data.tar.gz: c5a0af50cb523b5dfa6237beb831cad933b1202bbf295830572d4a4841ecba875e4b8002932365aa83fd9296adb183cab401f48122333f209b56ef807caabadf
|
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
|
@@ -9,7 +9,7 @@ image:https://img.shields.io/github/issues-pr-raw/relaton/relaton-gb.svg["Pull R
|
|
|
9
9
|
image:https://img.shields.io/github/commits-since/relaton/relaton-gb/latest.svg["Commits since latest",link="https://github.com/relaton/relaton-gb/releases"]
|
|
10
10
|
|
|
11
11
|
|
|
12
|
-
RelatonGb is a Ruby gem that
|
|
12
|
+
RelatonGb is a Ruby gem that searches and fetches Chinese GB standards.
|
|
13
13
|
The standards scraped form:
|
|
14
14
|
|
|
15
15
|
* GB standards - http://www.std.gov.cn/gb/search
|
|
@@ -44,6 +44,7 @@ Or install it yourself as:
|
|
|
44
44
|
[source,ruby]
|
|
45
45
|
----
|
|
46
46
|
require 'relaton_gb'
|
|
47
|
+
=> true
|
|
47
48
|
|
|
48
49
|
hit_collection = RelatonGb::GbBibliography.search "GB/T 20223-2006"
|
|
49
50
|
=> <RelatonGb::HitCollection:0x007fc8d8a26d10 @ref= @fetched=false>
|
|
@@ -109,78 +110,32 @@ RelatonGb::GbBibliographicItem.from_hash hash
|
|
|
109
110
|
[source,ruby]
|
|
110
111
|
----
|
|
111
112
|
hit_collection.first.fetch.to_xml
|
|
112
|
-
=>"<bibitem id="GB/T20223-2006" type="standard
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
<date type="published">
|
|
120
|
-
<on>2006</on>
|
|
121
|
-
</date>
|
|
122
|
-
<contributor>
|
|
123
|
-
<role type="publisher"/>
|
|
124
|
-
<organization>
|
|
125
|
-
<name language="en">General Administration of Quality Supervision, Inspection and Quarantine; Standardization Administration of China</name>
|
|
126
|
-
<name language="zh">中华人民共和国国家质量监督检验检疫总局 中国国家标准化管理委员会</name>
|
|
127
|
-
</organization>
|
|
128
|
-
</contributor>
|
|
129
|
-
<language>zh</language>
|
|
130
|
-
<script>Hans</script>
|
|
131
|
-
<status>
|
|
132
|
-
<stage>obsoleted</stage>
|
|
133
|
-
</status>
|
|
134
|
-
</bibitem>"
|
|
113
|
+
=> "<bibitem id="GB/T20223-2006" type="standard" schema-version="v1.2.1">
|
|
114
|
+
<fetched>2022-12-03</fetched>
|
|
115
|
+
<title type="title-main" format="text/plain" language="zh" script="Hans">棉短绒</title>
|
|
116
|
+
<title type="main" format="text/plain" language="zh" script="Hans">棉短绒</title>
|
|
117
|
+
<title type="title-main" format="text/plain" language="en" script="Latn">Cotton linter</title>
|
|
118
|
+
...
|
|
119
|
+
</bibitem>"
|
|
135
120
|
----
|
|
136
|
-
|
|
121
|
+
|
|
122
|
+
With `bibdata: true` option XML output is wrapped with `bibdata` element and `ext` element added.
|
|
123
|
+
|
|
137
124
|
[source,ruby]
|
|
138
125
|
----
|
|
139
126
|
hit_collection.first.fetch.to_xml bibdata: true
|
|
140
|
-
=>"<bibdata type="
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
<organization>
|
|
153
|
-
<name language="en">General Administration of Quality Supervision, Inspection and Quarantine; Standardization Administration of China</name>
|
|
154
|
-
<name language="zh">中华人民共和国国家质量监督检验检疫总局 中国国家标准化管理委员会</name>
|
|
155
|
-
</organization>
|
|
156
|
-
</contributor>
|
|
157
|
-
<language>zh</language>
|
|
158
|
-
<script>Hans</script>
|
|
159
|
-
<status>
|
|
160
|
-
<stage>obsoleted</stage>
|
|
161
|
-
</status>
|
|
162
|
-
<ext>
|
|
163
|
-
<doctype>international-standard</doctype>
|
|
164
|
-
<gbcommittee type="technical">中国纤维检验局</gbcommittee>
|
|
165
|
-
<ics>
|
|
166
|
-
<code>59.060.10</code>
|
|
167
|
-
<text>Natural fibres</text>
|
|
168
|
-
</ics>
|
|
169
|
-
<structuredidentifier type="Chinese Standard">
|
|
170
|
-
<project-number>GB/T 20223</project-number>
|
|
171
|
-
</structuredidentifier>
|
|
172
|
-
<gbtype>
|
|
173
|
-
<gbscope>national</gbscope>
|
|
174
|
-
<gbprefix>GB_national</gbprefix>
|
|
175
|
-
<gbmandate>recommended</gbmandate>
|
|
176
|
-
</gbtype>
|
|
177
|
-
<ccs>
|
|
178
|
-
<code>B32</code>
|
|
179
|
-
<text>纤维作物与产品</text>
|
|
180
|
-
</ccs>
|
|
181
|
-
<gbplannumber>GB/T 20223</gbplannumber>
|
|
182
|
-
</ext>
|
|
183
|
-
</bibdata>"
|
|
127
|
+
=> "<bibdata type="standard" schema-version="v1.2.1">
|
|
128
|
+
<fetched>2022-12-03</fetched>
|
|
129
|
+
<title type="title-main" format="text/plain" language="zh" script="Hans">棉短绒</title>
|
|
130
|
+
<title type="main" format="text/plain" language="zh" script="Hans">棉短绒</title>
|
|
131
|
+
<title type="title-main" format="text/plain" language="en" script="Latn">Cotton linter</title>
|
|
132
|
+
<title type="main" format="text/plain" language="en" script="Latn">Cotton linter</title>
|
|
133
|
+
...
|
|
134
|
+
<ext schema-version="v1.0.0">
|
|
135
|
+
<doctype>standard</doctype>
|
|
136
|
+
...
|
|
137
|
+
</ext>
|
|
138
|
+
</bibdata>"
|
|
184
139
|
----
|
|
185
140
|
|
|
186
141
|
=== Typed links
|
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>
|
|
@@ -225,9 +241,9 @@
|
|
|
225
241
|
<zeroOrMore>
|
|
226
242
|
<ref name="forename"/>
|
|
227
243
|
</zeroOrMore>
|
|
228
|
-
<
|
|
229
|
-
<ref name="
|
|
230
|
-
</
|
|
244
|
+
<optional>
|
|
245
|
+
<ref name="formatted-initials"/>
|
|
246
|
+
</optional>
|
|
231
247
|
<ref name="surname"/>
|
|
232
248
|
<zeroOrMore>
|
|
233
249
|
<ref name="addition"/>
|
|
@@ -247,8 +263,8 @@
|
|
|
247
263
|
<ref name="LocalizedString"/>
|
|
248
264
|
</element>
|
|
249
265
|
</define>
|
|
250
|
-
<define name="
|
|
251
|
-
<element name="
|
|
266
|
+
<define name="formatted-initials">
|
|
267
|
+
<element name="formatted-initials">
|
|
252
268
|
<ref name="LocalizedString"/>
|
|
253
269
|
</element>
|
|
254
270
|
</define>
|
|
@@ -264,6 +280,9 @@
|
|
|
264
280
|
</define>
|
|
265
281
|
<define name="forename">
|
|
266
282
|
<element name="forename">
|
|
283
|
+
<optional>
|
|
284
|
+
<attribute name="initial"/>
|
|
285
|
+
</optional>
|
|
267
286
|
<ref name="LocalizedString"/>
|
|
268
287
|
</element>
|
|
269
288
|
</define>
|
|
@@ -497,6 +516,17 @@
|
|
|
497
516
|
</define>
|
|
498
517
|
<define name="localityStack">
|
|
499
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>
|
|
500
530
|
<zeroOrMore>
|
|
501
531
|
<ref name="locality"/>
|
|
502
532
|
</zeroOrMore>
|
|
@@ -509,6 +539,17 @@
|
|
|
509
539
|
</define>
|
|
510
540
|
<define name="sourceLocalityStack">
|
|
511
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>
|
|
512
553
|
<zeroOrMore>
|
|
513
554
|
<ref name="sourceLocality"/>
|
|
514
555
|
</zeroOrMore>
|
|
@@ -611,6 +652,9 @@
|
|
|
611
652
|
<ref name="BibItemType"/>
|
|
612
653
|
</attribute>
|
|
613
654
|
</optional>
|
|
655
|
+
<optional>
|
|
656
|
+
<attribute name="schema-version"/>
|
|
657
|
+
</optional>
|
|
614
658
|
<optional>
|
|
615
659
|
<ref name="fetched"/>
|
|
616
660
|
</optional>
|
|
@@ -647,6 +691,9 @@
|
|
|
647
691
|
<zeroOrMore>
|
|
648
692
|
<ref name="language"/>
|
|
649
693
|
</zeroOrMore>
|
|
694
|
+
<zeroOrMore>
|
|
695
|
+
<ref name="locale"/>
|
|
696
|
+
</zeroOrMore>
|
|
650
697
|
<zeroOrMore>
|
|
651
698
|
<ref name="script"/>
|
|
652
699
|
</zeroOrMore>
|
|
@@ -702,6 +749,9 @@
|
|
|
702
749
|
<ref name="BibItemType"/>
|
|
703
750
|
</attribute>
|
|
704
751
|
</optional>
|
|
752
|
+
<optional>
|
|
753
|
+
<attribute name="schema-version"/>
|
|
754
|
+
</optional>
|
|
705
755
|
<optional>
|
|
706
756
|
<ref name="fetched"/>
|
|
707
757
|
</optional>
|
|
@@ -738,6 +788,9 @@
|
|
|
738
788
|
<zeroOrMore>
|
|
739
789
|
<ref name="language"/>
|
|
740
790
|
</zeroOrMore>
|
|
791
|
+
<zeroOrMore>
|
|
792
|
+
<ref name="locale"/>
|
|
793
|
+
</zeroOrMore>
|
|
741
794
|
<zeroOrMore>
|
|
742
795
|
<ref name="script"/>
|
|
743
796
|
</zeroOrMore>
|
|
@@ -851,6 +904,15 @@
|
|
|
851
904
|
<optional>
|
|
852
905
|
<attribute name="type"/>
|
|
853
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>
|
|
854
916
|
<data type="anyURI"/>
|
|
855
917
|
</define>
|
|
856
918
|
<define name="DateType">
|
|
@@ -879,6 +941,7 @@
|
|
|
879
941
|
<value>vote-started</value>
|
|
880
942
|
<value>vote-ended</value>
|
|
881
943
|
<value>announced</value>
|
|
944
|
+
<value>stable-until</value>
|
|
882
945
|
</choice>
|
|
883
946
|
</define>
|
|
884
947
|
<define name="bdate">
|
|
@@ -927,6 +990,9 @@
|
|
|
927
990
|
<optional>
|
|
928
991
|
<attribute name="language"/>
|
|
929
992
|
</optional>
|
|
993
|
+
<optional>
|
|
994
|
+
<attribute name="locale"/>
|
|
995
|
+
</optional>
|
|
930
996
|
<optional>
|
|
931
997
|
<attribute name="script"/>
|
|
932
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-gb.rng"/>
|
|
5
|
+
<start>
|
|
6
|
+
<choice>
|
|
7
|
+
<ref name="bibitem"/>
|
|
8
|
+
<ref name="bibdata"/>
|
|
9
|
+
</choice>
|
|
10
|
+
</start>
|
|
11
|
+
</grammar>
|