metanorma-iec 2.4.7 → 2.4.8

Sign up to get free protection for your applications and to get access to all the features.
@@ -17,7 +17,7 @@
17
17
  these elements; we just want one namespace for any child grammars
18
18
  of this.
19
19
  -->
20
- <!-- VERSION v1.3.1 -->
20
+ <!-- VERSION v1.3.2 -->
21
21
  <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
22
22
  <include href="reqt.rng"/>
23
23
  <include href="basicdoc.rng">
@@ -30,42 +30,28 @@
30
30
  </zeroOrMore>
31
31
  </element>
32
32
  </define>
33
- <define name="admonition">
34
- <element name="admonition">
35
- <attribute name="type">
36
- <ref name="AdmonitionType"/>
33
+ <define name="AdmonitionAttr">
34
+ <attribute name="type">
35
+ <ref name="AdmonitionType"/>
36
+ </attribute>
37
+ <optional>
38
+ <attribute name="class"/>
39
+ </optional>
40
+ <optional>
41
+ <attribute name="uri">
42
+ <data type="anyURI"/>
37
43
  </attribute>
38
- <optional>
39
- <attribute name="class"/>
40
- </optional>
41
- <attribute name="id">
42
- <data type="ID"/>
44
+ </optional>
45
+ <optional>
46
+ <attribute name="coverpage">
47
+ <data type="boolean"/>
43
48
  </attribute>
44
- <optional>
45
- <attribute name="uri">
46
- <data type="anyURI"/>
47
- </attribute>
48
- </optional>
49
- <optional>
50
- <attribute name="coverpage">
51
- <data type="boolean"/>
52
- </attribute>
53
- </optional>
54
- <optional>
55
- <attribute name="notag">
56
- <data type="boolean"/>
57
- </attribute>
58
- </optional>
59
- <optional>
60
- <ref name="tname"/>
61
- </optional>
62
- <zeroOrMore>
63
- <ref name="paragraph-with-footnote"/>
64
- </zeroOrMore>
65
- <zeroOrMore>
66
- <ref name="note"/>
67
- </zeroOrMore>
68
- </element>
49
+ </optional>
50
+ <optional>
51
+ <attribute name="notag">
52
+ <data type="boolean"/>
53
+ </attribute>
54
+ </optional>
69
55
  </define>
70
56
  <define name="AdmonitionType">
71
57
  <choice>
@@ -196,363 +182,297 @@
196
182
  <ref name="PureTextElement"/>
197
183
  </oneOrMore>
198
184
  </define>
199
- <define name="ul">
200
- <element name="ul">
201
- <attribute name="id">
202
- <data type="ID"/>
203
- </attribute>
204
- <ref name="BlockAttributes"/>
205
- <optional>
206
- <ref name="tname"/>
207
- </optional>
208
- <oneOrMore>
209
- <ref name="ul_li"/>
210
- </oneOrMore>
211
- <zeroOrMore>
212
- <ref name="note"/>
213
- </zeroOrMore>
214
- </element>
185
+ <define name="UlAttr">
186
+ <ref name="BlockAttributes"/>
215
187
  </define>
216
- <define name="ol">
217
- <element name="ol">
218
- <attribute name="id">
219
- <data type="ID"/>
188
+ <define name="UlBody">
189
+ <optional>
190
+ <ref name="tname"/>
191
+ </optional>
192
+ <oneOrMore>
193
+ <ref name="ul_li"/>
194
+ </oneOrMore>
195
+ <zeroOrMore>
196
+ <ref name="note"/>
197
+ </zeroOrMore>
198
+ </define>
199
+ <define name="OlBody">
200
+ <optional>
201
+ <ref name="tname"/>
202
+ </optional>
203
+ <oneOrMore>
204
+ <ref name="li"/>
205
+ </oneOrMore>
206
+ <zeroOrMore>
207
+ <ref name="note"/>
208
+ </zeroOrMore>
209
+ </define>
210
+ <define name="OlAttr">
211
+ <ref name="BlockAttributes"/>
212
+ <optional>
213
+ <attribute name="type">
214
+ <choice>
215
+ <value>roman</value>
216
+ <value>alphabet</value>
217
+ <value>arabic</value>
218
+ <value>roman_upper</value>
219
+ <value>alphabet_upper</value>
220
+ </choice>
220
221
  </attribute>
