relaton-iso-bib 0.9.2 → 1.0.0

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 CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: c328a0a9a7f05444b6a8afd3ae7a806fb7fbfcd905164df105e21f7d7093ed14
4
- data.tar.gz: 82f90899822d59e8eed010e8de375de9bb81d93f7e389dd994ecf5f10c686e10
3
+ metadata.gz: efda33daf07e8cf9cd2a4627171c675d3b09f6ddcc58741cd73b66c4afb0fc4d
4
+ data.tar.gz: 8e60cea3c7d0544c813908260d5c4f29c8629c88092aa4519c88fdc1cc75e48b
5
5
  SHA512:
6
- metadata.gz: 3558ebbca683397034b2e9ca8c88f87d172b931e6094dc1bd64fd22aba9d4824138285de738214260ca0d90f90fd10fea7d863c238a9d35627e437df5d7efab0
7
- data.tar.gz: 54a64b7a1cec66be4cb6e508414d534d311c0ff74afafc2a165b3138c344265129a7028dc69d07fb047d2f5377a84c4e059f79fdb7ed2f8111459b2e3a37b2d0
6
+ metadata.gz: e59da78d3a06d407f90253c8b379f84b1116fe20b46cce9f11a362fc38759fdb49a26c10a5db187a77f7767405f20abad32d6478a9efec8cd8f81bd0798f9165
7
+ data.tar.gz: f1fd291047ed8f422cf980d33e570f76e43529da3597a569c6b4141c61277980a2f267096e151abafc7639b0748c250954010a7b254253db208a46e7c9ff5a93
@@ -1,10 +1,9 @@
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" />
3
+ <include href="biblio.rng"/>
4
4
  <start>
5
5
  <ref name="document"/>
6
6
  </start>
7
- <!-- </include> -->
8
7
  <define name="document">
9
8
  <element name="document">
10
9
  <optional>
@@ -43,12 +42,6 @@
43
42
  <data type="ID"/>
44
43
  </attribute>
45
44
  </optional>
46
- <optional>
47
- <attribute name="language"/>
48
- </optional>
49
- <optional>
50
- <attribute name="script"/>
51
- </optional>
52
45
  <optional>
53
46
  <ref name="section-title"/>
54
47
  </optional>
@@ -195,14 +188,6 @@
195
188
  <data type="boolean"/>
196
189
  </attribute>
197
190
  </optional>
198
- <optional>
199
- <attribute name="subsequence"/>
200
- </optional>
201
- <optional>
202
- <attribute name="inequality">
203
- <data type="boolean"/>
204
- </attribute>
205
- </optional>
206
191
  <ref name="stem"/>
207
192
  <optional>
208
193
  <ref name="dl"/>
@@ -256,9 +241,6 @@
256
241
  <data type="boolean"/>
257
242
  </attribute>
258
243
  </optional>
259
- <optional>
260
- <attribute name="subsequence"/>
261
- </optional>
262
244
  <optional>
263
245
  <attribute name="lang"/>
264
246
  </optional>
@@ -303,15 +285,9 @@
303
285
  <data type="boolean"/>
304
286
  </attribute>
305
287
  </optional>
306
- <optional>
307
- <attribute name="subsequence"/>
308
- </optional>
309
288
  <optional>
310
289
  <attribute name="alt"/>
311
290
  </optional>
312
- <optional>
313
- <attribute name="summary"/>
314
- </optional>
315
291
  <optional>
316
292
  <attribute name="uri">
317
293
  <data type="anyURI"/>
@@ -337,9 +313,12 @@
337
313
  </define>
338
314
  <define name="tname">
339
315
  <element name="name">
340
- <oneOrMore>
341
- <ref name="PureTextElement"/>
342
- </oneOrMore>
316
+ <text/>
317
+ </element>
318
+ </define>
319
+ <define name="tclass">
320
+ <element name="name">
321
+ <text/>
343
322
  </element>
344
323
  </define>
345
324
  <define name="thead">
@@ -438,12 +417,6 @@
438
417
  <data type="boolean"/>
439
418
  </attribute>
440
419
  </optional>
441
- <optional>
442
- <attribute name="subsequence"/>
443
- </optional>
444
- <optional>
445
- <ref name="tname"/>
446
- </optional>
447
420
  <oneOrMore>
448
421
  <choice>
