relaton-ietf 0.12.1 → 1.0.0

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: e4a4d2c8d3326188837349cf1ef36ef379aac0c41d2ef5a7ccf99fd51e238178
4
- data.tar.gz: 4accec068cabba89b8d7ed55607032a44181e312b6089be4aa1672c1ffa4cbd5
3
+ metadata.gz: 90fd47e0ac20635313f5f5efc2bad4dd324b926b9c97040eb101848f791ae3fe
4
+ data.tar.gz: c8a3d00abf8be207d9c2b8f2cc7b2ad0d40d79b8ddfc41df6dd7d56d071a444e
5
5
  SHA512:
6
- metadata.gz: 678847fbb7466bcf73d40c686a196d9ce78e8b172c7c1278dda7893e2ecde94507967f6a33f3260edb9b2e64afb45b02b62b83c9150f8dbcf57cab2551ec04df
7
- data.tar.gz: 024f5e05069907d8d978b46c59fd5f49af8bfa9f36eaa90312d7ff32fd458e8c006d843290630a9046f791cb83001e539bdbed9d8bd13ea68144b0769fb2e487
6
+ metadata.gz: 53c9f971d9e2d86439ef6186641ebdf8bd1a9211b06965025e7de6b631bed72f989e3876c864f7dfbf514a72853bf10232ea9df6d1b28097057cbb3324f0291b
7
+ data.tar.gz: 07a073802b7b5210efc1db3c5ea9032a666a26a49a158f06cca220ae1e6f5f4f9c30fa84dd447b430455cd58adcba9172d89433b9760a3754a4e7654d0100882
@@ -1,6 +1,6 @@
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>
@@ -42,12 +42,6 @@
42
42
  <data type="ID"/>
43
43
  </attribute>
44
44
  </optional>
45
- <optional>
46
- <attribute name="language"/>
47
- </optional>
48
- <optional>
49
- <attribute name="script"/>
50
- </optional>
51
45
  <optional>
52
46
  <ref name="section-title"/>
53
47
  </optional>
@@ -194,14 +188,6 @@
194
188
  <data type="boolean"/>
195
189
  </attribute>
196
190
  </optional>
197
- <optional>
198
- <attribute name="subsequence"/>
199
- </optional>
200
- <optional>
201
- <attribute name="inequality">
202
- <data type="boolean"/>
203
- </attribute>
204
- </optional>
205
191
  <ref name="stem"/>
206
192
  <optional>
207
193
  <ref name="dl"/>
@@ -255,9 +241,6 @@
255
241
  <data type="boolean"/>
256
242
  </attribute>
257
243
  </optional>
258
- <optional>
259
- <attribute name="subsequence"/>
260
- </optional>
261
244
  <optional>
262
245
  <attribute name="lang"/>
263
246
  </optional>
@@ -302,15 +285,9 @@
302
285
  <data type="boolean"/>
303
286
  </attribute>
304
287
  </optional>
305
- <optional>
306
- <attribute name="subsequence"/>
307
- </optional>
308
288
  <optional>
309
289
  <attribute name="alt"/>
310
290
  </optional>
311
- <optional>
312
- <attribute name="summary"/>
313
- </optional>
314
291
  <optional>
315
292
  <attribute name="uri">
316
293
  <data type="anyURI"/>
@@ -336,9 +313,12 @@
336
313
  </define>
337
314
  <define name="tname">
338
315
  <element name="name">
339
- <oneOrMore>
340
- <ref name="PureTextElement"/>
341
- </oneOrMore>
316
+ <text/>
317
+ </element>
318
+ </define>
319
+ <define name="tclass">
320
+ <element name="name">
321
+ <text/>
342
322
  </element>
343
323
  </define>
344
324
  <define name="thead">
@@ -437,12 +417,6 @@
437
417
  <data type="boolean"/>
438
418
  </attribute>
439
419
  </optional>
440
- <optional>
441
- <attribute name="subsequence"/>
442
- </optional>
443
- <optional>
444
- <ref name="tname"/>
445
- </optional>
446
420
  <oneOrMore>
447
421
  <choice>
448
422
  <ref name="formula"/>
@@ -506,26 +480,18 @@
506
480
  <data type="boolean"/>
507
481
  </attribute>
508
482
  </optional>
509
- <optional>
510
- <attribute name="subsequence"/>
511
- </optional>
512
- <optional>
513
- <attribute name="class"/>
514
- </optional>
515
483
  <optional>
