metanorma-iso 1.3.13 → 1.3.15

Sign up to get free protection for your applications and to get access to all the features.
@@ -36,9 +36,7 @@
36
36
  </element>
37
37
  </define>
38
38
  <define name="BibDataExtensionType">
39
- <optional>
40
- <ref name="doctype"/>
41
- </optional>
39
+ <ref name="doctype"/>
42
40
  <ref name="editorialgroup"/>
43
41
  <zeroOrMore>
44
42
  <ref name="ics"/>
@@ -68,6 +66,7 @@
68
66
  <choice>
69
67
  <ref name="ISO8601Date"/>
70
68
  <value>--</value>
69
+ <value>–</value>
71
70
  </choice>
72
71
  </element>
73
72
  </choice>
@@ -90,75 +89,6 @@
90
89
  </oneOrMore>
91
90
  </element>
92
91
  </define>
93
- <define name="Basic-Section">
94
- <optional>
95
- <attribute name="id">
96
- <data type="ID"/>
97
- </attribute>
98
- </optional>
99
- <optional>
100
- <attribute name="language"/>
101
- </optional>
102
- <optional>
103
- <attribute name="script"/>
104
- </optional>
105
- <optional>
106
- <attribute name="obligation">
107
- <choice>
108
- <value>normative</value>
109
- <value>informative</value>
110
- </choice>
111
- </attribute>
112
- </optional>
113
- <optional>
114
- <ref name="section-title"/>
115
- </optional>
116
- <group>
117
- <oneOrMore>
118
- <ref name="BasicBlock"/>
119
- </oneOrMore>
120
- <zeroOrMore>
121
- <ref name="note"/>
122
- </zeroOrMore>
123
- </group>
124
- </define>
125
- <define name="Content-Section">
126
- <optional>
127
- <attribute name="id">
128
- <data type="ID"/>
129
- </attribute>
130
- </optional>
131
- <optional>
132
- <attribute name="language"/>
133
- </optional>
134
- <optional>
135
- <attribute name="script"/>
136
- </optional>
137
- <optional>
138
- <attribute name="obligation">
139
- <choice>
140
- <value>normative</value>
141
- <value>informative</value>
142
- </choice>
143
- </attribute>
144
- </optional>
145
- <optional>
146
- <ref name="section-title"/>
147
- </optional>
148
- <choice>
149
- <group>
150
- <oneOrMore>
151
- <ref name="BasicBlock"/>
152
- </oneOrMore>
153
- <zeroOrMore>
154
- <ref name="note"/>
155
- </zeroOrMore>
156
- </group>
157
- <oneOrMore>
158
- <ref name="content-subsection"/>
159
- </oneOrMore>
160
- </choice>
161
- </define>
162
92
  <define name="Clause-Section">
163
93
  <optional>
164
94
  <attribute name="id">
@@ -201,107 +131,6 @@
201
131
  </oneOrMore>
202
132
  </choice>
203
133
  </define>
204
- <define name="references">
205
- <element name="references">
206
- <optional>
207
- <attribute name="id">
208
- <data type="ID"/>
209
- </attribute>
210
- </optional>
211
- <optional>
212
- <attribute name="obligation">
213
- <choice>
214
- <value>normative</value>
215
- <value>informative</value>
216
- </choice>
217
- </attribute>
218
- </optional>
219
- <optional>
220
- <ref name="section-title"/>
221
- </optional>
222
- <zeroOrMore>
223
- <ref name="BasicBlock"/>
224
- </zeroOrMore>
225
- <zeroOrMore>
226
- <ref name="bibitem"/>
227
- <zeroOrMore>
228
- <ref name="note"/>
229
- </zeroOrMore>
230
- </zeroOrMore>
231
- <zeroOrMore>
232
- <ref name="references"/>
233
- </zeroOrMore>
234
- </element>
235
- </define>
236
- <define name="definitions">
237
- <element name="definitions">
238
- <optional>
239
- <attribute name="id">
240
- <data type="ID"/>
241
- </attribute>
242
- </optional>
243
- <optional>
244
- <attribute name="language"/>
245
- </optional>
246
- <optional>
247
- <attribute name="script"/>
248
- </optional>
249
- <optional>
250
- <attribute name="obligation">
251
- <choice>
252
- <value>normative</value>
253
- <value>informative</value>
254
- </choice>
255
- </attribute>
256
- </optional>
257
- <zeroOrMore>
258
- <ref name="BasicBlock"/>
259
- </zeroOrMore>
260
- <ref name="dl"/>
261
- </element>
262
- </define>
263
- <define name="terms">
264
- <element name="terms">
265
- <optional>
266
- <attribute name="id">
267
- <data type="ID"/>
268
- </attribute>
269
- </optional>
270
- <optional>
271
- <attribute name="language"/>
272
- </optional>
273
- <optional>
274
- <attribute name="script"/>
275
- </optional>
276
- <optional>
277
- <attribute name="obligation">
278
- <choice>
279
- <value>normative</value>
280
- <value>informative</value>
281
- </choice>
282
- </attribute>
283
- </optional>
284
- <optional>
285
- <ref name="section-title"/>
286
- </optional>
287
- <zeroOrMore>
288
- <ref name="BasicBlock"/>
289
- </zeroOrMore>
290
- <choice>
291
- <oneOrMore>
292
- <ref name="term"/>
293
- </oneOrMore>
294
- <group>
295
- <zeroOrMore>
296
- <ref name="terms"/>
297
- </zeroOrMore>
298
- <optional>
299
- <ref name="definitions"/>
300
- </optional>
301
- </group>
302
- </choice>
303
- </element>
304
- </define>
305
134
  <define name="term">