221
- <ref name="BlockAttributes"/>
222
- <optional>
223
- <attribute name="type">
224
- <choice>
225
- <value>roman</value>
226
- <value>alphabet</value>
227
- <value>arabic</value>
228
- <value>roman_upper</value>
229
- <value>alphabet_upper</value>
230
- </choice>
231
- </attribute>
232
- </optional>
233
- <optional>
234
- <ref name="tname"/>
235
- </optional>
236
- <oneOrMore>
237
- <ref name="li"/>
238
- </oneOrMore>
239
- <zeroOrMore>
240
- <ref name="note"/>
241
- </zeroOrMore>
242
- </element>
222
+ </optional>
243
223
  </define>
244
- <define name="dl">
245
- <element name="dl">
246
- <attribute name="id">
247
- <data type="ID"/>
224
+ <define name="DlAttr">
225
+ <ref name="BlockAttributes"/>
226
+ <optional>
227
+ <attribute name="key">
228
+ <data type="boolean"/>
248
229
  </attribute>
249
- <ref name="BlockAttributes"/>
250
- <optional>
251
- <attribute name="key">
252
- <data type="boolean"/>
253
- </attribute>
254
- </optional>
255
- <optional>
256
- <ref name="tname"/>
257
- </optional>
258
- <oneOrMore>
259
- <ref name="dt"/>
260
- <ref name="dd"/>
261
- </oneOrMore>
262
- <zeroOrMore>
263
- <ref name="note"/>
264
- </zeroOrMore>
265
- </element>
230
+ </optional>
231
+ </define>
232
+ <define name="DlBody">
233
+ <optional>
234
+ <ref name="tname"/>
235
+ </optional>
236
+ <oneOrMore>
237
+ <ref name="dt"/>
238
+ <ref name="dd"/>
239
+ </oneOrMore>
240
+ <zeroOrMore>
241
+ <ref name="note"/>
242
+ </zeroOrMore>
266
243
  </define>
267
244
  <define name="dt">
268
245
  <element name="dt">
269
- <optional>
270
- <attribute name="id">
271
- <data type="ID"/>
272
- </attribute>
273
- </optional>
246
+ <ref name="OptionalId"/>
274
247
  <zeroOrMore>
275
248
  <ref name="TextElement"/>
276
249
  </zeroOrMore>
277
250
  </element>
278
251
  </define>
279
- <define name="example">
280
- <element name="example">
281
- <attribute name="id">
282
- <data type="ID"/>
283
- </attribute>
284
- <optional>
285
- <attribute name="unnumbered">
286
- <data type="boolean"/>
287
- </attribute>
288
- </optional>
289
- <optional>
290
- <attribute name="subsequence"/>
291
- </optional>
292
- <optional>
293
- <attribute name="number"/>
294
- </optional>
295
- <ref name="BlockAttributes"/>
296
- <optional>
297
- <ref name="tname"/>
298
- </optional>
299
- <oneOrMore>
300
- <choice>
301
- <ref name="formula"/>
302
- <ref name="ul"/>
303
- <ref name="ol"/>
304
- <ref name="dl"/>
305
- <ref name="quote"/>
306
- <ref name="sourcecode"/>
307
- <ref name="paragraph-with-footnote"/>
308
- <ref name="figure"/>
309
- </choice>
310
- </oneOrMore>
311
- <zeroOrMore>
312
- <ref name="note"/>
313
- </zeroOrMore>
314
- </element>
315
- </define>
316
- <define name="table">
317
- <element name="table">
318
- <attribute name="id">
319
- <data type="ID"/>
252
+ <define name="ExampleAttr">
253
+ <optional>
254
+ <attribute name="unnumbered">
255
+ <data type="boolean"/>
320
256
  </attribute>