449
422
  <ref name="formula"/>
@@ -507,26 +480,18 @@
507
480
  <data type="boolean"/>
508
481
  </attribute>
509
482
  </optional>
510
- <optional>
511
- <attribute name="subsequence"/>
512
- </optional>
513
- <optional>
514
- <attribute name="class"/>
515
- </optional>
516
483
  <optional>
517
484
  <ref name="source"/>
518
485
  </optional>
519
486
  <optional>
520
487
  <ref name="tname"/>
521
488
  </optional>
489
+ <optional>
490
+ <ref name="tclass"/>
491
+ </optional>
522
492
  <choice>
523
493
  <ref name="image"/>
524
- <ref name="video"/>
525
- <ref name="audio"/>
526
494
  <ref name="pre"/>
527
- <oneOrMore>
528
- <ref name="paragraph-with-footnote"/>
529
- </oneOrMore>
530
495
  <zeroOrMore>
531
496
  <ref name="figure"/>
532
497
  </zeroOrMore>
@@ -813,9 +778,6 @@
813
778
  <optional>
814
779
  <attribute name="alt"/>
815
780
  </optional>
816
- <optional>
817
- <attribute name="title"/>
818
- </optional>
819
781
  <optional>
820
782
  <attribute name="longdesc">
821
783
  <data type="anyURI"/>
@@ -824,7 +786,7 @@
824
786
  </element>
825
787
  </define>
826
788
  <define name="video">
827
- <element name="video">
789
+ <element name="image">
828
790
  <attribute name="id">
829
791
  <data type="ID"/>
830
792
  </attribute>
@@ -854,9 +816,6 @@
854
816
  <optional>
855
817
  <attribute name="alt"/>
856
818
  </optional>
857
- <optional>
858
- <attribute name="title"/>
859
- </optional>
860
819
  <optional>
861
820
  <attribute name="longdesc">
862
821
  <data type="anyURI"/>
@@ -868,7 +827,7 @@
868
827
  </element>
869
828
  </define>
870
829
  <define name="audio">
871
- <element name="audio">
830
+ <element name="image">
872
831
  <attribute name="id">
873
832
  <data type="ID"/>
874
833
  </attribute>
@@ -882,9 +841,6 @@
882
841
  <optional>
883
842
  <attribute name="alt"/>
884
843
  </optional>
885
- <optional>
886
- <attribute name="title"/>
887
- </optional>
888
844
  <optional>
889
845
  <attribute name="longdesc">
890
846
  <data type="anyURI"/>
data/grammars/biblio.rng CHANGED
@@ -49,11 +49,17 @@
49
49
  </define>
50
50
  <define name="stage">
51
51
  <element name="stage">
52
+ <optional>
53
+ <attribute name="abbreviation"/>
54
+ </optional>
52
55
  <text/>
53
56
  </element>
54
57
  </define>
55
58
  <define name="substage">
56
59
  <element name="substage">
60
+ <optional>
61
+ <attribute name="abbreviation"/>
62
+ </optional>
57
63
  <text/>
58
64
  </element>
59
65
  </define>
@@ -452,9 +458,14 @@
452
458
  <attribute name="bibitemid">
453
459
  <data type="IDREF"/>
454
460
  </attribute>
455
- <zeroOrMore>
456
- <ref name="locality"/>
457
- </zeroOrMore>
461
+ <choice>
462
+ <zeroOrMore>
463
+ <ref name="locality"/>
464
+ </zeroOrMore>
465
+ <zeroOrMore>
466
+ <ref name="localityStack"/>
467
+ </zeroOrMore>
468
+ </choice>
458
469
  <optional>
459
470
  <ref name="date"/>
460
471
  </optional>
@@ -469,6 +480,25 @@
469
480
  <ref name="BibItemLocality"/>
470
481
  </element>
471
482
  </define>
483
+ <define name="localityStack">
484
+ <element name="localityStack">
485
+ <zeroOrMore>
486
+ <ref name="locality"/>
487
+ </zeroOrMore>
488
+ </element>
489
+ </define>
490
+ <define name="sourceLocality">
491
+ <element name="sourceLocality">
492
+ <ref name="BibItemLocality"/>
493
+ </element>
494
+ </define>
495
+ <define name="sourceLocalityStack">
496
+ <element name="sourceLocalityStack">
497
+ <zeroOrMore>
498
+ <ref name="sourceLocality"/>
499
+ </zeroOrMore>
500
+ </element>
501
+ </define>
472
502
  <define name="BibItemLocality">