516
484
  <ref name="source"/>
517
485
  </optional>
518
486
  <optional>
519
487
  <ref name="tname"/>
520
488
  </optional>
489
+ <optional>
490
+ <ref name="tclass"/>
491
+ </optional>
521
492
  <choice>
522
493
  <ref name="image"/>
523
- <ref name="video"/>
524
- <ref name="audio"/>
525
494
  <ref name="pre"/>
526
- <oneOrMore>
527
- <ref name="paragraph-with-footnote"/>
528
- </oneOrMore>
529
495
  <zeroOrMore>
530
496
  <ref name="figure"/>
531
497
  </zeroOrMore>
@@ -812,9 +778,6 @@
812
778
  <optional>
813
779
  <attribute name="alt"/>
814
780
  </optional>
815
- <optional>
816
- <attribute name="title"/>
817
- </optional>
818
781
  <optional>
819
782
  <attribute name="longdesc">
820
783
  <data type="anyURI"/>
@@ -823,7 +786,7 @@
823
786
  </element>
824
787
  </define>
825
788
  <define name="video">
826
- <element name="video">
789
+ <element name="image">
827
790
  <attribute name="id">
828
791
  <data type="ID"/>
829
792
  </attribute>
@@ -853,9 +816,6 @@
853
816
  <optional>
854
817
  <attribute name="alt"/>
855
818
  </optional>
856
- <optional>
857
- <attribute name="title"/>
858
- </optional>
859
819
  <optional>
860
820
  <attribute name="longdesc">
861
821
  <data type="anyURI"/>
@@ -867,7 +827,7 @@
867
827
  </element>
868
828
  </define>
869
829
  <define name="audio">
870
- <element name="audio">
830
+ <element name="image">
871
831
  <attribute name="id">
872
832
  <data type="ID"/>
873
833
  </attribute>
@@ -881,9 +841,6 @@
881
841
  <optional>
882
842
  <attribute name="alt"/>
883
843
  </optional>
884
- <optional>
885
- <attribute name="title"/>
886
- </optional>
887
844
  <optional>
888
845
  <attribute name="longdesc">
889
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/ietf.rng CHANGED
@@ -5,159 +5,571 @@
5
5
  we cannot have a new default namespace: we will end up with a grammar with two different
6
6
  namespaces, one for isostandard and one for ietf additions. And we do not want that.
7
7
  -->
8
- <include href="isostandard.rng">
8
+ <include href="isodoc.rng">
9
9
  <start>
10
10
  <ref name="ietf-standard"/>
11
11
  </start>
12
- <define name="figure">
13
- <element name="figure">
12
+ <define name="DocumentType">
13
+ <choice>
14
+ <value>rfc</value>
15
+ <value>internet-draft</value>
16
+ </choice>
17
+ </define>
18
+ <define name="BibDataExtensionType">
19
+ <optional>
20
+ <ref name="doctype"/>
21
+ </optional>
22
+ <zeroOrMore>
23
+ <ref name="editorialgroup"/>
24
+ </zeroOrMore>
25
+ <zeroOrMore>
26
+ <ref name="ics"/>
27
+ </zeroOrMore>
28
+ <zeroOrMore>
29
+ <ref name="area"/>
30
+ </zeroOrMore>
31
+ <optional>
32
+ <ref name="ipr"/>
33
+ </optional>
34
+ <optional>
35
+ <ref name="consensus"/>
36
+ </optional>
37
+ <optional>
38
+ <ref name="index-include"/>
39
+ </optional>
40
+ <optional>
41
+ <ref name="ipr-extract"/>
42
+ </optional>
43
+ <optional>
44
+ <ref name="sort-refs"/>
45
+ </optional>
46
+ <optional>
47
+ <ref name="sym-refs"/>
48
+ </optional>
49
+ <optional>
50
+ <ref name="toc-include"/>
51
+ </optional>
52
+ <optional>
53
+ <ref name="toc-depth"/>
54
+ </optional>
55
+ <optional>
56
+ <ref name="show-on-front-page"/>
57
+ </optional>
58
+ <optional>
59
+ <ref name="processing-instructions"/>
60
+ </optional>
61
+ </define>
62
+ <define name="ParagraphType">
63
+ <attribute name="id">
64
+ <data type="ID"/>
65
+ </attribute>
66
+ <optional>
67
+ <attribute name="align">
68
+ <ref name="Alignments"/>
69
+ </attribute>
70
+ </optional>
71
+ <optional>
72
+ <attribute name="keepWithNext">
73
+ <data type="boolean"/>
74
+ </attribute>
75
+ </optional>
76
+ <optional>
77
+ <attribute name="keepWithPrevious">
78
+ <data type="boolean"/>
79
+ </attribute>
80
+ </optional>
81
+ <zeroOrMore>
82
+ <ref name="TextElement"/>
83
+ </zeroOrMore>
84
+ <zeroOrMore>
85
+ <ref name="note"/>
86
+ </zeroOrMore>
87
+ </define>
88
+ <define name="paragraph-with-footnote">
89
+ <element name="p">
14
90
  <attribute name="id">