321
- <optional>
322
- <attribute name="unnumbered">
323
- <data type="boolean"/>
324
- </attribute>
325
- </optional>
326
- <optional>
327
- <attribute name="number"/>
328
- </optional>
329
- <optional>
330
- <attribute name="subsequence"/>
331
- </optional>
332
- <optional>
333
- <attribute name="alt"/>
334
- </optional>
335
- <optional>
336
- <attribute name="summary"/>
337
- </optional>
338
- <optional>
339
- <attribute name="uri">
340
- <data type="anyURI"/>
341
- </attribute>
342
- </optional>
343
- <optional>
344
- <attribute name="width"/>
345
- </optional>
346
- <ref name="BlockAttributes"/>
347
- <optional>
348
- <ref name="colgroup"/>
349
- </optional>
350
- <optional>
351
- <ref name="tname"/>
352
- </optional>
353
- <optional>
354
- <ref name="thead"/>
355
- </optional>
356
- <ref name="tbody"/>
357
- <optional>
358
- <ref name="tfoot"/>
359
- </optional>
360
- <zeroOrMore>
361
- <ref name="table-note"/>
362
- </zeroOrMore>
363
- <optional>
364
- <ref name="dl"/>
365
- </optional>
366
- <optional>
367
- <ref name="source"/>
368
- </optional>
369
- </element>
257
+ </optional>
258
+ <optional>
259
+ <attribute name="subsequence"/>
260
+ </optional>
261
+ <optional>
262
+ <attribute name="number"/>
263
+ </optional>
264
+ <ref name="BlockAttributes"/>
370
265
  </define>
371
- <define name="figure">
372
- <element name="figure">
373
- <ref name="FigureAttributes"/>
374
- <ref name="BlockAttributes"/>
375
- <optional>
376
- <ref name="tname"/>
377
- </optional>
266
+ <define name="ExampleBody">
267
+ <optional>
268
+ <ref name="tname"/>
269
+ </optional>
270
+ <oneOrMore>
378
271
  <choice>
379
- <ref name="image"/>
380
- <ref name="video"/>
381
- <ref name="audio"/>
382
- <ref name="pre"/>
383
- <oneOrMore>
384
- <ref name="paragraph-with-footnote"/>
385
- </oneOrMore>
386
- <zeroOrMore>
387
- <ref name="figure"/>
388
- </zeroOrMore>
389
- </choice>
390
- <zeroOrMore>
391
- <ref name="fn"/>
392
- </zeroOrMore>
393
- <optional>
272
+ <ref name="formula"/>
273
+ <ref name="ul"/>
274
+ <ref name="ol"/>
394
275
  <ref name="dl"/>
395
- </optional>
396
- <zeroOrMore>
397
- <ref name="note"/>
398
- </zeroOrMore>
399
- <optional>
400
- <ref name="source"/>
401
- </optional>
402
- </element>
276
+ <ref name="quote"/>
277
+ <ref name="sourcecode"/>
278
+ <ref name="paragraph-with-footnote"/>
279
+ <ref name="figure"/>
280
+ </choice>
281
+ </oneOrMore>
282
+ <zeroOrMore>
283
+ <ref name="note"/>
284
+ </zeroOrMore>
403
285
  </define>
404
- <define name="source">
405
- <element name="source">
406
- <attribute name="status">
407
- <ref name="SourceStatusType"/>
286
+ <define name="TableAttr">
287
+ <optional>
288
+ <attribute name="unnumbered">
289
+ <data type="boolean"/>
408
290
  </attribute>
409
- <ref name="origin"/>
410
- <optional>
411
- <ref name="modification"/>
412
- </optional>
413
- </element>
291
+ </optional>
292
+ <optional>
293
+ <attribute name="number"/>
294
+ </optional>
295
+ <optional>
296
+ <attribute name="subsequence"/>
297
+ </optional>
298
+ <optional>
299
+ <attribute name="alt"/>
300
+ </optional>
301
+ <optional>
302
+ <attribute name="summary"/>
303
+ </optional>
304
+ <optional>
305
+ <attribute name="uri">
306
+ <data type="anyURI"/>
307
+ </attribute>
308
+ </optional>
309
+ <optional>
310
+ <attribute name="width"/>
311
+ </optional>
312
+ <ref name="BlockAttributes"/>
414
313
  </define>