473
503
  <attribute name="type">
474
504
  <ref name="LocalityType"/>
@@ -703,21 +733,11 @@
703
733
  </define>
704
734
  <define name="TypedTitleString">
705
735
  <optional>
706
- <attribute name="type">
707
- <ref name="TitleType"/>
708
- </attribute>
736
+ <attribute name="type"/>
709
737
  </optional>
710
738
  <ref name="FormattedString"/>
711
739
  </define>
712
- <define name="TitleType">
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>
740
+ <!-- TitleType = ( "alternative" | "original" | "unofficial" | "subtitle" | "main" ) -->
721
741
  <define name="TypedUri">
722
742
  <optional>
723
743
  <attribute name="type"/>
@@ -1038,12 +1058,30 @@
1038
1058
  <attribute name="type">
1039
1059
  <ref name="DocRelationType"/>
1040
1060
  </attribute>
1061
+ <optional>
1062
+ <element name="description">
1063
+ <ref name="FormattedString"/>
1064
+ </element>
1065
+ </optional>
1041
1066
  <element name="bibitem">
1042
1067
  <ref name="BibliographicItem"/>
1043
1068
  </element>
1044
- <zeroOrMore>
1045
- <ref name="locality"/>
1046
- </zeroOrMore>
1069
+ <choice>
1070
+ <zeroOrMore>
1071
+ <ref name="locality"/>
1072
+ </zeroOrMore>
1073
+ <zeroOrMore>
1074
+ <ref name="localityStack"/>
1075
+ </zeroOrMore>
1076
+ </choice>
1077
+ <choice>
1078
+ <zeroOrMore>
1079
+ <ref name="sourceLocality"/>
1080
+ </zeroOrMore>
1081
+ <zeroOrMore>
1082
+ <ref name="sourceLocalityStack"/>
1083
+ </zeroOrMore>
1084
+ </choice>
1047
1085
  </element>
1048
1086
  </define>
1049
1087
  <define name="version">
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
- <define name="TitleType">
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,300 @@
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>
66
221
  </element>
67
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"/>
304
+ </element>
305
+ </define>
306
+ <define name="TextElement" combine="choice">
307
+ <ref name="concept"/>
308
+ </define>
68
309
  </include>
310
+ <!-- end overrides -->
311
+ <define name="concept">
312
+ <element name="concept">
313
+ <optional>
314
+ <attribute name="term"/>
315
+ </optional>
316
+ <choice>
317
+ <ref name="eref"/>
318
+ <ref name="xref"/>
319
+ <ref name="termref"/>
320
+ </choice>
321
+ </element>
322
+ </define>
323
+ <define name="BasicBlock" combine="choice">
324
+ <choice>
325
+ <ref name="requirement"/>
326
+ <ref name="recommendation"/>
327
+ <ref name="permission"/>
328
+ </choice>
329
+ </define>
330
+ <define name="bibliography">
331
+ <element name="bibliography">
332
+ <oneOrMore>
333
+ <choice>
334
+ <ref name="references"/>
335
+ <ref name="reference-clause"/>
336
+ </choice>
337
+ </oneOrMore>
338
+ </element>
339
+ </define>
340
+ <define name="reference-clause">
341
+ <element name="clause">
342
+ <optional>
343
+ <attribute name="id">
344
+ <data type="ID"/>
345
+ </attribute>
346
+ </optional>
347
+ <optional>
348
+ <attribute name="language"/>
349
+ </optional>
350
+ <optional>
351
+ <attribute name="script"/>
352
+ </optional>
353
+ <optional>
354
+ <attribute name="inline-header">
355
+ <data type="boolean"/>
356
+ </attribute>
357
+ </optional>
358
+ <optional>
359
+ <attribute name="obligation">
360
+ <choice>
361
+ <value>normative</value>
362
+ <value>informative</value>
363
+ </choice>
364
+ </attribute>
365
+ </optional>
366
+ <optional>
367
+ <ref name="section-title"/>
368
+ </optional>
369
+ <zeroOrMore>
370
+ <ref name="BasicBlock"/>
371
+ </zeroOrMore>
372
+ <zeroOrMore>
373
+ <ref name="note"/>
374
+ </zeroOrMore>
375
+ <choice>
376
+ <oneOrMore>
377
+ <ref name="reference-clause"/>
378
+ </oneOrMore>
379
+ <zeroOrMore>
380
+ <ref name="references"/>
381
+ </zeroOrMore>
382
+ </choice>
383
+ </element>
384
+ </define>
385
+ <define name="editorialgroup">
386
+ <element name="editorialgroup">
387
+ <oneOrMore>
388
+ <ref name="technical-committee"/>
389
+ </oneOrMore>
390
+ </element>
391
+ </define>
392
+ <define name="technical-committee">
393
+ <element name="technical-committee">
394
+ <ref name="IsoWorkgroup"/>
395
+ </element>
396
+ </define>
397
+ <define name="IsoWorkgroup">
398
+ <optional>
399
+ <attribute name="number">
400
+ <data type="int"/>
401
+ </attribute>
402
+ </optional>
403
+ <optional>
404
+ <attribute name="type"/>
405
+ </optional>
406
+ <text/>
407
+ </define>
408
+ <define name="ics">
409
+ <element name="ics">
410
+ <element name="code">
411
+ <text/>
412
+ </element>
413
+ <element name="text">
414
+ <text/>
415
+ </element>
416
+ </element>
417
+ </define>
69
418
  <define name="standard-document">
