relaton-3gpp 1.13.0 → 1.14.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 7f5f0ab1062934b5d1df5ccc23fa70ba38ad63f39ccd368b7843643cf115f2f9
4
- data.tar.gz: 1cf2b41cc082739fa8a91b68c870558ff3e3be935a4d0afa822c7b660493ea40
3
+ metadata.gz: 2b517c9d22d68ff8b15cac60a6ecc2d6a943e42143f93e7db5eec0cdf840953f
4
+ data.tar.gz: cead26203248e1acff2ac1eb4101b596ef0f3759434d6d0ecb68ebb95d99e6b8
5
5
  SHA512:
6
- metadata.gz: 3902428c49a482f2cda63b4449d64575b1b43e98a0218591f8ec4a579016561cf7b6cb9a30ac0403913a4ebccd1cf36b918fcd0d9fa3558f3b87e082408d780e
7
- data.tar.gz: a44403fca46651fd6d4e8479adae0dde3e05cbfd69d277572fda771de78d6605517ae7322b0c8c67aee3fa92f16b042db3b9068365d7f03dbaa947dd0b77eb0f
6
+ metadata.gz: d96c27426f3fd56f74d310afb3c2f1da70d0ad0fea25ee768e3005597986fc160e20c6e8c719c7ca51e45f631ca49d0ad04f0fc867713112aac82697ba690bcb
7
+ data.tar.gz: b7c2c50c0e06fd11cc4f9a128e9a8c955856b86a55b0580beb96488021b37698515a40a58e56455400b6c47b8a527f188ad2e131bcadf81ab56c06ae8d3ab2f4
@@ -5,9 +5,8 @@ name: rake
5
5
  on:
6
6
  push:
7
7
  branches: [ master, main ]
8
- tags: [ v* ]
9
8
  pull_request:
10
9
 
11
10
  jobs:
12
11
  rake:
13
- uses: relaton/support/.github/workflows/rake.yml@master
12
+ uses: relaton/support/.github/workflows/rake.yml@master
@@ -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
@@ -42,62 +42,53 @@ item = Relaton3gpp::Bibliography.get "3GPP TR 00.01U:UMTS/3.0.0"
42
42
  [source,ruby]
43
43
  ----
44
44
  item.to_xml
45
- => "<bibitem id="3GPPTR00.01U-UMTS/3.0.0" type="standard">
46
- <fetched>2021-12-09</fetched>
47
- <title type="main" format="text/plain">Work programme for the standardization of Universal Mobile Telecommunications System (UMTS)</title>
48
- <uri type="src">http://www.3gpp.org/ftp/Specs/archive/00_series/00.01U/0001U-300.zip</uri>
49
- <docidentifier type="3GPP">3GPP TR 00.01U:UMTS/3.0.0</docidentifier>
50
- <docidentifier type="rapporteurId">2261</docidentifier>
51
- <docnumber>TR 00.01U:UMTS/3.0.0</docnumber>
52
- <language>en</language>
53
- <script>Latn</script>
54
- <status>
55
- <stage>withdrawn</stage>
56
- </status>
57
- </bibitem>"
58
- ----
59
-
60
- With argument `bibdata: true` it ouputs XML wrapped by `bibdata` element and adds flavour `ext` element.
45
+ => "<bibitem id="3GPPTR00.01U-UMTS/3.0.0" type="standard" schema-version="v1.2.1">
46
+ <fetched>2022-12-02</fetched>
47
+ <title type="main" format="text/plain">Work programme for the standardization of Universal Mobile Telecommunications System (UMTS)</title>
48
+ <uri type="src">http://www.3gpp.org/ftp/Specs/archive/00_series/00.01U/0001U-300.zip</uri>
49
+ <docidentifier type="3GPP" primary="true">3GPP TR 00.01U:UMTS/3.0.0</docidentifier>
50
+ <docnumber>TR 00.01U:UMTS/3.0.0</docnumber>
51
+ ...
52
+ </bibitem>"
53
+ ----
54
+
55
+ With argument `bibdata: true` it outputs XML wrapped by `bibdata` element and adds flavor `ext` element.
61
56
 