415
- <define name="sourcecode">
416
- <element name="sourcecode">
417
- <attribute name="id">
418
- <data type="ID"/>
314
+ <define name="TableBody">
315
+ <optional>
316
+ <ref name="colgroup"/>
317
+ </optional>
318
+ <optional>
319
+ <ref name="tname"/>
320
+ </optional>
321
+ <optional>
322
+ <ref name="thead"/>
323
+ </optional>
324
+ <ref name="tbody"/>
325
+ <optional>
326
+ <ref name="tfoot"/>
327
+ </optional>
328
+ <optional>
329
+ <ref name="dl"/>
330
+ </optional>
331
+ <zeroOrMore>
332
+ <ref name="table-note"/>
333
+ </zeroOrMore>
334
+ <optional>
335
+ <ref name="source"/>
336
+ </optional>
337
+ </define>
338
+ <define name="FigureAttr">
339
+ <optional>
340
+ <attribute name="unnumbered">
341
+ <data type="boolean"/>
419
342
  </attribute>
420
- <optional>
421
- <attribute name="unnumbered">
422
- <data type="boolean"/>
423
- </attribute>
424
- </optional>
425
- <optional>
426
- <attribute name="number"/>
427
- </optional>
428
- <optional>
429
- <attribute name="subsequence"/>
430
- </optional>
431
- <optional>
432
- <attribute name="lang"/>
433
- </optional>
434
- <ref name="BlockAttributes"/>
435
- <optional>
436
- <attribute name="linenums">
437
- <data type="boolean"/>
438
- </attribute>
439
- </optional>
440
- <optional>
441
- <ref name="tname"/>
442
- </optional>
343
+ </optional>
344
+ <optional>
345
+ <attribute name="number"/>
346
+ </optional>
347
+ <optional>
348
+ <attribute name="subsequence"/>
349
+ </optional>
350
+ <optional>
351
+ <attribute name="class"/>
352
+ </optional>
353
+ <optional>
354
+ <attribute name="width"/>
355
+ </optional>
356
+ <ref name="BlockAttributes"/>
357
+ </define>
358
+ <define name="FigureBody">
359
+ <optional>
360
+ <ref name="tname"/>
361
+ </optional>
362
+ <choice>
363
+ <ref name="image"/>
364
+ <ref name="video"/>
365
+ <ref name="audio"/>
366
+ <ref name="pre"/>
443
367
  <oneOrMore>
444
- <choice>
445
- <text/>
446
- <ref name="callout"/>
447
- <ref name="xref"/>
448
- <ref name="eref"/>
449
- </choice>
368
+ <ref name="paragraph-with-footnote"/>
450
369
  </oneOrMore>
451
370
  <zeroOrMore>
452
- <ref name="annotation"/>
453
- </zeroOrMore>
454
- <zeroOrMore>
455
- <ref name="note"/>
371
+ <ref name="figure"/>
456
372
  </zeroOrMore>
457
- </element>
373
+ </choice>
374
+ <zeroOrMore>
375
+ <ref name="fn"/>
376
+ </zeroOrMore>
377
+ <optional>
378
+ <ref name="dl"/>
379
+ </optional>
380
+ <zeroOrMore>
381
+ <ref name="note"/>
382
+ </zeroOrMore>
383
+ <optional>
384
+ <ref name="source"/>
385
+ </optional>
458
386
  </define>
459
- <define name="formula">
460
- <element name="formula">
461
- <attribute name="id">
462
- <data type="ID"/>
387
+ <define name="source">
388
+ <element name="source">
389
+ <attribute name="status">
390
+ <ref name="SourceStatusType"/>
463
391
  </attribute>
392
+ <ref name="origin"/>
464
393
  <optional>
465
- <attribute name="unnumbered">
466
- <data type="boolean"/>
467
- </attribute>
468
- </optional>
469
- <optional>
470
- <attribute name="number"/>
471
- </optional>
472
- <optional>
473
- <attribute name="subsequence"/>
474
- </optional>
475
- <optional>
476
- <attribute name="inequality">
477
- <data type="boolean"/>
478
- </attribute>
479
- </optional>
480
- <ref name="BlockAttributes"/>
481
- <ref name="stem"/>
482
- <optional>
483
- <ref name="dl"/>
394
+ <ref name="modification"/>
484
395
  </optional>
485
- <zeroOrMore>
486
- <ref name="note"/>
487
- </zeroOrMore>
488
396
  </element>
489
397
  </define>
490
- <define name="ParagraphType">
491
- <attribute name="id">
492
- <data type="ID"/>
493
- </attribute>
398
+ <define name="SourceAttr">
494
399
  <optional>