15
91
  <data type="ID"/>
16
92
  </attribute>
17
93
  <optional>
18
- <ref name="tname"/>
94
+ <attribute name="align">
95
+ <ref name="Alignments"/>
96
+ </attribute>
19
97
  </optional>
20
- <choice>
21
- <ref name="image"/>
22
- <ref name="pre"/>
23
- <oneOrMore>
24
- <ref name="subfigure"/>
25
- </oneOrMore>
26
- </choice>
27
98
  <zeroOrMore>
28
- <ref name="fn"/>
99
+ <choice>
100
+ <ref name="TextElement"/>
101
+ <ref name="fn"/>
102
+ </choice>
29
103
  </zeroOrMore>
104
+ <zeroOrMore>
105
+ <ref name="note"/>
106
+ </zeroOrMore>
107
+ </element>
108
+ </define>
109
+ <define name="ul">
110
+ <element name="ul">
111
+ <attribute name="id">
112
+ <data type="ID"/>
113
+ </attribute>
30
114
  <optional>
31
- <ref name="dl"/>
115
+ <attribute name="nobullet"/>
116
+ </optional>
117
+ <optional>
118
+ <attribute name="spacing"/>
119
+ </optional>
120
+ <oneOrMore>
121
+ <ref name="li"/>
122
+ </oneOrMore>
123
+ <zeroOrMore>
124
+ <ref name="note"/>
125
+ </zeroOrMore>
126
+ </element>
127
+ </define>
128
+ <define name="ol">
129
+ <element name="ol">
130
+ <attribute name="id">
131
+ <data type="ID"/>
132
+ </attribute>
133
+ <attribute name="type">
134
+ <choice>
135
+ <value>roman</value>
136
+ <value>alphabet</value>
137
+ <value>arabic</value>
138
+ <value>roman_upper</value>
139
+ <value>alphabet_upper</value>
140
+ <value>text</value>
141
+ </choice>
142
+ </attribute>
143
+ <optional>
144
+ <attribute name="group"/>
145
+ </optional>
146
+ <optional>
147
+ <attribute name="spacing"/>
148
+ </optional>
149
+ <optional>
150
+ <attribute name="start"/>
151
+ </optional>
152
+ <oneOrMore>
153
+ <ref name="li"/>
154
+ </oneOrMore>
155
+ <zeroOrMore>
156
+ <ref name="note"/>
157
+ </zeroOrMore>
158
+ </element>
159
+ </define>
160
+ <define name="dl">
161
+ <element name="dl">
162
+ <attribute name="id">
163
+ <data type="ID"/>
164
+ </attribute>
165
+ <optional>
166
+ <attribute name="newline"/>
32
167
  </optional>
168
+ <optional>
169
+ <attribute name="indent"/>
170
+ </optional>
171
+ <optional>
172
+ <attribute name="spacing"/>
173
+ </optional>
174
+ <oneOrMore>
175
+ <ref name="dt"/>
176
+ <ref name="dd"/>
177
+ </oneOrMore>
33
178
  <zeroOrMore>
34
179
  <ref name="note"/>
35
180
  </zeroOrMore>
36
181
  </element>
37
182
  </define>
38
- <define name="subfigure">
39
- <element name="figure">
183
+ <define name="review">
184
+ <element name="review">
185
+ <attribute name="id">
186
+ <data type="ID"/>
187
+ </attribute>
188
+ <attribute name="reviewer"/>
189
+ <optional>
190
+ <attribute name="date">
191
+ <data type="dateTime"/>
192
+ </attribute>
193
+ </optional>
194
+ <attribute name="from">
195
+ <data type="IDREF"/>
196
+ </attribute>
197
+ <optional>
198
+ <attribute name="to">
199
+ <data type="IDREF"/>
200
+ </attribute>
201
+ </optional>
202
+ <optional>
203
+ <attribute name="display"/>
204
+ </optional>
205
+ <oneOrMore>
206
+ <ref name="paragraph"/>
207
+ </oneOrMore>
208
+ </element>
209
+ </define>
210
+ <define name="note">
211
+ <element name="note">
40
212
  <attribute name="id">
