relaton-ogc 0.7.0 → 0.7.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/grammars/biblio.rng +2 -12
- data/grammars/isodoc.rng +544 -27
- data/grammars/ogc.rng +43 -64
- data/lib/relaton_ogc/ogc_bibliographic_item.rb +31 -8
- data/lib/relaton_ogc/scrapper.rb +38 -29
- data/lib/relaton_ogc/version.rb +1 -1
- data/lib/relaton_ogc/xml_parser.rb +15 -3
- data/relaton_ogc.gemspec +1 -1
- metadata +6 -7
- data/grammars/isostandard.rng +0 -855
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 825f9e550edb2f2119b70aaf7e424c02fd1b9695ecf8081e1e0e88a01a106a53
|
4
|
+
data.tar.gz: b50c486112e2f586e18c29f4408899afb753a633c56b33113f6695bf207c9091
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: a515557d33b97d7c77dbb0a9a2a5f49c67db5fcd232fb361d37c8f0da1a57ead3b1e67331d5633c6d9fcb19c253dfbf1262e3acfb3d70751e7d708659851a6f6
|
7
|
+
data.tar.gz: 95f90948d2282ac5d2d98503d27eb308f2594df5c5dcebf72641575d614dd57614f26729f49d27bddd098ea22b21d950e52d505757fee6bfaf89f34fac401d41
|
data/grammars/biblio.rng
CHANGED
@@ -703,21 +703,11 @@
|
|
703
703
|
</define>
|
704
704
|
<define name="TypedTitleString">
|
705
705
|
<optional>
|
706
|
-
<attribute name="type"
|
707
|
-
<ref name="TitleType"/>
|
708
|
-
</attribute>
|
706
|
+
<attribute name="type"/>
|
709
707
|
</optional>
|
710
708
|
<ref name="FormattedString"/>
|
711
709
|
</define>
|
712
|
-
|
713
|
-
<choice>
|
714
|
-
<value>alternative</value>
|
715
|
-
<value>original</value>
|
716
|
-
<value>unofficial</value>
|
717
|
-
<value>subtitle</value>
|
718
|
-
<value>main</value>
|
719
|
-
</choice>
|
720
|
-
</define>
|
710
|
+
<!-- TitleType = ( "alternative" | "original" | "unofficial" | "subtitle" | "main" ) -->
|
721
711
|
<define name="TypedUri">
|
722
712
|
<optional>
|
723
713
|
<attribute name="type"/>
|
data/grammars/isodoc.rng
CHANGED
@@ -24,21 +24,91 @@
|
|
24
24
|
<start>
|
25
25
|
<ref name="standard-document"/>
|
26
26
|
</start>
|
27
|
+
<define name="hyperlink">
|
28
|
+
<element name="link">
|
29
|
+
<attribute name="target">
|
30
|
+
<data type="anyURI"/>
|
31
|
+
</attribute>
|
32
|
+
<optional>
|
33
|
+
<attribute name="type">
|
34
|
+
<ref name="ReferenceFormat"/>
|
35
|
+
</attribute>
|
36
|
+
</optional>
|
37
|
+
<optional>
|
38
|
+
<attribute name="alt"/>
|
39
|
+
</optional>
|
40
|
+
<text/>
|
41
|
+
</element>
|
42
|
+
</define>
|
43
|
+
<define name="xref">
|
44
|
+
<element name="xref">
|
45
|
+
<attribute name="target">
|
46
|
+
<data type="IDREF"/>
|
47
|
+
</attribute>
|
48
|
+
<optional>
|
49
|
+
<attribute name="type">
|
50
|
+
<ref name="ReferenceFormat"/>
|
51
|
+
</attribute>
|
52
|
+
</optional>
|
53
|
+
<optional>
|
54
|
+
<attribute name="alt"/>
|
55
|
+
</optional>
|
56
|
+
<text/>
|
57
|
+
</element>
|
58
|
+
</define>
|
59
|
+
<define name="example">
|
60
|
+
<element name="example">
|
61
|
+
<attribute name="id">
|
62
|
+
<data type="ID"/>
|
63
|
+
</attribute>
|
64
|
+
<optional>
|
65
|
+
<attribute name="unnumbered">
|
66
|
+
<data type="boolean"/>
|
67
|
+
</attribute>
|
68
|
+
</optional>
|
69
|
+
<optional>
|
70
|
+
<attribute name="subsequence"/>
|
71
|
+
</optional>
|
72
|
+
<optional>
|
73
|
+
<ref name="tname"/>
|
74
|
+
</optional>
|
75
|
+
<oneOrMore>
|
76
|
+
<choice>
|
77
|
+
<ref name="formula"/>
|
78
|
+
<ref name="ul"/>
|
79
|
+
<ref name="ol"/>
|
80
|
+
<ref name="dl"/>
|
81
|
+
<ref name="quote"/>
|
82
|
+
<ref name="sourcecode"/>
|
83
|
+
<ref name="paragraph-with-footnote"/>
|
84
|
+
<ref name="figure"/>
|
85
|
+
</choice>
|
86
|
+
</oneOrMore>
|
87
|
+
<zeroOrMore>
|
88
|
+
<ref name="note"/>
|
89
|
+
</zeroOrMore>
|
90
|
+
</element>
|
91
|
+
</define>
|
27
92
|
<define name="BibDataExtensionType">
|
28
93
|
<ref name="doctype"/>
|
94
|
+
<optional>
|
95
|
+
<ref name="editorialgroup"/>
|
96
|
+
</optional>
|
97
|
+
<zeroOrMore>
|
98
|
+
<ref name="ics"/>
|
99
|
+
</zeroOrMore>
|
29
100
|
<zeroOrMore>
|
30
101
|
<ref name="structuredidentifier"/>
|
31
102
|
</zeroOrMore>
|
32
103
|
</define>
|
33
|
-
|
34
|
-
<text/>
|
35
|
-
</define>
|
104
|
+
<!-- TitleType = text -->
|
36
105
|
<define name="sections">
|
37
106
|
<element name="sections">
|
38
107
|
<oneOrMore>
|
39
108
|
<choice>
|
40
109
|
<ref name="clause"/>
|
41
110
|
<ref name="terms"/>
|
111
|
+
<ref name="term-clause"/>
|
42
112
|
<ref name="definitions"/>
|
43
113
|
</choice>
|
44
114
|
</oneOrMore>
|
@@ -51,21 +121,285 @@
|
|
51
121
|
<data type="ID"/>
|
52
122
|
</attribute>
|
53
123
|
</optional>
|
124
|
+
<optional>
|
125
|
+
<attribute name="obligation">
|
126
|
+
<choice>
|
127
|
+
<value>normative</value>
|
128
|
+
<value>informative</value>
|
129
|
+
</choice>
|
130
|
+
</attribute>
|
131
|
+
</optional>
|
54
132
|
<optional>
|
55
133
|
<ref name="section-title"/>
|
56
134
|
</optional>
|
57
135
|
<zeroOrMore>
|
58
136
|
<ref name="BasicBlock"/>
|
59
137
|
</zeroOrMore>
|
138
|
+
<zeroOrMore>
|
139
|
+
<ref name="note"/>
|
140
|
+
</zeroOrMore>
|
60
141
|
<zeroOrMore>
|
61
142
|
<ref name="bibitem"/>
|
62
143
|
<zeroOrMore>
|
63
144
|
<ref name="note"/>
|
64
145
|
</zeroOrMore>
|
65
146
|
</zeroOrMore>
|
147
|
+
<zeroOrMore>
|
148
|
+
<ref name="references"/>
|
149
|
+
</zeroOrMore>
|
150
|
+
</element>
|
151
|
+
</define>
|
152
|
+
<define name="note">
|
153
|
+
<element name="note">
|
154
|
+
<attribute name="id">
|
155
|
+
<data type="ID"/>
|
156
|
+
</attribute>
|
157
|
+
<oneOrMore>
|
158
|
+
<choice>
|
159
|
+
<ref name="paragraph"/>
|
160
|
+
<ref name="ul"/>
|
161
|
+
<ref name="ol"/>
|
162
|
+
<ref name="dl"/>
|
163
|
+
<ref name="formula"/>
|
164
|
+
</choice>
|
165
|
+
</oneOrMore>
|
166
|
+
</element>
|
167
|
+
</define>
|
168
|
+
<define name="Basic-Section">
|
169
|
+
<optional>
|
170
|
+
<attribute name="id">
|
171
|
+
<data type="ID"/>
|
172
|
+
</attribute>
|
173
|
+
</optional>
|
174
|
+
<optional>
|
175
|
+
<attribute name="language"/>
|
176
|
+
</optional>
|
177
|
+
<optional>
|
178
|
+
<attribute name="script"/>
|
179
|
+
</optional>
|
180
|
+
<optional>
|
181
|
+
<attribute name="obligation">
|
182
|
+
<choice>
|
183
|
+
<value>normative</value>
|
184
|
+
<value>informative</value>
|
185
|
+
</choice>
|
186
|
+
</attribute>
|
187
|
+
</optional>
|
188
|
+
<optional>
|
189
|
+
<ref name="section-title"/>
|
190
|
+
</optional>
|
191
|
+
<group>
|
192
|
+
<oneOrMore>
|
193
|
+
<ref name="BasicBlock"/>
|
194
|
+
</oneOrMore>
|
195
|
+
<zeroOrMore>
|
196
|
+
<ref name="note"/>
|
197
|
+
</zeroOrMore>
|
198
|
+
</group>
|
199
|
+
</define>
|
200
|
+
<define name="li">
|
201
|
+
<element name="li">
|
202
|
+
<group>
|
203
|
+
<optional>
|
204
|
+
<attribute name="id">
|
205
|
+
<data type="ID"/>
|
206
|
+
</attribute>
|
207
|
+
</optional>
|
208
|
+
<oneOrMore>
|
209
|
+
<ref name="BasicBlock"/>
|
210
|
+
</oneOrMore>
|
211
|
+
</group>
|
212
|
+
<!-- exclude figures? -->
|
213
|
+
</element>
|
214
|
+
</define>
|
215
|
+
<define name="dd">
|
216
|
+
<element name="dd">
|
217
|
+
<zeroOrMore>
|
218
|
+
<!-- exclude figures? -->
|
219
|
+
<ref name="BasicBlock"/>
|
220
|
+
</zeroOrMore>
|
221
|
+
</element>
|
222
|
+
</define>
|
223
|
+
<define name="thead">
|
224
|
+
<element name="thead">
|
225
|
+
<oneOrMore>
|
226
|
+
<ref name="tr"/>
|
227
|
+
</oneOrMore>
|
228
|
+
</element>
|
229
|
+
</define>
|
230
|
+
<define name="td">
|
231
|
+
<element name="td">
|
232
|
+
<optional>
|
233
|
+
<attribute name="colspan"/>
|
234
|
+
</optional>
|
235
|
+
<optional>
|
236
|
+
<attribute name="rowspan"/>
|
237
|
+
</optional>
|
238
|
+
<optional>
|
239
|
+
<attribute name="align">
|
240
|
+
<choice>
|
241
|
+
<value>left</value>
|
242
|
+
<value>right</value>
|
243
|
+
<value>center</value>
|
244
|
+
</choice>
|
245
|
+
</attribute>
|
246
|
+
</optional>
|
247
|
+
<choice>
|
248
|
+
<zeroOrMore>
|
249
|
+
<choice>
|
250
|
+
<ref name="TextElement"/>
|
251
|
+
<ref name="fn"/>
|
252
|
+
</choice>
|
253
|
+
</zeroOrMore>
|
254
|
+
<oneOrMore>
|
255
|
+
<choice>
|
256
|
+
<ref name="paragraph-with-footnote"/>
|
257
|
+
<ref name="dl"/>
|
258
|
+
<ref name="ul"/>
|
259
|
+
<ref name="ol"/>
|
260
|
+
<ref name="figure"/>
|
261
|
+
</choice>
|
262
|
+
</oneOrMore>
|
263
|
+
</choice>
|
264
|
+
</element>
|
265
|
+
</define>
|
266
|
+
<define name="th">
|
267
|
+
<element name="th">
|
268
|
+
<optional>
|
269
|
+
<attribute name="colspan"/>
|
270
|
+
</optional>
|
271
|
+
<optional>
|
272
|
+
<attribute name="rowspan"/>
|
273
|
+
</optional>
|
274
|
+
<optional>
|
275
|
+
<attribute name="align">
|
276
|
+
<choice>
|
277
|
+
<value>left</value>
|
278
|
+
<value>right</value>
|
279
|
+
<value>center</value>
|
280
|
+
</choice>
|
281
|
+
</attribute>
|
282
|
+
</optional>
|
283
|
+
<choice>
|
284
|
+
<zeroOrMore>
|
285
|
+
<choice>
|
286
|
+
<ref name="TextElement"/>
|
287
|
+
<ref name="fn"/>
|
288
|
+
</choice>
|
289
|
+
</zeroOrMore>
|
290
|
+
<oneOrMore>
|
291
|
+
<ref name="paragraph-with-footnote"/>
|
292
|
+
</oneOrMore>
|
293
|
+
</choice>
|
294
|
+
</element>
|
295
|
+
</define>
|
296
|
+
<define name="table-note">
|
297
|
+
<element name="note">
|
298
|
+
<optional>
|
299
|
+
<attribute name="id">
|
300
|
+
<data type="ID"/>
|
301
|
+
</attribute>
|
302
|
+
</optional>
|
303
|
+
<ref name="paragraph"/>
|
66
304
|
</element>
|
67
305
|
</define>
|
68
306
|
</include>
|
307
|
+
<!-- end overrides -->
|
308
|
+
<define name="BasicBlock" combine="choice">
|
309
|
+
<choice>
|
310
|
+
<ref name="requirement"/>
|
311
|
+
<ref name="recommendation"/>
|
312
|
+
<ref name="permission"/>
|
313
|
+
</choice>
|
314
|
+
</define>
|
315
|
+
<define name="bibliography">
|
316
|
+
<element name="bibliography">
|
317
|
+
<oneOrMore>
|
318
|
+
<choice>
|
319
|
+
<ref name="references"/>
|
320
|
+
<ref name="reference-clause"/>
|
321
|
+
</choice>
|
322
|
+
</oneOrMore>
|
323
|
+
</element>
|
324
|
+
</define>
|
325
|
+
<define name="reference-clause">
|
326
|
+
<element name="clause">
|
327
|
+
<optional>
|
328
|
+
<attribute name="id">
|
329
|
+
<data type="ID"/>
|
330
|
+
</attribute>
|
331
|
+
</optional>
|
332
|
+
<optional>
|
333
|
+
<attribute name="language"/>
|
334
|
+
</optional>
|
335
|
+
<optional>
|
336
|
+
<attribute name="script"/>
|
337
|
+
</optional>
|
338
|
+
<optional>
|
339
|
+
<attribute name="inline-header">
|
340
|
+
<data type="boolean"/>
|
341
|
+
</attribute>
|
342
|
+
</optional>
|
343
|
+
<optional>
|
344
|
+
<attribute name="obligation">
|
345
|
+
<choice>
|
346
|
+
<value>normative</value>
|
347
|
+
<value>informative</value>
|
348
|
+
</choice>
|
349
|
+
</attribute>
|
350
|
+
</optional>
|
351
|
+
<optional>
|
352
|
+
<ref name="section-title"/>
|
353
|
+
</optional>
|
354
|
+
<zeroOrMore>
|
355
|
+
<ref name="BasicBlock"/>
|
356
|
+
</zeroOrMore>
|
357
|
+
<zeroOrMore>
|
358
|
+
<ref name="note"/>
|
359
|
+
</zeroOrMore>
|
360
|
+
<choice>
|
361
|
+
<oneOrMore>
|
362
|
+
<ref name="reference-clause"/>
|
363
|
+
</oneOrMore>
|
364
|
+
<zeroOrMore>
|
365
|
+
<ref name="references"/>
|
366
|
+
</zeroOrMore>
|
367
|
+
</choice>
|
368
|
+
</element>
|
369
|
+
</define>
|
370
|
+
<define name="editorialgroup">
|
371
|
+
<element name="editorialgroup">
|
372
|
+
<oneOrMore>
|
373
|
+
<ref name="technical-committee"/>
|
374
|
+
</oneOrMore>
|
375
|
+
</element>
|
376
|
+
</define>
|
377
|
+
<define name="technical-committee">
|
378
|
+
<element name="technical-committee">
|
379
|
+
<ref name="IsoWorkgroup"/>
|
380
|
+
</element>
|
381
|
+
</define>
|
382
|
+
<define name="IsoWorkgroup">
|
383
|
+
<optional>
|
384
|
+
<attribute name="number">
|
385
|
+
<data type="int"/>
|
386
|
+
</attribute>
|
387
|
+
</optional>
|
388
|
+
<optional>
|
389
|
+
<attribute name="type"/>
|
390
|
+
</optional>
|
391
|
+
<text/>
|
392
|
+
</define>
|
393
|
+
<define name="ics">
|
394
|
+
<element name="ics">
|
395
|
+
<element name="code">
|
396
|
+
<text/>
|
397
|
+
</element>
|
398
|
+
<element name="text">
|
399
|
+
<text/>
|
400
|
+
</element>
|
401
|
+
</element>
|
402
|
+
</define>
|
69
403
|
<define name="standard-document">
|
70
404
|
<element name="standard-document">
|
71
405
|
<ref name="bibdata"/>
|
@@ -89,7 +423,7 @@
|
|
89
423
|
<oneOrMore>
|
90
424
|
<choice>
|
91
425
|
<ref name="content"/>
|
92
|
-
<ref name="
|
426
|
+
<ref name="preface_abstract"/>
|
93
427
|
<ref name="foreword"/>
|
94
428
|
<ref name="introduction"/>
|
95
429
|
<ref name="acknowledgements"/>
|
@@ -156,6 +490,14 @@
|
|
156
490
|
<optional>
|
157
491
|
<attribute name="script"/>
|
158
492
|
</optional>
|
493
|
+
<optional>
|
494
|
+
<attribute name="obligation">
|
495
|
+
<choice>
|
496
|
+
<value>normative</value>
|
497
|
+
<value>informative</value>
|
498
|
+
</choice>
|
499
|
+
</attribute>
|
500
|
+
</optional>
|
159
501
|
<optional>
|
160
502
|
<ref name="section-title"/>
|
161
503
|
</optional>
|
@@ -163,6 +505,9 @@
|
|
163
505
|
<zeroOrMore>
|
164
506
|
<ref name="BasicBlock"/>
|
165
507
|
</zeroOrMore>
|
508
|
+
<zeroOrMore>
|
509
|
+
<ref name="note"/>
|
510
|
+
</zeroOrMore>
|
166
511
|
<ref name="dl"/>
|
167
512
|
</oneOrMore>
|
168
513
|
</element>
|
@@ -202,22 +547,35 @@
|
|
202
547
|
<optional>
|
203
548
|
<attribute name="script"/>
|
204
549
|
</optional>
|
550
|
+
<optional>
|
551
|
+
<attribute name="inline-header">
|
552
|
+
<data type="boolean"/>
|
553
|
+
</attribute>
|
554
|
+
</optional>
|
555
|
+
<optional>
|
556
|
+
<attribute name="obligation">
|
557
|
+
<choice>
|
558
|
+
<value>normative</value>
|
559
|
+
<value>informative</value>
|
560
|
+
</choice>
|
561
|
+
</attribute>
|
562
|
+
</optional>
|
205
563
|
<optional>
|
206
564
|
<ref name="section-title"/>
|
207
565
|
</optional>
|
208
|
-
<
|
566
|
+
<group>
|
209
567
|
<group>
|
210
|
-
<
|
568
|
+
<zeroOrMore>
|
211
569
|
<ref name="BasicBlock"/>
|
212
|
-
</
|
570
|
+
</zeroOrMore>
|
213
571
|
<zeroOrMore>
|
214
572
|
<ref name="note"/>
|
215
573
|
</zeroOrMore>
|
216
574
|
</group>
|
217
|
-
<
|
575
|
+
<zeroOrMore>
|
218
576
|
<ref name="content-subsection"/>
|
219
|
-
</
|
220
|
-
</
|
577
|
+
</zeroOrMore>
|
578
|
+
</group>
|
221
579
|
</define>
|
222
580
|
<define name="clause">
|
223
581
|
<element name="clause">
|
@@ -239,32 +597,97 @@
|
|
239
597
|
<optional>
|
240
598
|
<attribute name="script"/>
|
241
599
|
</optional>
|
600
|
+
<optional>
|
601
|
+
<attribute name="inline-header">
|
602
|
+
<data type="boolean"/>
|
603
|
+
</attribute>
|
604
|
+
</optional>
|
605
|
+
<optional>
|
606
|
+
<attribute name="obligation">
|
607
|
+
<choice>
|
608
|
+
<value>normative</value>
|
609
|
+
<value>informative</value>
|
610
|
+
</choice>
|
611
|
+
</attribute>
|
612
|
+
</optional>
|
242
613
|
<optional>
|
243
614
|
<ref name="section-title"/>
|
244
615
|
</optional>
|
245
|
-
<
|
616
|
+
<group>
|
246
617
|
<group>
|
247
|
-
<
|
618
|
+
<zeroOrMore>
|
248
619
|
<ref name="BasicBlock"/>
|
249
|
-
</
|
620
|
+
</zeroOrMore>
|
250
621
|
<zeroOrMore>
|
251
622
|
<ref name="note"/>
|
252
623
|
</zeroOrMore>
|
253
624
|
</group>
|
254
|
-
<
|
625
|
+
<zeroOrMore>
|
255
626
|
<choice>
|
256
627
|
<ref name="clause-subsection"/>
|
257
628
|
<ref name="terms"/>
|
258
629
|
<ref name="definitions"/>
|
259
630
|
</choice>
|
260
|
-
</
|
261
|
-
</
|
631
|
+
</zeroOrMore>
|
632
|
+
</group>
|
633
|
+
</define>
|
634
|
+
<define name="Annex-Section">
|
635
|
+
<optional>
|
636
|
+
<attribute name="id">
|
637
|
+
<data type="ID"/>
|
638
|
+
</attribute>
|
639
|
+
</optional>
|
640
|
+
<optional>
|
641
|
+
<attribute name="language"/>
|
642
|
+
</optional>
|
643
|
+
<optional>
|
644
|
+
<attribute name="script"/>
|
645
|
+
</optional>
|
646
|
+
<optional>
|
647
|
+
<attribute name="inline-header">
|
648
|
+
<data type="boolean"/>
|
649
|
+
</attribute>
|
650
|
+
</optional>
|
651
|
+
<optional>
|
652
|
+
<attribute name="obligation">
|
653
|
+
<choice>
|
654
|
+
<value>normative</value>
|
655
|
+
<value>informative</value>
|
656
|
+
</choice>
|
657
|
+
</attribute>
|
658
|
+
</optional>
|
659
|
+
<optional>
|
660
|
+
<ref name="section-title"/>
|
661
|
+
</optional>
|
662
|
+
<group>
|
663
|
+
<group>
|
664
|
+
<zeroOrMore>
|
665
|
+
<ref name="BasicBlock"/>
|
666
|
+
</zeroOrMore>
|
667
|
+
<zeroOrMore>
|
668
|
+
<ref name="note"/>
|
669
|
+
</zeroOrMore>
|
670
|
+
</group>
|
671
|
+
<zeroOrMore>
|
672
|
+
<choice>
|
673
|
+
<ref name="annex-subsection"/>
|
674
|
+
<ref name="terms"/>
|
675
|
+
<ref name="definitions"/>
|
676
|
+
<ref name="references"/>
|
677
|
+
</choice>
|
678
|
+
</zeroOrMore>
|
679
|
+
</group>
|
262
680
|
</define>
|
263
681
|
<define name="clause-subsection">
|
264
682
|
<element name="clause">
|
265
683
|
<ref name="Clause-Section"/>
|
266
684
|
</element>
|
267
685
|
</define>
|
686
|
+
<define name="annex-subsection">
|
687
|
+
<element name="clause">
|
688
|
+
<ref name="Annex-Section"/>
|
689
|
+
</element>
|
690
|
+
</define>
|
268
691
|
<define name="annex">
|
269
692
|
<element name="annex">
|
270
693
|
<optional>
|
@@ -278,6 +701,11 @@
|
|
278
701
|
<optional>
|
279
702
|
<attribute name="script"/>
|
280
703
|
</optional>
|
704
|
+
<optional>
|
705
|
+
<attribute name="inline-header">
|
706
|
+
<data type="boolean"/>
|
707
|
+
</attribute>
|
708
|
+
</optional>
|
281
709
|
<attribute name="obligation">
|
282
710
|
<choice>
|
283
711
|
<value>normative</value>
|
@@ -287,19 +715,24 @@
|
|
287
715
|
<optional>
|
288
716
|
<ref name="section-title"/>
|
289
717
|
</optional>
|
290
|
-
<
|
718
|
+
<group>
|
291
719
|
<group>
|
292
|
-
<
|
720
|
+
<zeroOrMore>
|
293
721
|
<ref name="BasicBlock"/>
|
294
|
-
</
|
722
|
+
</zeroOrMore>
|
295
723
|
<zeroOrMore>
|
296
724
|
<ref name="note"/>
|
297
725
|
</zeroOrMore>
|
298
726
|
</group>
|
299
|
-
<
|
300
|
-
<
|
301
|
-
|
302
|
-
|
727
|
+
<zeroOrMore>
|
728
|
+
<choice>
|
729
|
+
<ref name="annex-subsection"/>
|
730
|
+
<ref name="terms"/>
|
731
|
+
<ref name="definitions"/>
|
732
|
+
<ref name="references"/>
|
733
|
+
</choice>
|
734
|
+
</zeroOrMore>
|
735
|
+
</group>
|
303
736
|
</element>
|
304
737
|
</define>
|
305
738
|
<define name="terms">
|
@@ -315,12 +748,36 @@
|
|
315
748
|
<optional>
|
316
749
|
<attribute name="script"/>
|
317
750
|
</optional>
|
751
|
+
<optional>
|
752
|
+
<attribute name="obligation">
|
753
|
+
<choice>
|
754
|
+
<value>normative</value>
|
755
|
+
<value>informative</value>
|
756
|
+
</choice>
|
757
|
+
</attribute>
|
758
|
+
</optional>
|
759
|
+
<optional>
|
760
|
+
<ref name="section-title"/>
|
761
|
+
</optional>
|
318
762
|
<zeroOrMore>
|
319
763
|
<ref name="BasicBlock"/>
|
320
764
|
</zeroOrMore>
|
321
|
-
<
|
322
|
-
<ref name="
|
323
|
-
</
|
765
|
+
<zeroOrMore>
|
766
|
+
<ref name="note"/>
|
767
|
+
</zeroOrMore>
|
768
|
+
<choice>
|
769
|
+
<oneOrMore>
|
770
|
+
<ref name="term"/>
|
771
|
+
</oneOrMore>
|
772
|
+
<group>
|
773
|
+
<zeroOrMore>
|
774
|
+
<ref name="terms"/>
|
775
|
+
</zeroOrMore>
|
776
|
+
<optional>
|
777
|
+
<ref name="definitions"/>
|
778
|
+
</optional>
|
779
|
+
</group>
|
780
|
+
</choice>
|
324
781
|
</element>
|
325
782
|
</define>
|
326
783
|
<define name="term">
|
@@ -413,7 +870,13 @@
|
|
413
870
|
</define>
|
414
871
|
<define name="definition">
|
415
872
|
<element name="definition">
|
416
|
-
<
|
873
|
+
<oneOrMore>
|
874
|
+
<choice>
|
875
|
+
<ref name="paragraph"/>
|
876
|
+
<ref name="figure"/>
|
877
|
+
<ref name="formula"/>
|
878
|
+
</choice>
|
879
|
+
</oneOrMore>
|
417
880
|
</element>
|
418
881
|
</define>
|
419
882
|
<define name="termnote">
|
@@ -511,4 +974,58 @@
|
|
511
974
|
</optional>
|
512
975
|
</element>
|
513
976
|
</define>
|
977
|
+
<define name="preface_abstract">
|
978
|
+
<element name="abstract">
|
979
|
+
<ref name="Basic-Section"/>
|
980
|
+
</element>
|
981
|
+
</define>
|
982
|
+
<define name="term-clause">
|
983
|
+
<element name="clause">
|
984
|
+
<optional>
|
985
|
+
<attribute name="id">
|
986
|
+
<data type="ID"/>
|
987
|
+
</attribute>
|
988
|
+
</optional>
|
989
|
+
<optional>
|
990
|
+
<attribute name="language"/>
|
991
|
+
</optional>
|
992
|
+
<optional>
|
993
|
+
<attribute name="script"/>
|
994
|
+
</optional>
|
995
|
+
<optional>
|
996
|
+
<attribute name="inline-header">
|
997
|
+
<data type="boolean"/>
|
998
|
+
</attribute>
|
999
|
+
</optional>
|
1000
|
+
<optional>
|
1001
|
+
<attribute name="obligation">
|
1002
|
+
<choice>
|
1003
|
+
<value>normative</value>
|
1004
|
+
<value>informative</value>
|
1005
|
+
</choice>
|
1006
|
+
</attribute>
|
1007
|
+
</optional>
|
1008
|
+
<optional>
|
1009
|
+
<ref name="section-title"/>
|
1010
|
+
</optional>
|
1011
|
+
<zeroOrMore>
|
1012
|
+
<ref name="BasicBlock"/>
|
1013
|
+
</zeroOrMore>
|
1014
|
+
<zeroOrMore>
|
1015
|
+
<ref name="note"/>
|
1016
|
+
</zeroOrMore>
|
1017
|
+
<zeroOrMore>
|
1018
|
+
<choice>
|
1019
|
+
<ref name="term-clause"/>
|
1020
|
+
<ref name="terms"/>
|
1021
|
+
<ref name="definitions"/>
|
1022
|
+
</choice>
|
1023
|
+
</zeroOrMore>
|
1024
|
+
</element>
|
1025
|
+
</define>
|
1026
|
+
<define name="termdocsource">
|
1027
|
+
<element name="termdocsource">
|
1028
|
+
<ref name="CitationType"/>
|
1029
|
+
</element>
|
1030
|
+
</define>
|
514
1031
|
</grammar>
|