495
- <attribute name="align">
496
- <ref name="Alignments"/>
400
+ <attribute name="unnumbered">
401
+ <data type="boolean"/>
497
402
  </attribute>
498
403
  </optional>
404
+ <optional>
405
+ <attribute name="number"/>
406
+ </optional>
407
+ <optional>
408
+ <attribute name="subsequence"/>
409
+ </optional>
410
+ <optional>
411
+ <attribute name="lang"/>
412
+ </optional>
499
413
  <ref name="BlockAttributes"/>
414
+ <optional>
415
+ <attribute name="linenums">
416
+ <data type="boolean"/>
417
+ </attribute>
418
+ </optional>
419
+ </define>
420
+ <define name="SourceBody">
421
+ <optional>
422
+ <ref name="tname"/>
423
+ </optional>
424
+ <oneOrMore>
425
+ <choice>
426
+ <text/>
427
+ <ref name="callout"/>
428
+ <ref name="xref"/>
429
+ <ref name="eref"/>
430
+ </choice>
431
+ </oneOrMore>
500
432
  <zeroOrMore>
501
- <ref name="TextElement"/>
433
+ <ref name="annotation"/>
502
434
  </zeroOrMore>
503
435
  <zeroOrMore>
504
436
  <ref name="note"/>
505
437
  </zeroOrMore>
506
438
  </define>
507
- <define name="paragraph-with-footnote">
508
- <element name="p">
509
- <attribute name="id">
510
- <data type="ID"/>
439
+ <define name="FormulaAttr">
440
+ <optional>
441
+ <attribute name="unnumbered">
442
+ <data type="boolean"/>
511
443
  </attribute>
512
- <optional>
513
- <attribute name="align">
514
- <ref name="Alignments"/>
515
- </attribute>
516
- </optional>
517
- <optional>
518
- <attribute name="type"/>
519
- </optional>
520
- <ref name="BlockAttributes"/>
521
- <zeroOrMore>
522
- <choice>
523
- <ref name="TextElement"/>
524
- <ref name="fn"/>
525
- </choice>
526
- </zeroOrMore>
527
- <zeroOrMore>
528
- <ref name="note"/>
529
- </zeroOrMore>
530
- </element>
444
+ </optional>
445
+ <optional>
446
+ <attribute name="number"/>
447
+ </optional>
448
+ <optional>
449
+ <attribute name="subsequence"/>
450
+ </optional>
451
+ <optional>
452
+ <attribute name="inequality">
453
+ <data type="boolean"/>
454
+ </attribute>
455
+ </optional>
456
+ <ref name="BlockAttributes"/>
531
457
  </define>
532
- <define name="quote">
533
- <element name="quote">
534
- <attribute name="id">
535
- <data type="ID"/>
458
+ <define name="ParagraphAttrs">
459
+ <optional>
460
+ <attribute name="align">
461
+ <ref name="Alignments"/>
536
462
  </attribute>
537
- <optional>
538
- <attribute name="alignment">
539
- <ref name="Alignments"/>
540
- </attribute>
541
- </optional>
542
- <ref name="BlockAttributes"/>
543
- <optional>
544
- <ref name="quote-source"/>
545
- </optional>
546
- <optional>
547
- <ref name="quote-author"/>
548
- </optional>
549
- <oneOrMore>
550
- <ref name="paragraph-with-footnote"/>
551
- </oneOrMore>
552
- <zeroOrMore>
553
- <ref name="note"/>
554
- </zeroOrMore>
555
- </element>
463
+ </optional>
464
+ <optional>
465
+ <attribute name="type"/>
466
+ </optional>
467
+ <ref name="BlockAttributes"/>
468
+ </define>
469
+ <define name="QuoteAttr">
470
+ <optional>
471
+ <attribute name="alignment">
472
+ <ref name="Alignments"/>
473
+ </attribute>
474
+ </optional>
475
+ <ref name="BlockAttributes"/>
556
476
  </define>
557
477
  <!-- TitleType = text -->
558
478
  <define name="sections">
@@ -603,48 +523,45 @@
603
523
  </zeroOrMore>
604
524
  </element>
605
525
  </define>