41
213
  <data type="ID"/>
42
214
  </attribute>
215
+ <optional>
216
+ <attribute name="removeInRFC"/>
217
+ </optional>
43
218
  <optional>
44
219
  <ref name="tname"/>
45
220
  </optional>
46
- <choice>
47
- <ref name="image"/>
48
- <ref name="pre"/>
49
- </choice>
221
+ <oneOrMore>
222
+ <ref name="paragraph"/>
223
+ </oneOrMore>
50
224
  </element>
51
225
  </define>
52
- <define name="DocumentType">
53
- <choice>
54
- <value>rfc</value>
55
- <value>internet-draft</value>
56
- </choice>
226
+ <define name="pre">
227
+ <element name="pre">
228
+ <attribute name="id">
229
+ <data type="ID"/>
230
+ </attribute>
231
+ <optional>
232
+ <attribute name="alt"/>
233
+ </optional>
234
+ <optional>
235
+ <attribute name="align"/>
236
+ </optional>
237
+ <optional>
238
+ <ref name="tname"/>
239
+ </optional>
240
+ <text/>
241
+ <zeroOrMore>
242
+ <ref name="note"/>
243
+ </zeroOrMore>
244
+ </element>
57
245
  </define>
58
- <define name="editorialgroup">
59
- <element name="editorialgroup">
246
+ <define name="image">
247
+ <element name="image">
248
+ <attribute name="id">
249
+ <data type="ID"/>
250
+ </attribute>
251
+ <attribute name="src">
252
+ <data type="anyURI"/>
253
+ </attribute>
254
+ <attribute name="mimetype"/>
255
+ <optional>
256
+ <attribute name="filename"/>
257
+ </optional>
258
+ <optional>
259
+ <attribute name="width">
260
+ <choice>
261
+ <data type="int"/>
262
+ <value>auto</value>
263
+ </choice>
264
+ </attribute>
265
+ </optional>
266
+ <optional>
267
+ <attribute name="height">
268
+ <choice>
269
+ <data type="int"/>
270
+ <value>auto</value>
271
+ </choice>
272
+ </attribute>
273
+ </optional>
274
+ <optional>
275
+ <attribute name="alt"/>
276
+ </optional>
277
+ <optional>
278
+ <attribute name="title"/>
279
+ </optional>
280
+ <optional>
281
+ <attribute name="longdesc">
282
+ <data type="anyURI"/>
283
+ </attribute>
284
+ </optional>
285
+ <optional>
286
+ <attribute name="align"/>
287
+ </optional>
288
+ </element>
289
+ </define>
290
+ <define name="sourcecode">
291
+ <element name="sourcecode">
292
+ <attribute name="id">
293
+ <data type="ID"/>
294
+ </attribute>
295
+ <optional>
296
+ <attribute name="unnumbered">
297
+ <data type="boolean"/>
298
+ </attribute>
299
+ </optional>
300
+ <optional>
301
+ <attribute name="subsequence"/>
302
+ </optional>
303
+ <optional>
304
+ <attribute name="lang"/>
305
+ </optional>
306
+ <optional>
307
+ <attribute name="markers"/>
308
+ </optional>
309
+ <optional>
310
+ <ref name="tname"/>
311
+ </optional>
60
312
  <oneOrMore>
61
- <ref name="committee"/>
313
+ <choice>
314
+ <text/>
315
+ <ref name="callout"/>
316
+ </choice>
62
317
  </oneOrMore>
318
+ <zeroOrMore>
319
+ <ref name="annotation"/>
320
+ </zeroOrMore>
321
+ <zeroOrMore>
322
+ <ref name="note"/>
323
+ </zeroOrMore>
63
324
  </element>
64
325
  </define>