70
419
  <element name="standard-document">
71
420
  <ref name="bibdata"/>
@@ -89,7 +438,7 @@
89
438
  <oneOrMore>
90
439
  <choice>
91
440
  <ref name="content"/>
92
- <ref name="abstract"/>
441
+ <ref name="preface_abstract"/>
93
442
  <ref name="foreword"/>
94
443
  <ref name="introduction"/>
95
444
  <ref name="acknowledgements"/>
@@ -156,6 +505,14 @@
156
505
  <optional>
157
506
  <attribute name="script"/>
158
507
  </optional>
508
+ <optional>
509
+ <attribute name="obligation">
510
+ <choice>
511
+ <value>normative</value>
512
+ <value>informative</value>
513
+ </choice>
514
+ </attribute>
515
+ </optional>
159
516
  <optional>
160
517
  <ref name="section-title"/>
161
518
  </optional>
@@ -163,6 +520,9 @@
163
520
  <zeroOrMore>
164
521
  <ref name="BasicBlock"/>
165
522
  </zeroOrMore>
523
+ <zeroOrMore>
524
+ <ref name="note"/>
525
+ </zeroOrMore>
166
526
  <ref name="dl"/>
167
527
  </oneOrMore>
168
528
  </element>
@@ -202,22 +562,35 @@
202
562
  <optional>
203
563
  <attribute name="script"/>
204
564
  </optional>
565
+ <optional>
566
+ <attribute name="inline-header">
567
+ <data type="boolean"/>
568
+ </attribute>
569
+ </optional>
570
+ <optional>
571
+ <attribute name="obligation">
572
+ <choice>
573
+ <value>normative</value>
574
+ <value>informative</value>
575
+ </choice>
576
+ </attribute>
577
+ </optional>
205
578
  <optional>
206
579
  <ref name="section-title"/>
207
580
  </optional>
208
- <choice>
581
+ <group>
209
582
  <group>
210
- <optional>
583
+ <zeroOrMore>
211
584
  <ref name="BasicBlock"/>
212
- </optional>
585
+ </zeroOrMore>
213
586
  <zeroOrMore>
214
587
  <ref name="note"/>
215
588
  </zeroOrMore>
216
589
  </group>
217
- <oneOrMore>
590
+ <zeroOrMore>
218
591
  <ref name="content-subsection"/>
219
- </oneOrMore>
220
- </choice>
592
+ </zeroOrMore>
593
+ </group>
221
594
  </define>
222
595
  <define name="clause">
223
596
  <element name="clause">
@@ -239,32 +612,97 @@
239
612
  <optional>
240
613
  <attribute name="script"/>
241
614
  </optional>
615
+ <optional>
616
+ <attribute name="inline-header">
617
+ <data type="boolean"/>
618
+ </attribute>
619
+ </optional>
620
+ <optional>
621
+ <attribute name="obligation">
622
+ <choice>
623
+ <value>normative</value>
624
+ <value>informative</value>
625
+ </choice>
626
+ </attribute>
627
+ </optional>
242
628
  <optional>
