relaton-gb 1.13.0 → 1.16.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/release.yml +24 -0
- data/.gitignore +1 -0
- data/.rubocop.yml +1 -1
- data/Gemfile +10 -1
- data/README.adoc +24 -69
- data/grammars/basicdoc.rng +3 -28
- data/grammars/biblio-standoc.rng +164 -0
- data/grammars/biblio.rng +95 -22
- 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/gb_bibliography.rb +10 -9
- data/lib/relaton_gb/version.rb +1 -1
- data/relaton_gb.gemspec +2 -11
- metadata +13 -125
- data/grammars/gbstandard.rng +0 -316
- data/grammars/isodoc.rng +0 -2807
- 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: af59eecad25f703949530ba1d289daac5eafea562bf4453b56e92e5951747ffa
|
4
|
+
data.tar.gz: 7c6dcf93299919fe1869fb91c93f556382d129d1cfdc69c69c4d09027cfdb1ee
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: c45e0158f52768fa4e1468794c9ec78a207db0105f8dc285368c6cde561c1f5695b85dd1699bf2b48a84ac703a6e74f363962536fc8df50c0389bf3055e6a0c8
|
7
|
+
data.tar.gz: 8fd2778d0a2a78f5301666bc5615d7ddf73f2ec627d80ea254cd669915dbad1fcf33aa72ab2db24e50cd702faf85077403909e3d0b717d2e3a0474bd88ca6c20
|
@@ -0,0 +1,24 @@
|
|
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
|
+
Also, you can pass 'skip' to skip 'git tag' and do 'gem push' for the current version
|
12
|
+
required: true
|
13
|
+
default: 'skip'
|
14
|
+
repository_dispatch:
|
15
|
+
types: [ do-release ]
|
16
|
+
|
17
|
+
|
18
|
+
jobs:
|
19
|
+
release:
|
20
|
+
uses: relaton/support/.github/workflows/release.yml@master
|
21
|
+
with:
|
22
|
+
next_version: ${{ github.event.inputs.next_version }}
|
23
|
+
secrets:
|
24
|
+
rubygems-api-key: ${{ secrets.RELATON_CI_RUBYGEMS_API_KEY }}
|
data/.gitignore
CHANGED
data/.rubocop.yml
CHANGED
data/Gemfile
CHANGED
@@ -3,7 +3,16 @@ Encoding.default_internal = Encoding::UTF_8
|
|
3
3
|
|
4
4
|
source "https://rubygems.org"
|
5
5
|
|
6
|
-
git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
|
6
|
+
git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
|
7
7
|
|
8
8
|
# Specify your gem's dependencies in gdbib.gemspec
|
9
9
|
gemspec
|
10
|
+
|
11
|
+
gem "equivalent-xml", "~> 0.6"
|
12
|
+
gem "pry-byebug"
|
13
|
+
gem "rake", "~> 13.0"
|
14
|
+
gem "rspec", "~> 3.0"
|
15
|
+
gem "ruby-jing"
|
16
|
+
gem "simplecov"
|
17
|
+
gem "vcr"
|
18
|
+
gem "webmock"
|
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>
|
@@ -527,7 +522,6 @@
|
|
527
522
|
<value>tip</value>
|
528
523
|
<value>important</value>
|
529
524
|
<value>caution</value>
|
530
|
-
<value>statement</value>
|
531
525
|
</choice>
|
532
526
|
</define>
|
533
527
|
<define name="figure">
|
@@ -688,6 +682,9 @@
|
|
688
682
|
</define>
|
689
683
|
<define name="underline">
|
690
684
|
<element name="underline">
|
685
|
+
<optional>
|
686
|
+
<attribute name="style"/>
|
687
|
+
</optional>
|
691
688
|
<zeroOrMore>
|
692
689
|
<ref name="PureTextElement"/>
|
693
690
|
</zeroOrMore>
|
@@ -1125,26 +1122,4 @@
|
|
1125
1122
|
</zeroOrMore>
|
1126
1123
|
</element>
|
1127
1124
|
</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
1125
|
</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>
|
@@ -200,6 +216,9 @@
|
|
200
216
|
<optional>
|
201
217
|
<ref name="fullname"/>
|
202
218
|
</optional>
|
219
|
+
<zeroOrMore>
|
220
|
+
<ref name="credential"/>
|
221
|
+
</zeroOrMore>
|
203
222
|
<zeroOrMore>
|
204
223
|
<ref name="affiliation"/>
|
205
224
|
</zeroOrMore>
|
@@ -216,6 +235,11 @@
|
|
216
235
|
<ref name="FullNameType"/>
|
217
236
|
</element>
|
218
237
|
</define>
|
238
|
+
<define name="credential">
|
239
|
+
<element name="credential">
|
240
|
+
<text/>
|
241
|
+
</element>
|
242
|
+
</define>
|
219
243
|
<define name="FullNameType">
|
220
244
|
<choice>
|
221
245
|
<group>
|
@@ -289,7 +313,9 @@
|
|
289
313
|
<zeroOrMore>
|
290
314
|
<ref name="affiliationdescription"/>
|
291
315
|
</zeroOrMore>
|
292
|
-
<
|
316
|
+
<optional>
|
317
|
+
<ref name="organization"/>
|
318
|
+
</optional>
|
293
319
|
</element>
|
294
320
|
</define>
|
295
321
|
<define name="affiliationname">
|
@@ -500,6 +526,17 @@
|
|
500
526
|
</define>
|
501
527
|
<define name="localityStack">
|
502
528
|
<element name="localityStack">
|
529
|
+
<optional>
|
530
|
+
<attribute name="connective">
|
531
|
+
<choice>
|
532
|
+
<value>and</value>
|
533
|
+
<value>or</value>
|
534
|
+
<value>from</value>
|
535
|
+
<value>to</value>
|
536
|
+
<value/>
|
537
|
+
</choice>
|
538
|
+
</attribute>
|
539
|
+
</optional>
|
503
540
|
<zeroOrMore>
|
504
541
|
<ref name="locality"/>
|
505
542
|
</zeroOrMore>
|
@@ -512,6 +549,17 @@
|
|
512
549
|
</define>
|
513
550
|
<define name="sourceLocalityStack">
|
514
551
|
<element name="sourceLocalityStack">
|
552
|
+
<optional>
|
553
|
+
<attribute name="connective">
|
554
|
+
<choice>
|
555
|
+
<value>and</value>
|
556
|
+
<value>or</value>
|
557
|
+
<value>from</value>
|
558
|
+
<value>to</value>
|
559
|
+
<value/>
|
560
|
+
</choice>
|
561
|
+
</attribute>
|
562
|
+
</optional>
|
515
563
|
<zeroOrMore>
|
516
564
|
<ref name="sourceLocality"/>
|
517
565
|
</zeroOrMore>
|
@@ -614,6 +662,9 @@
|
|
614
662
|
<ref name="BibItemType"/>
|
615
663
|
</attribute>
|
616
664
|
</optional>
|
665
|
+
<optional>
|
666
|
+
<attribute name="schema-version"/>
|
667
|
+
</optional>
|
617
668
|
<optional>
|
618
669
|
<ref name="fetched"/>
|
619
670
|
</optional>
|
@@ -650,6 +701,9 @@
|
|
650
701
|
<zeroOrMore>
|
651
702
|
<ref name="language"/>
|
652
703
|
</zeroOrMore>
|
704
|
+
<zeroOrMore>
|
705
|
+
<ref name="locale"/>
|
706
|
+
</zeroOrMore>
|
653
707
|
<zeroOrMore>
|
654
708
|
<ref name="script"/>
|
655
709
|
</zeroOrMore>
|
@@ -705,6 +759,9 @@
|
|
705
759
|
<ref name="BibItemType"/>
|
706
760
|
</attribute>
|
707
761
|
</optional>
|
762
|
+
<optional>
|
763
|
+
<attribute name="schema-version"/>
|
764
|
+
</optional>
|
708
765
|
<optional>
|
709
766
|
<ref name="fetched"/>
|
710
767
|
</optional>
|
@@ -741,6 +798,9 @@
|
|
741
798
|
<zeroOrMore>
|
742
799
|
<ref name="language"/>
|
743
800
|
</zeroOrMore>
|
801
|
+
<zeroOrMore>
|
802
|
+
<ref name="locale"/>
|
803
|
+
</zeroOrMore>
|
744
804
|
<zeroOrMore>
|
745
805
|
<ref name="script"/>
|
746
806
|
</zeroOrMore>
|
@@ -854,6 +914,15 @@
|
|
854
914
|
<optional>
|
855
915
|
<attribute name="type"/>
|
856
916
|
</optional>
|
917
|
+
<optional>
|
918
|
+
<attribute name="language"/>
|
919
|
+
</optional>
|
920
|
+
<optional>
|
921
|
+
<attribute name="locale"/>
|
922
|
+
</optional>
|
923
|
+
<optional>
|
924
|
+
<attribute name="script"/>
|
925
|
+
</optional>
|
857
926
|
<data type="anyURI"/>
|
858
927
|
</define>
|
859
928
|
<define name="DateType">
|
@@ -882,6 +951,7 @@
|
|
882
951
|
<value>vote-started</value>
|
883
952
|
<value>vote-ended</value>
|
884
953
|
<value>announced</value>
|
954
|
+
<value>stable-until</value>
|
885
955
|
</choice>
|
886
956
|
</define>
|
887
957
|
<define name="bdate">
|
@@ -930,6 +1000,9 @@
|
|
930
1000
|
<optional>
|
931
1001
|
<attribute name="language"/>
|
932
1002
|
</optional>
|
1003
|
+
<optional>
|
1004
|
+
<attribute name="locale"/>
|
1005
|
+
</optional>
|
933
1006
|
<optional>
|
934
1007
|
<attribute name="script"/>
|
935
1008
|
</optional>
|
@@ -1210,7 +1283,7 @@
|
|
1210
1283
|
<value>mergedInto</value>
|
1211
1284
|
<value>splits</value>
|
1212
1285
|
<value>splitInto</value>
|
1213
|
-
<value>
|
1286
|
+
<value>instanceOf</value>
|
1214
1287
|
<value>hasInstance</value>
|
1215
1288
|
<value>exemplarOf</value>
|
1216
1289
|
<value>hasExemplar</value>
|
@@ -1253,7 +1326,7 @@
|
|
1253
1326
|
<value>commentaryOf</value>
|
1254
1327
|
<value>hasCommentary</value>
|
1255
1328
|
<value>related</value>
|
1256
|
-
<value>
|
1329
|
+
<value>hasComplement</value>
|
1257
1330
|
<value>complementOf</value>
|
1258
1331
|
<value>obsoletes</value>
|
1259
1332
|
<value>obsoletedBy</value>
|
@@ -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>
|