65
- <define name="BibDataExtensionType">
66
- <optional>
67
- <ref name="doctype"/>
68
- </optional>
69
- <zeroOrMore>
70
- <ref name="ics"/>
71
- </zeroOrMore>
326
+ <define name="xref">
327
+ <element name="xref">
328
+ <attribute name="target">
329
+ <data type="IDREF"/>
330
+ </attribute>
331
+ <optional>
332
+ <attribute name="type">
333
+ <ref name="ReferenceFormat"/>
334
+ </attribute>
335
+ </optional>
336
+ <optional>
337
+ <attribute name="alt"/>
338
+ </optional>
339
+ <optional>
340
+ <attribute name="format"/>
341
+ </optional>
342
+ <text/>
343
+ </element>
344
+ </define>
345
+ <define name="erefType">
72
346
  <optional>
73
- <ref name="ipr"/>
347
+ <attribute name="normative">
348
+ <data type="boolean"/>
349
+ </attribute>
74
350
  </optional>
351
+ <attribute name="citeas"/>
352
+ <attribute name="type">
353
+ <ref name="ReferenceFormat"/>
354
+ </attribute>
75
355
  <optional>
76
- <ref name="iprExtract"/>
356
+ <attribute name="alt"/>
77
357
  </optional>
78
358
  <optional>
79
- <ref name="submissiontype"/>
359
+ <attribute name="displayFormat"/>
80
360
  </optional>
81
- <zeroOrMore>
82
- <ref name="area"/>
83
- </zeroOrMore>
84
- <zeroOrMore>
85
- <ref name="bkeyword"/>
86
- </zeroOrMore>
87
361
  <optional>
88
- <ref name="consensus"/>
362
+ <attribute name="relative"/>
89
363
  </optional>
364
+ <ref name="CitationType"/>
365
+ <text/>
90
366
  </define>
91
- <define name="bkeyword">
92
- <element name="keyword">
93
- <text/>
367
+ <define name="quote-source">
368
+ <element name="source">
369
+ <ref name="erefTypeURI"/>
94
370
  </element>
95
371
  </define>
96
- <define name="contact">
97
- <choice>
98
- <ref name="address"/>
99
- <ref name="phone"/>
100
- <ref name="fax"/>
101
- <ref name="email"/>
102
- <ref name="uri"/>
103
- </choice>
104
- </define>
105
- <define name="TextElement" combine="choice">
106
- <choice>
107
- <ref name="iref"/>
108
- <ref name="comment"/>
109
- </choice>
372
+ <define name="table">
373
+ <element name="table">
374
+ <attribute name="id">
375
+ <data type="ID"/>
376
+ </attribute>
377
+ <optional>
378
+ <attribute name="unnumbered">
379
+ <data type="boolean"/>
380
+ </attribute>
381
+ </optional>
382
+ <optional>
383
+ <attribute name="subsequence"/>
384
+ </optional>
385
+ <optional>
386
+ <attribute name="alt"/>
387
+ </optional>
388
+ <optional>
389
+ <attribute name="summary"/>
390
+ </optional>
391
+ <optional>
392
+ <attribute name="uri">
393
+ <data type="anyURI"/>
394
+ </attribute>
395
+ </optional>
396
+ <optional>
397
+ <attribute name="align"/>
398
+ </optional>
399
+ <optional>
400
+ <ref name="tname"/>
401
+ </optional>
402
+ <optional>
403
+ <ref name="thead"/>
404
+ </optional>
405
+ <ref name="tbody"/>
406
+ <optional>
407
+ <ref name="tfoot"/>
408
+ </optional>
409
+ <zeroOrMore>
410
+ <ref name="table-note"/>
411
+ </zeroOrMore>
412
+ <optional>
413
+ <ref name="dl"/>
414
+ </optional>
415
+ </element>
110
416
  </define>
111
- <define name="fullname">
112
- <element name="name">
417
+ <define name="Clause-Section">
418
+ <optional>
419
+ <attribute name="id">
420
+ <data type="ID"/>
421
+ </attribute>
422
+ </optional>
423
+ <optional>
424
+ <attribute name="language"/>
425
+ </optional>
426
+ <optional>
427
+ <attribute name="script"/>
428
+ </optional>
429
+ <optional>
430
+ <attribute name="numbered"/>
431
+ </optional>
432
+ <optional>
433
+ <attribute name="removeInRFC"/>
434
+ </optional>
435
+ <optional>
436
+ <attribute name="toc"/>
437
+ </optional>
438
+ <optional>
439
+ <attribute name="inline-header">
440
+ <data type="boolean"/>
441
+ </attribute>
442
+ </optional>
443
+ <attribute name="obligation">
113
444
  <choice>