243
629
  <ref name="section-title"/>
244
630
  </optional>
245
- <choice>
631
+ <group>
246
632
  <group>
247
- <optional>
633
+ <zeroOrMore>
248
634
  <ref name="BasicBlock"/>
249
- </optional>
635
+ </zeroOrMore>
250
636
  <zeroOrMore>
251
637
  <ref name="note"/>
252
638
  </zeroOrMore>
253
639
  </group>
254
- <oneOrMore>
640
+ <zeroOrMore>
255
641
  <choice>
256
642
  <ref name="clause-subsection"/>
257
643
  <ref name="terms"/>
258
644
  <ref name="definitions"/>
259
645
  </choice>
260
- </oneOrMore>
261
- </choice>
646
+ </zeroOrMore>
647
+ </group>
648
+ </define>
649
+ <define name="Annex-Section">
650
+ <optional>
651
+ <attribute name="id">
652
+ <data type="ID"/>
653
+ </attribute>
654
+ </optional>
655
+ <optional>
656
+ <attribute name="language"/>
657
+ </optional>
658
+ <optional>
659
+ <attribute name="script"/>
660
+ </optional>
661
+ <optional>
662
+ <attribute name="inline-header">
663
+ <data type="boolean"/>
664
+ </attribute>
665
+ </optional>
666
+ <optional>
667
+ <attribute name="obligation">
668
+ <choice>
669
+ <value>normative</value>
670
+ <value>informative</value>
671
+ </choice>
672
+ </attribute>
673
+ </optional>
674
+ <optional>
675
+ <ref name="section-title"/>
676
+ </optional>
677
+ <group>
678
+ <group>
679
+ <zeroOrMore>
680
+ <ref name="BasicBlock"/>
681
+ </zeroOrMore>
682
+ <zeroOrMore>
683
+ <ref name="note"/>
684
+ </zeroOrMore>
685
+ </group>
686
+ <zeroOrMore>
687
+ <choice>
688
+ <ref name="annex-subsection"/>
689
+ <ref name="terms"/>
690
+ <ref name="definitions"/>
691
+ <ref name="references"/>
692
+ </choice>
693
+ </zeroOrMore>
694
+ </group>
262
695
  </define>
263
696
  <define name="clause-subsection">
264
697
  <element name="clause">
265
698
  <ref name="Clause-Section"/>
266
699
  </element>
267
700
  </define>
701
+ <define name="annex-subsection">
702
+ <element name="clause">
703
+ <ref name="Annex-Section"/>
704
+ </element>
705
+ </define>
268
706
  <define name="annex">
269
707
  <element name="annex">
270
708
  <optional>
@@ -278,6 +716,11 @@
278
716
  <optional>
279
717
  <attribute name="script"/>
280
718
  </optional>
719
+ <optional>
720
+ <attribute name="inline-header">
721
+ <data type="boolean"/>
722
+ </attribute>
723
+ </optional>
281
724
  <attribute name="obligation">
282
725
  <choice>
283
726
  <value>normative</value>
@@ -287,19 +730,24 @@
287
730
  <optional>
288
731
  <ref name="section-title"/>
289
732
  </optional>
290
- <choice>
733
+ <group>
291
734
  <group>
292
- <optional>
735
+ <zeroOrMore>
293
736
  <ref name="BasicBlock"/>
294
- </optional>
737
+ </zeroOrMore>
295
738
  <zeroOrMore>
296
739
  <ref name="note"/>
297
740
  </zeroOrMore>
298
741
  </group>
299
- <oneOrMore>
300
- <ref name="clause-subsection"/>
301
- </oneOrMore>
302
- </choice>
742
+ <zeroOrMore>
743
+ <choice>
744
+ <ref name="annex-subsection"/>
745
+ <ref name="terms"/>
746
+ <ref name="definitions"/>
747
+ <ref name="references"/>
748
+ </choice>
749
+ </zeroOrMore>
750
+ </group>
303
751
  </element>
304
752
  </define>
305
753
  <define name="terms">
@@ -315,12 +763,36 @@
315
763
  <optional>
316
764
  <attribute name="script"/>
317
765
  </optional>