62
57
  [source,ruby]
63
58
  ----
64
59
  item.to_xml bibdata: true
65
- => "<bibdata type="standard">
66
- <fetched>2021-12-09</fetched>
67
- <title type="main" format="text/plain">Work programme for the standardization of Universal Mobile Telecommunications System (UMTS)</title>
68
- <uri type="src">http://www.3gpp.org/ftp/Specs/archive/00_series/00.01U/0001U-300.zip</uri>
69
- <docidentifier type="3GPP">3GPP TR 00.01U:UMTS/3.0.0</docidentifier>
70
- <docidentifier type="rapporteurId">2261</docidentifier>
71
- <docnumber>TR 00.01U:UMTS/3.0.0</docnumber>
72
- <language>en</language>
73
- <script>Latn</script>
74
- <status>
75
- <stage>withdrawn</stage>
76
- </status>
77
- <ext>
78
- <doctype>TR</doctype>
79
- <editorialgroup>
80
- <technical-committee type="prime">SMG5</technical-committee>
81
- </editorialgroup>
82
- <radiotechnology>3G</radiotechnology>
83
- <release>
84
- <version2G>3</version2G>
85
- <version3G>3</version3G>
86
- <defunct>true</defunct>
87
- <freeze-meeting>SMG-28</freeze-meeting>
88
- <freeze-stage1-meeting>SMG-28</freeze-stage1-meeting>
89
- <freeze-stage2-meeting>SMG-28</freeze-stage2-meeting>
90
- <freeze-stage3-meeting>SMG-28</freeze-stage3-meeting>
91
- <close-meeting>SP-28</close-meeting>
92
- <project-end>1999-02-12</project-end>
93
- </release>
94
- </ext>
95
- </bibdata>"
60
+ => "<bibdata type="standard" schema-version="v1.2.1">
61
+ <fetched>2022-12-02</fetched>
62
+ <title type="main" format="text/plain">Work programme for the standardization of Universal Mobile Telecommunications System (UMTS)</title>
63
+ <uri type="src">http://www.3gpp.org/ftp/Specs/archive/00_series/00.01U/0001U-300.zip</uri>
64
+ <docidentifier type="3GPP" primary="true">3GPP TR 00.01U:UMTS/3.0.0</docidentifier>
65
+ <docnumber>TR 00.01U:UMTS/3.0.0</docnumber>
66
+ ...
67
+ <ext schema-version="v1.0.1">
68
+ <doctype>TR</doctype>
69
+ <editorialgroup>
70
+ <technical-committee type="prime">SMG5</technical-committee>
71
+ </editorialgroup>
72
+ <radiotechnology>3G</radiotechnology>
73
+ <release>
74
+ <version2G>3</version2G>
75
+ <version3G>3</version3G>
76
+ <defunct>true</defunct>
77
+ <freeze-meeting>SMG-28</freeze-meeting>
78
+ <freeze-stage1-meeting>SMG-28</freeze-stage1-meeting>
79
+ <freeze-stage2-meeting>SMG-28</freeze-stage2-meeting>
80
+ <freeze-stage3-meeting>SMG-28</freeze-stage3-meeting>
81
+ <close-meeting>SP-28</close-meeting>
82
+ <project-end>1999-02-12</project-end>
83
+ </release>
84
+ </ext>
85
+ </ext>
86
+ </bibdata>"
96
87
  ----
97
88
 
98
89
  === Typed links
99
90
 
100
- Some of 3GPP documents have `src` type link.
91
+ Some 3GPP documents have `src` type link.
101
92
 
102
93
  [source,ruby]
103
94
  ----
@@ -111,8 +102,8 @@ item.link.first.content
111
102
  === Create bibliographic item from XML