445
+ <value>normative</value>
446
+ <value>informative</value>
447
+ </choice>
448
+ </attribute>
449
+ <optional>
450
+ <ref name="section-title"/>
451
+ </optional>
452
+ <group>
453
+ <group>
454
+ <zeroOrMore>
455
+ <ref name="BasicBlock"/>
456
+ </zeroOrMore>
457
+ <zeroOrMore>
458
+ <ref name="note"/>
459
+ </zeroOrMore>
460
+ </group>
461
+ <zeroOrMore>
462
+ <choice>
463
+ <ref name="clause-subsection"/>
464
+ <ref name="terms"/>
465
+ <ref name="definitions"/>
466
+ </choice>
467
+ </zeroOrMore>
468
+ </group>
469
+ </define>
470
+ <define name="annex">
471
+ <element name="annex">
472
+ <optional>
473
+ <attribute name="id">
474
+ <data type="ID"/>
475
+ </attribute>
476
+ </optional>
477
+ <optional>
478
+ <attribute name="language"/>
479
+ </optional>
480
+ <optional>
481
+ <attribute name="script"/>
482
+ </optional>
483
+ <attribute name="obligation">
484
+ <choice>
485
+ <value>normative</value>
486
+ <value>informative</value>
487
+ </choice>
488
+ </attribute>
489
+ <optional>
490
+ <attribute name="numbered"/>
491
+ </optional>
492
+ <optional>
493
+ <attribute name="removeInRFC"/>
494
+ </optional>
495
+ <optional>
496
+ <attribute name="toc"/>
497
+ </optional>
498
+ <optional>
499
+ <ref name="section-title"/>
500
+ </optional>
501
+ <group>
114
502
  <group>
115
503
  <zeroOrMore>
116
- <ref name="prefix"/>
117
- </zeroOrMore>
118
- <zeroOrMore>
119
- <ref name="forename"/>
120
- </zeroOrMore>
121
- <zeroOrMore>
122
- <ref name="initial"/>
123
- </zeroOrMore>
124
- <ref name="surname"/>
125
- <zeroOrMore>
126
- <ref name="addition"/>
127
- </zeroOrMore>
128
- </group>
129
- <ref name="completeName"/>
130
- <group>
131
- <zeroOrMore>
132
- <ref name="prefix"/>
504
+ <ref name="BasicBlock"/>
133
505
  </zeroOrMore>
134
506
  <zeroOrMore>
135
- <ref name="forename"/>
507
+ <ref name="note"/>
136
508
  </zeroOrMore>
137
- <zeroOrMore>
138
- <ref name="initial"/>
139
- </zeroOrMore>
140
- <ref name="surname"/>
141
- <zeroOrMore>
142
- <ref name="addition"/>
143
- </zeroOrMore>
144
- <ref name="completeName"/>
145
509
  </group>
146
- </choice>
510
+ <zeroOrMore>
511
+ <ref name="clause-subsection"/>
512
+ </zeroOrMore>
513
+ </group>
514
+ </element>
515
+ </define>
516
+ <define name="Content-Section">
517
+ <optional>
518
+ <attribute name="id">
519
+ <data type="ID"/>
520
+ </attribute>
521
+ </optional>
522
+ <optional>
523
+ <attribute name="language"/>
524
+ </optional>
525
+ <optional>
526
+ <attribute name="script"/>
527
+ </optional>
528
+ <optional>
529
+ <attribute name="numbered"/>
530
+ </optional>
531
+ <optional>
532
+ <attribute name="removeInRFC"/>
533
+ </optional>
534
+ <optional>
535
+ <attribute name="toc"/>
536
+ </optional>
537
+ <optional>
538
+ <ref name="section-title"/>
539
+ </optional>
540
+ <group>
541
+ <group>
542
+ <zeroOrMore>
543
+ <ref name="BasicBlock"/>
544
+ </zeroOrMore>
545
+ <zeroOrMore>
546
+ <ref name="note"/>
547
+ </zeroOrMore>
548
+ </group>
549
+ <zeroOrMore>
550
+ <ref name="content-subsection"/>
551
+ </zeroOrMore>
552
+ </group>
553
+ </define>
554
+ <define name="editorialgroup">
555
+ <element name="editorialgroup">
147
556
  <zeroOrMore>