306
135
  <element name="term">
307
136
  <optional>
@@ -389,173 +218,14 @@
389
218
  </zeroOrMore>
390
219
  </element>
391
220
  </define>
392
- <define name="figure">
393
- <element name="figure">
394
- <attribute name="id">
395
- <data type="ID"/>
396
- </attribute>
397
- <optional>
398
- <ref name="tname"/>
399
- </optional>
400
- <choice>
401
- <ref name="image"/>
402
- <ref name="pre"/>
403
- <oneOrMore>
404
- <ref name="subfigure"/>
405
- </oneOrMore>
406
- </choice>
407
- <zeroOrMore>
408
- <ref name="fn"/>
409
- </zeroOrMore>
410
- <optional>
411
- <ref name="dl"/>
412
- </optional>
413
- <zeroOrMore>
414
- <ref name="note"/>
415
- </zeroOrMore>
416
- </element>
417
- </define>
418
- <define name="li">
419
- <element name="li">
420
- <group>
421
- <optional>
422
- <!-- ( paragraph-with-footnote | table | note | formula | admonition | ol | ul | dl | quote | sourcecode | review | example )+ -->
423
- <attribute name="id">
424
- <data type="ID"/>
425
- </attribute>
426
- </optional>
427
- <oneOrMore>
428
- <ref name="BasicBlock"/>
429
- </oneOrMore>
430
- </group>
431
- <!-- exclude figures? -->
432
- </element>
433
- </define>
434
- <define name="dd">
435
- <element name="dd">
436
- <zeroOrMore>
437
- <!--
438
- ( paragraph-with-footnote | table | note | formula | admonition | ol | ul | dl | quote | sourcecode | review | example )*
439
- exclude figures?
440
- -->
441
- <ref name="BasicBlock"/>
442
- </zeroOrMore>
443
- </element>
444
- </define>
445
- <define name="admonition">
446
- <element name="admonition">
447
- <attribute name="id">
448
- <data type="ID"/>
449
- </attribute>
450
- <attribute name="type">
451
- <choice>
452
- <value>danger</value>
453
- <value>caution</value>
454
- <value>warning</value>
455
- <value>important</value>
456
- <value>safety precautions</value>
457
- </choice>
458
- </attribute>
459
- <oneOrMore>
460
- <ref name="paragraph-with-footnote"/>
461
- </oneOrMore>
462
- <zeroOrMore>
463
- <ref name="note"/>
464
- </zeroOrMore>
465
- </element>
466
- </define>
467
- <define name="xref">
468
- <element name="xref">
469
- <attribute name="target">
470
- <data type="IDREF"/>
471
- </attribute>
472
- <text/>
473
- </element>
474
- </define>
475
- <define name="hyperlink">
476
- <element name="link">
477
- <attribute name="target">
478
- <data type="anyURI"/>
479
- </attribute>
480
- <text/>
481
- </element>
482
- </define>
483
- <define name="thead">
484
- <element name="thead">
485
- <oneOrMore>
486
- <ref name="tr"/>
487
- </oneOrMore>
488
- </element>
489
- </define>
490
- <define name="td">
491
- <element name="td">
492
- <optional>
493
- <attribute name="colspan"/>
494
- </optional>
495
- <optional>
496
- <attribute name="rowspan"/>
497
- </optional>
498
- <optional>
499
- <attribute name="align">
500
- <choice>
501
- <value>left</value>
502
- <value>right</value>
503
- <value>center</value>
504
- </choice>
505
- </attribute>
506
- </optional>
507
- <choice>
508
- <zeroOrMore>
509
- <choice>
510
- <ref name="TextElement"/>
511
- <ref name="fn"/>
512
- </choice>
513
- </zeroOrMore>
514
- <oneOrMore>
515
- <ref name="paragraph-with-footnote"/>
516
- </oneOrMore>
517
- </choice>
518
- </element>
519
- </define>
520
- <define name="th">
521
- <element name="th">
522
- <optional>
523
- <attribute name="colspan"/>
524
- </optional>
525
- <optional>
526
- <attribute name="rowspan"/>
527
- </optional>
528
- <optional>
529
- <attribute name="align">
530
- <choice>
531
- <value>left</value>
532
- <value>right</value>
533
- <value>center</value>
534
- </choice>
535
- </attribute>
536
- </optional>
537
- <choice>
538
- <zeroOrMore>
539
- <choice>
540
- <ref name="TextElement"/>
541
- <ref name="fn"/>
542
- </choice>
543
- </zeroOrMore>
544
- <oneOrMore>
545
- <ref name="paragraph-with-footnote"/>
546
- </oneOrMore>
547
- </choice>
548
- </element>
549
- </define>
550
- <define name="table-note">
551
- <element name="note">
552
- <optional>
553
- <attribute name="id">
554
- <data type="ID"/>
555
- </attribute>
556
- </optional>
557
- <ref name="paragraph"/>
558
- </element>
221
+ <define name="AdmonitionType">
222
+ <choice>
223
+ <value>danger</value>
224
+ <value>caution</value>
225
+ <value>warning</value>
226
+ <value>important</value>
227
+ <value>safety precautions</value>
228
+ </choice>
559
229
  </define>