112
103
  [source,ruby]
113
104
  ----
114
- RelatonW3c::XMLParser.from_xml File.read('spec/fixtures/cr_json_ld11.xml')
115
- => #<RelatonW3c::W3cBibliographicItem:0x007f9381efce98
105
+ Relaton3gpp::XMLParser.from_xml File.read('spec/fixtures/bibdata.xml')
106
+ => #<Relaton3gpp::BibliographicItem:0x00007fcf5f21af30
116
107
  ...
117
108
  ----
118
109
 
@@ -120,15 +111,13 @@ RelatonW3c::XMLParser.from_xml File.read('spec/fixtures/cr_json_ld11.xml')
120
111
  [source,ruby]
121
112
  ----
122
113
  hash = YAML.load_file 'spec/fixtures/bib.yaml'
123
- => {"id"=>"3GPPTR00.01U-UMTS/3.0.0",
124
- "title"=>{"type"=>"main", "content"=>"Work programme for the standardization of Universal Mobile Telecommunications System (UMTS)", "format"=>"text/plain"},
114
+ => {"schema-version"=>"v1.2.1",
115
+ "id"=>"3GPPTR00.01U-UMTS/3.0.0",
125
116
  ...
126
117
 
127
118
  bib_hash = Relaton3gpp::HashConverter.hash_to_bib hash
128
- => {:id=>"3GPPTR00.01U-UMTS/3.0.0",
129
- :title=>
130
- #<RelatonBib::TypedTitleStringCollection:0x00007f92aa8cdf40
131
- @array=[{:type=>"main", :content=>"Work programme for the standardization of Universal Mobile Telecommunications System (UMTS)", :format=>"text/plain"}]>,
119
+ => {:"schema-version"=>"v1.2.1",
120
+ :id=>"3GPPTR00.01U-UMTS/3.0.0",
132
121
  ...
133
122
 
134
123
  Relaton3gpp::BibliographicItem.new(**bib_hash)
@@ -144,11 +133,11 @@ The method `Relaton3GPP::DataFetcher.fetch(output: "data", format: "yaml")` conv
144
133
  Arguments:
145
134
 
146
135
  - `output` - folder to save documents (default './data').
147
- - `format` - format in which the documents are saved. Possimle formats are: `yaml`, `xml`, `bibxml` (default `yaml`).
136
+ - `format` - a format in which the documents are saved. Possible formats are: `yaml`, `xml`, `bibxml` (default `yaml`).
148
137
 
149
138
  [source,ruby]
150
139
  ----
151
- Relaton3GPP::DataFetcher.fetch
140
+ Relaton3GPP::DataFetcher.fetch output: "data", format: "yaml"
152
141
  Started at: 2021-12-10 19:58:46 +0100
153
142
  Stopped at: 2021-12-10 20:08:03 +0100
154
143
  Done in: 557 sec.
@@ -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
- <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"/>
@@ -73,8 +74,14 @@
73
74
  <text/>
74
75
  </element>
75
76
  </define>
76
- <define name="script">
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
- <zeroOrMore>
174
+ <oneOrMore>
162
175
  <ref name="role"/>
163
- </zeroOrMore>
176
+ </oneOrMore>
164
177
  <ref name="ContributorInfo"/>
165
178
  </element>
166
179
  </define>
167
180
  <define name="role">
168
181
  <element name="role">
169
- <optional>
170
- <attribute name="type">
171
- <choice>
172
- <value>author</value>
173
- <value>performer</value>
174
- <value>publisher</value>
175
- <value>editor</value>
176
- <value>adapter</value>
177
- <value>translator</value>
178
- <value>distributor</value>
179
- </choice>
180
- </attribute>
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
+ <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-3gpp.rng"/>
5
+ <start>
6
+ <choice>
7
+ <ref name="bibitem"/>
8
+ <ref name="bibdata"/>
9
+ </choice>
10
+ </start>
11
+ </grammar>