148
- <ref name="biblionote"/>
557
+ <ref name="committee"/>
149
558
  </zeroOrMore>
150
559
  </element>
151
560
  </define>
152
561
  </include>
153
- <define name="fax">
154
- <element name="fax">
562
+ <define name="TextElement" combine="choice">
563
+ <ref name="bcp14"/>
564
+ </define>
565
+ <define name="bcp14">
566
+ <element name="bcp14">
155
567
  <text/>
156
568
  </element>
157
569
  </define>
158
- <define name="consensus">
159
- <element name="consensus">
160
- <data type="boolean"/>
570
+ <define name="committee">
571
+ <element name="committee">
572
+ <ref name="IsoWorkgroup"/>
161
573
  </element>
162
574
  </define>
163
575
  <define name="area">
@@ -170,11 +582,18 @@
170
582
  <value>rtg</value>
171
583
  <value>sec</value>
172
584
  <value>tsv</value>
585
+ <value>Applications and Real-Time</value>
586
+ <value>General</value>
587
+ <value>Internet</value>
588
+ <value>Operations and Management</value>
589
+ <value>Routing</value>
590
+ <value>Security</value>
591
+ <value>Transport</value>
173
592
  </choice>
174
593
  </element>
175
594
  </define>
176
- <define name="abbrevtitle">
177
- <element name="abbrevtitle">
595
+ <define name="comment">
596
+ <element name="comment">
178
597
  <text/>
179
598
  </element>
180
599
  </define>
@@ -183,36 +602,263 @@
183
602
  <text/>
184
603
  </element>
185
604
  </define>
186
- <define name="iprExtract">
605
+ <define name="consensus">
606
+ <element name="consensus">
607
+ <text/>
608
+ </element>
609
+ </define>
610
+ <define name="index-include">
611
+ <element name="indexInclude">
612
+ <text/>
613
+ </element>
614
+ </define>
615
+ <define name="ipr-extract">
187
616
  <element name="iprExtract">
188
617
  <text/>
189
618
  </element>
190
619
  </define>
191
- <define name="submissiontype">
192
- <element name="submissiontype">
620
+ <define name="sort-refs">
621
+ <element name="sortRefs">
193
622
  <text/>
194
623
  </element>
195
624
  </define>
196
- <define name="committee">
197
- <element name="technical-committee">
625
+ <define name="sym-refs">
626
+ <element name="symRefs">
198
627
  <text/>
199
628
  </element>
200
629
  </define>
201
- <define name="iref">
202
- <element name="iref">
203
- <attribute name="item"/>
630
+ <define name="toc-include">
631
+ <element name="tocInclude">
632
+ <text/>
633
+ </element>
634
+ </define>
635
+ <define name="toc-depth">
636
+ <element name="tocDepth">
637
+ <text/>
638
+ </element>
639
+ </define>
640
+ <define name="show-on-front-page">
641
+ <element name="showOnFrontPage">
642
+ <text/>
643
+ </element>
644
+ </define>
645
+ <define name="processing-instructions">
646
+ <element name="pi">
204
647
  <optional>
205
- <attribute name="subitem"/>
648
+ <element name="artworkdelimiter">
649
+ <text/>
650
+ </element>
206
651
  </optional>
207
652
  <optional>