560
230
  <define name="preface">
561
231
  <element name="preface">
@@ -601,6 +271,59 @@
601
271
  <ref name="Content-Section"/>
602
272
  </element>
603
273
  </define>
274
+ <define name="editorialgroup">
275
+ <element name="editorialgroup">
276
+ <oneOrMore>
277
+ <ref name="technical-committee"/>
278
+ </oneOrMore>
279
+ <zeroOrMore>
280
+ <ref name="subcommittee"/>
281
+ </zeroOrMore>
282
+ <zeroOrMore>
283
+ <ref name="workgroup"/>
284
+ </zeroOrMore>
285
+ <optional>
286
+ <ref name="secretariat"/>
287
+ </optional>
288
+ </element>
289
+ </define>
290
+ <define name="Content-Section">
291
+ <optional>
292
+ <attribute name="id">
293
+ <data type="ID"/>
294
+ </attribute>
295
+ </optional>
296
+ <optional>
297
+ <attribute name="language"/>
298
+ </optional>
299
+ <optional>
300
+ <attribute name="script"/>
301
+ </optional>
302
+ <optional>
303
+ <attribute name="obligation">
304
+ <choice>
305
+ <value>normative</value>
306
+ <value>informative</value>
307
+ </choice>
308
+ </attribute>
309
+ </optional>
310
+ <optional>
311
+ <ref name="section-title"/>
312
+ </optional>
313
+ <choice>
314
+ <group>
315
+ <zeroOrMore>
316
+ <ref name="BasicBlock"/>
317
+ </zeroOrMore>
318
+ <zeroOrMore>
319
+ <ref name="note"/>
320
+ </zeroOrMore>
321
+ </group>
322
+ <oneOrMore>
323
+ <ref name="content-subsection"/>
324
+ </oneOrMore>
325
+ </choice>
326
+ </define>
604
327
  </include>
605
328
  <!-- end overrides -->
606
329
  <!--
@@ -626,37 +349,6 @@
626
349
  <ref name="bibliography"/>
627
350
  </element>
628
351
  </define>