766
+ <optional>
767
+ <attribute name="obligation">
768
+ <choice>
769
+ <value>normative</value>
770
+ <value>informative</value>
771
+ </choice>
772
+ </attribute>
773
+ </optional>
774
+ <optional>
775
+ <ref name="section-title"/>
776
+ </optional>
318
777
  <zeroOrMore>
319
778
  <ref name="BasicBlock"/>
320
779
  </zeroOrMore>
321
- <oneOrMore>
322
- <ref name="term"/>
323
- </oneOrMore>
780
+ <zeroOrMore>
781
+ <ref name="note"/>
782
+ </zeroOrMore>
783
+ <choice>
784
+ <oneOrMore>
785
+ <ref name="term"/>
786
+ </oneOrMore>
787
+ <group>
788
+ <zeroOrMore>
789
+ <ref name="terms"/>
790
+ </zeroOrMore>
791
+ <optional>
792
+ <ref name="definitions"/>
793
+ </optional>
794
+ </group>
795
+ </choice>
324
796
  </element>
325
797
  </define>
326
798
  <define name="term">
@@ -413,7 +885,13 @@
413
885
  </define>
414
886
  <define name="definition">
415
887
  <element name="definition">
416
- <ref name="paragraph"/>
888
+ <oneOrMore>
889
+ <choice>
890
+ <ref name="paragraph"/>
891
+ <ref name="figure"/>
892
+ <ref name="formula"/>
893
+ </choice>
894
+ </oneOrMore>
417
895
  </element>
418
896
  </define>
419
897
  <define name="termnote">
@@ -448,7 +926,10 @@
448
926
  </define>
449
927
  <define name="origin">
450
928
  <element name="origin">
451
- <ref name="erefType"/>
929
+ <choice>
930
+ <ref name="erefType"/>
931
+ <ref name="termref"/>
932
+ </choice>
452
933
  </element>
453
934
  </define>
454
935
  <define name="modification">
@@ -456,6 +937,15 @@
456
937
  <ref name="paragraph"/>
457
938
  </element>
458
939
  </define>
940
+ <define name="termref">
941
+ <element name="termref">
942
+ <attribute name="base"/>
943
+ <attribute name="target"/>
944
+ <optional>
945
+ <text/>
946
+ </optional>
947
+ </element>
948
+ </define>
459
949
  <define name="structuredidentifier">
460
950
  <element name="structuredidentifier">
461
951
  <optional>
@@ -511,4 +1001,58 @@
511
1001
  </optional>
512
1002
  </element>
513
1003
  </define>
1004
+ <define name="preface_abstract">
1005
+ <element name="abstract">
1006
+ <ref name="Basic-Section"/>
1007
+ </element>
1008
+ </define>
1009
+ <define name="term-clause">
1010
+ <element name="clause">
1011
+ <optional>
1012
+ <attribute name="id">
1013
+ <data type="ID"/>
1014
+ </attribute>
1015
+ </optional>
1016
+ <optional>
1017
+ <attribute name="language"/>
1018
+ </optional>
1019
+ <optional>
1020
+ <attribute name="script"/>
1021
+ </optional>
1022
+ <optional>
1023
+ <attribute name="inline-header">
1024
+ <data type="boolean"/>
1025
+ </attribute>
1026
+ </optional>
1027
+ <optional>
1028
+ <attribute name="obligation">
1029
+ <choice>
1030
+ <value>normative</value>
1031
+ <value>informative</value>
1032
+ </choice>
1033
+ </attribute>
1034
+ </optional>
1035
+ <optional>
1036
+ <ref name="section-title"/>
1037
+ </optional>
1038
+ <zeroOrMore>
1039
+ <ref name="BasicBlock"/>
1040
+ </zeroOrMore>
1041
+ <zeroOrMore>
1042
+ <ref name="note"/>
1043
+ </zeroOrMore>
1044
+ <zeroOrMore>
1045
+ <choice>
1046
+ <ref name="term-clause"/>
1047
+ <ref name="terms"/>
1048
+ <ref name="definitions"/>
1049
+ </choice>
1050
+ </zeroOrMore>
1051
+ </element>
1052
+ </define>
1053
+ <define name="termdocsource">
1054
+ <element name="termdocsource">
1055
+ <ref name="CitationType"/>
1056
+ </element>
1057
+ </define>
514
1058
  </grammar>