208
- <text/>
653
+ <element name="artworklines">
654
+ <text/>
655
+ </element>
656
+ </optional>
657
+ <optional>
658
+ <element name="authorship">
659
+ <text/>
660
+ </element>
661
+ </optional>
662
+ <optional>
663
+ <element name="autobreaks">
664
+ <text/>
665
+ </element>
666
+ </optional>
667
+ <optional>
668
+ <element name="background">
669
+ <text/>
670
+ </element>
671
+ </optional>
672
+ <optional>
673
+ <element name="colonspace">
674
+ <text/>
675
+ </element>
676
+ </optional>
677
+ <optional>
678
+ <element name="comments">
679
+ <text/>
680
+ </element>
681
+ </optional>
682
+ <optional>
683
+ <element name="docmapping">
684
+ <text/>
685
+ </element>
686
+ </optional>
687
+ <optional>
688
+ <element name="editing">
689
+ <text/>
690
+ </element>
691
+ </optional>
692
+ <optional>
693
+ <element name="emoticonic">
694
+ <text/>
695
+ </element>
696
+ </optional>
697
+ <optional>
698
+ <element name="footer">
699
+ <text/>
700
+ </element>
701
+ </optional>
702
+ <optional>
703
+ <element name="header">
704
+ <text/>
705
+ </element>
706
+ </optional>
707
+ <optional>
708
+ <element name="inline">
709
+ <text/>
710
+ </element>
711
+ </optional>
712
+ <optional>
713
+ <element name="iprnotified">
714
+ <text/>
715
+ </element>
716
+ </optional>
717
+ <optional>
718
+ <element name="linkmailto">
719
+ <text/>
720
+ </element>
721
+ </optional>
722
+ <optional>
723
+ <element name="linefile">
724
+ <text/>
725
+ </element>
726
+ </optional>
727
+ <optional>
728
+ <element name="notedraftinprogress">
729
+ <text/>
730
+ </element>
731
+ </optional>
732
+ <optional>
733
+ <element name="private">
734
+ <text/>
735
+ </element>
736
+ </optional>
737
+ <optional>
738
+ <element name="refparent">
739
+ <text/>
740
+ </element>
741
+ </optional>
742
+ <optional>
743
+ <element name="rfcedstyle">
744
+ <text/>
745
+ </element>
746
+ </optional>
747
+ <optional>
748
+ <element name="slides">
749
+ <text/>
750
+ </element>
751
+ </optional>
752
+ <optional>
753
+ <element name="text-list-symbols">
754
+ <text/>
755
+ </element>
756
+ </optional>
757
+ <optional>
758
+ <element name="tocappendix">
759
+ <text/>
760
+ </element>
761
+ </optional>
762
+ <optional>
763
+ <element name="tocindent">
764
+ <text/>
765
+ </element>
766
+ </optional>
767
+ <optional>
768
+ <element name="tocnarrow">
769
+ <text/>
770
+ </element>
771
+ </optional>
772
+ <optional>
773
+ <element name="tocompact">
774
+ <text/>
775
+ </element>
776
+ </optional>
777
+ <optional>
778
+ <element name="topblock">
779
+ <text/>
780
+ </element>
781
+ </optional>
782
+ <optional>
783
+ <element name="useobject">
784
+ <text/>
785
+ </element>
786
+ </optional>
787
+ <optional>
788
+ <element name="strict">
789
+ <text/>
790
+ </element>
791
+ </optional>
792
+ <optional>
793
+ <element name="compact">
794
+ <text/>
795
+ </element>
796
+ </optional>
797
+ <optional>
798
+ <element name="subcompact">
799
+ <text/>
800
+ </element>
801
+ </optional>
802
+ <optional>
803
+ <element name="toc">
804
+ <text/>
805
+ </element>
806
+ </optional>
807
+ <optional>
808
+ <element name="tocdepth">
809
+ <text/>
810
+ </element>
811
+ </optional>
812
+ <optional>
813
+ <element name="symrefs">
814
+ <text/>
815
+ </element>
816
+ </optional>
817
+ <optional>
818
+ <element name="sortrefs">
819
+ <text/>
820
+ </element>
209
821
  </optional>
210
822
  </element>
211
823
  </define>
212
- <define name="comment">
213
- <element name="comment">
214
- <text/>
215
- </element>
824
+ <define name="erefTypeURI">
825
+ <optional>
826
+ <attribute name="normative">
827
+ <data type="boolean"/>
828
+ </attribute>
829
+ </optional>
830
+ <optional>
831
+ <attribute name="citeas"/>
832
+ </optional>
833
+ <attribute name="type">
834
+ <ref name="ReferenceFormat"/>
835
+ </attribute>
836
+ <optional>
837
+ <attribute name="alt"/>
838
+ </optional>
839
+ <optional>
840
+ <attribute name="displayFormat"/>
841
+ </optional>
842
+ <optional>
843
+ <attribute name="relative"/>
844
+ </optional>
845
+ <optional>
846
+ <attribute name="bibitemid">
847
+ <data type="IDREF"/>
848
+ </attribute>
849
+ </optional>
850
+ <optional>
851
+ <attribute name="uri">
852
+ <data type="anyURI"/>
853
+ </attribute>
854
+ </optional>
855
+ <zeroOrMore>
856
+ <ref name="locality"/>
857
+ </zeroOrMore>
858
+ <optional>
859
+ <ref name="date"/>
860
+ </optional>
861
+ <text/>
216
862
  </define>
217
863
  <define name="ietf-standard">
218
864
  <element name="ietf-standard">