629
- <define name="bibliography">
630
- <element name="bibliography">
631
- <oneOrMore>
632
- <choice>
633
- <ref name="references"/>
634
- <ref name="reference-clause"/>
635
- </choice>
636
- </oneOrMore>
637
- </element>
638
- </define>
639
- <define name="editorialgroup">
640
- <element name="editorialgroup">
641
- <oneOrMore>
642
- <ref name="technical-committee"/>
643
- </oneOrMore>
644
- <zeroOrMore>
645
- <ref name="subcommittee"/>
646
- </zeroOrMore>
647
- <zeroOrMore>
648
- <ref name="workgroup"/>
649
- </zeroOrMore>
650
- <optional>
651
- <ref name="secretariat"/>
652
- </optional>
653
- </element>
654
- </define>
655
- <define name="preface_abstract">
656
- <element name="abstract">
657
- <ref name="Basic-Section"/>
658
- </element>
659
- </define>
660
352
  <define name="documentnumber">
661
353
  <element name="project-number">
662
354
  <optional>
@@ -677,11 +369,6 @@
677
369
  <data type="int"/>
678
370
  </element>
679
371
  </define>
680
- <define name="technical-committee">
681
- <element name="technical-committee">
682
- <ref name="IsoWorkgroup"/>
683
- </element>
684
- </define>
685
372
  <define name="subcommittee">
686
373
  <element name="subcommittee">
687
374
  <ref name="IsoWorkgroup"/>
@@ -692,17 +379,6 @@
692
379
  <ref name="IsoWorkgroup"/>
693
380
  </element>
694
381
  </define>
695
- <define name="IsoWorkgroup">
696
- <optional>
697
- <attribute name="number">
698
- <data type="int"/>
699
- </attribute>
700
- </optional>
701
- <optional>
702
- <attribute name="type"/>
703
- </optional>
704
- <text/>
705
- </define>
706
382
  <define name="secretariat">
707
383
  <element name="secretariat">
708
384
  <text/>
@@ -749,109 +425,6 @@
749
425
  </zeroOrMore>
750
426
  </element>
751
427
  </define>
752
- <define name="subfigure">
753
- <element name="figure">
754
- <attribute name="id">
755
- <data type="ID"/>
756
- </attribute>
757
- <optional>
758
- <ref name="tname"/>
759
- </optional>
760
- <ref name="image"/>
761
- </element>
762
- </define>
763
- <define name="termdocsource">
764
- <element name="termdocsource">
765
- <ref name="CitationType"/>
766
- </element>
767
- </define>
768
- <define name="ics">
769
- <element name="ics">
770
- <element name="code">
771
- <text/>
772
- </element>
773
- <element name="text">
774
- <text/>
775
- </element>
776
- </element>
777
- </define>
778
- <define name="term-clause">
779
- <element name="clause">
780
- <optional>
781
- <attribute name="id">
782
- <data type="ID"/>
783
- </attribute>
784
- </optional>
785
- <optional>
786
- <attribute name="language"/>
787
- </optional>
788
- <optional>
789
- <attribute name="script"/>
790
- </optional>
791
- <optional>
792
- <attribute name="inline-header">
793
- <data type="boolean"/>
794
- </attribute>
795
- </optional>
796
- <optional>
797
- <attribute name="obligation">
798
- <choice>
799
- <value>normative</value>
800
- <value>informative</value>
801
- </choice>
802
- </attribute>
803
- </optional>
804
- <optional>
805
- <ref name="section-title"/>
806
- </optional>
807
- <zeroOrMore>
808
- <choice>
809
- <ref name="term-clause"/>
810
- <ref name="terms"/>
811
- <ref name="definitions"/>
812
- </choice>
813
- </zeroOrMore>
814
- </element>
815
- </define>
816
- <define name="reference-clause">
817
- <element name="clause">
818
- <optional>
819
- <attribute name="id">
820
- <data type="ID"/>
821
- </attribute>
822
- </optional>
823
- <optional>
824
- <attribute name="language"/>
825
- </optional>
826
- <optional>
827
- <attribute name="script"/>
828
- </optional>
829
- <optional>
830
- <attribute name="inline-header">
831
- <data type="boolean"/>
832
- </attribute>
833
- </optional>
834
- <optional>
835
- <attribute name="obligation">
836
- <choice>
837
- <value>normative</value>
838
- <value>informative</value>
839
- </choice>
840
- </attribute>
841
- </optional>
842
- <optional>
843
- <ref name="section-title"/>
844
- </optional>
845
- <choice>
846
- <oneOrMore>
847
- <ref name="reference-clause"/>
848
- </oneOrMore>
849
- <zeroOrMore>
850
- <ref name="references"/>
851
- </zeroOrMore>
852
- </choice>
853
- </element>
854
- </define>
855
428
  <define name="annex-appendix">
856
429
  <element name="appendix">
857
430
  <ref name="Clause-Section"/>