606
- <define name="note">
607
- <element name="note">
608
- <attribute name="id">
609
- <data type="ID"/>
526
+ <define name="NoteAttr">
527
+ <optional>
528
+ <attribute name="unnumbered">
529
+ <data type="boolean"/>
610
530
  </attribute>
611
- <optional>
612
- <attribute name="unnumbered">
613
- <data type="boolean"/>
614
- </attribute>
615
- </optional>
616
- <optional>
617
- <attribute name="number"/>
618
- </optional>
619
- <optional>
620
- <attribute name="subsequence"/>
621
- </optional>
622
- <optional>
623
- <attribute name="type"/>
624
- </optional>
625
- <optional>
626
- <attribute name="coverpage">
627
- <data type="boolean"/>
628
- </attribute>
629
- </optional>
630
- <optional>
631
- <attribute name="notag">
632
- <data type="boolean"/>
633
- </attribute>
634
- </optional>
635
- <ref name="BlockAttributes"/>
636
- <oneOrMore>
637
- <choice>
638
- <ref name="paragraph"/>
639
- <ref name="ul"/>
640
- <ref name="ol"/>
641
- <ref name="dl"/>
642
- <ref name="formula"/>
643
- <ref name="quote"/>
644
- <ref name="sourcecode"/>
645
- </choice>
646
- </oneOrMore>
647
- </element>
531
+ </optional>
532
+ <optional>
533
+ <attribute name="number"/>
534
+ </optional>
535
+ <optional>
536
+ <attribute name="subsequence"/>
537
+ </optional>
538
+ <optional>
539
+ <attribute name="type"/>
540
+ </optional>
541
+ <optional>
542
+ <attribute name="coverpage">
543
+ <data type="boolean"/>
544
+ </attribute>
545
+ </optional>
546
+ <optional>
547
+ <attribute name="notag">
548
+ <data type="boolean"/>
549
+ </attribute>
550
+ </optional>
551
+ <ref name="BlockAttributes"/>
552
+ </define>
553
+ <define name="NoteBody">
554
+ <oneOrMore>
555
+ <choice>
556
+ <ref name="paragraph"/>
557
+ <ref name="ul"/>
558
+ <ref name="ol"/>
559
+ <ref name="dl"/>
560
+ <ref name="formula"/>
561
+ <ref name="quote"/>
562
+ <ref name="sourcecode"/>
563
+ </choice>
564
+ </oneOrMore>
648
565
  </define>
649
566
  <define name="Basic-Section">
650
567
  <optional>
@@ -673,21 +590,12 @@
673
590
  <ref name="BasicBlock"/>
674
591
  </oneOrMore>
675
592
  </define>
676
- <define name="li">
677
- <element name="li">
678
- <group>
679
- <optional>
680
- <attribute name="id">
681
- <data type="ID"/>
682
- </attribute>
683
- </optional>
684
- <oneOrMore>
685
- <ref name="BasicBlock"/>
686
- </oneOrMore>
687
- </group>
688
- <!-- exclude figures? -->
689
- </element>
593
+ <define name="LiBody">
594
+ <oneOrMore>
595
+ <ref name="BasicBlock"/>
596
+ </oneOrMore>
690
597
  </define>
598
+ <!-- exclude figures? -->
691
599
  <define name="dd">
692
600
  <element name="dd">
693
601
  <zeroOrMore>
@@ -703,91 +611,37 @@
703
611
  </oneOrMore>
704
612
  </element>
705
613
  </define>
706
- <define name="td">
707
- <element name="td">
708
- <optional>
709
- <attribute name="colspan"/>
710
- </optional>
711
- <optional>
712
- <attribute name="rowspan"/>
713
- </optional>
714
- <optional>
715
- <attribute name="align">
716
- <choice>
717
- <value>left</value>
718
- <value>right</value>
719
- <value>center</value>
720
- </choice>
721
- </attribute>
722
- </optional>
723
- <optional>
724
- <attribute name="valign">
725
- <choice>
726
- <value>top</value>
727
- <value>middle</value>
728
- <value>bottom</value>
729
- <value>baseline</value>
730
- </choice>
731
- </attribute>
732
- </optional>
733
- <choice>
734
- <zeroOrMore>
735
- <choice>
736
- <ref name="TextElement"/>
737
- <ref name="fn"/>
738
- </choice>
739
- </zeroOrMore>
740
- <oneOrMore>
741
- <choice>
742
- <ref name="paragraph-with-footnote"/>
743
- <ref name="dl"/>
744
- <ref name="ul"/>
745
- <ref name="ol"/>
746
- <ref name="figure"/>
747
- </choice>
748
- </oneOrMore>
749
- </choice>
750
- </element>
751
- </define>
752
- <define name="th">
753
- <element name="th">
754
- <optional>
755
- <attribute name="colspan"/>
756
- </optional>
757
- <optional>
758
- <attribute name="rowspan"/>
759
- </optional>
760
- <optional>
761
- <attribute name="align">
762
- <choice>
763
- <value>left</value>
764
- <value>right</value>
765
- <value>center</value>
766
- </choice>
767
- </attribute>
768
- </optional>
769
- <optional>
770
- <attribute name="valign">
771
- <choice>
772
- <value>top</value>
773
- <value>middle</value>
774
- <value>bottom</value>
775
- <value>baseline</value>
776
- </choice>
777
- </attribute>
778
- </optional>
779
- <choice>
780
- <zeroOrMore>
781
- <choice>
782
- <ref name="TextElement"/>
783
- <ref name="fn"/>
784
- </choice>
785
- </zeroOrMore>
786
- <oneOrMore>
614
+ <define name="TdBody">
615
+ <choice>
616
+ <zeroOrMore>
617
+ <choice>
618
+ <ref name="TextElement"/>
619
+ <ref name="fn"/>
620
+ </choice>
621
+ </zeroOrMore>
622
+ <oneOrMore>
623
+ <choice>
787
624
  <ref name="paragraph-with-footnote"/>
788
- </oneOrMore>
789
- </choice>
790
- </element>
625
+ <ref name="dl"/>
626
+ <ref name="ul"/>
627
+ <ref name="ol"/>
628
+ <ref name="figure"/>
629
+ </choice>
630
+ </oneOrMore>
631
+ </choice>
632
+ </define>
633
+ <define name="ThBody">
634
+ <choice>
635
+ <zeroOrMore>
636
+ <choice>
637
+ <ref name="TextElement"/>
638
+ <ref name="fn"/>
639
+ </choice>
640
+ </zeroOrMore>
641
+ <oneOrMore>
642
+ <ref name="paragraph-with-footnote"/>
643
+ </oneOrMore>
644
+ </choice>
791
645
  </define>
792
646
  <define name="table-note">
793
647
  <element name="note">
@@ -1616,6 +1470,10 @@
1616
1470
  </choice>
1617
1471
  </define>
1618
1472
  <define name="Annex-Section">
1473
+ <ref name="Annex-Section-Attr"/>
1474
+ <ref name="Annex-Section-Body"/>
1475
+ </define>
1476
+ <define name="Annex-Section-Attr">
1619
1477
  <optional>
1620
1478
  <attribute name="id">
1621
1479
  <data type="ID"/>
@@ -1640,6 +1498,11 @@
1640
1498
  </choice>
1641
1499
  </attribute>
1642
1500
  </optional>
1501
+ <optional>
1502
+ <attribute name="type"/>
1503
+ </optional>
1504
+ </define>
1505
+ <define name="Annex-Section-Body">
1643
1506
  <optional>
1644
1507
  <ref name="section-title"/>
1645
1508
  </optional>
@@ -2439,28 +2302,6 @@
2439
2302
  <attribute name="columns"/>
2440
2303
  </optional>
2441
2304
  </define>
2442
- <define name="FigureAttributes">
2443
- <attribute name="id">
2444
- <data type="ID"/>
2445
- </attribute>
2446
- <optional>
2447
- <attribute name="unnumbered">
2448
- <data type="boolean"/>
2449
- </attribute>
2450
- </optional>
2451
- <optional>
2452
- <attribute name="number"/>
2453
- </optional>
2454
- <optional>
2455
- <attribute name="subsequence"/>
2456
- </optional>
2457
- <optional>
2458
- <attribute name="class"/>
2459
- </optional>
2460
- <optional>
2461
- <attribute name="width"/>
2462
- </optional>
2463
- </define>
2464
2305
  <start>
2465
2306
  <ref name="standard-document"/>
2466
2307
  </start>