metanorma-vsd 0.4.1 → 0.4.2

Sign up to get free protection for your applications and to get access to all the features.
@@ -4,33 +4,6 @@
4
4
  <start>
5
5
  <ref name="iso-standard"/>
6
6
  </start>
7
- <define name="language">
8
- <element name="language">
9
- <choice>
10
- <value>en</value>
11
- <value>fr</value>
12
- </choice>
13
- </element>
14
- </define>
15
- <define name="script">
16
- <element name="script">
17
- <value>Latn</value>
18
- </element>
19
- </define>
20
- <!-- add type to docidentifier in isodoc? -->
21
- <define name="docidentifier">
22
- <element name="docidentifier">
23
- <choice>
24
- <text/>
25
- <group>
26
- <ref name="documentnumber"/>
27
- <optional>
28
- <ref name="tc-documentnumber"/>
29
- </optional>
30
- </group>
31
- </choice>
32
- </element>
33
- </define>
34
7
  <define name="organization">
35
8
  <element name="organization">
36
9
  <ref name="orgname"/>
@@ -60,201 +33,44 @@
60
33
  </optional>
61
34
  </element>
62
35
  </define>
63
- <define name="BibliographicItem">
36
+ <define name="BibDataExtensionType">
64
37
  <optional>
65
- <attribute name="type">
66
- <ref name="BibItemType"/>
67
- </attribute>
38
+ <ref name="doctype"/>
68
39
  </optional>
69
- <choice>
70
- <oneOrMore>
71
- <ref name="btitle"/>
72
- </oneOrMore>
73
- <ref name="formattedref"/>
74
- </choice>
75
- <zeroOrMore>
76
- <ref name="bsource"/>
77
- </zeroOrMore>
78
- <zeroOrMore>
79
- <ref name="docidentifier"/>
80
- </zeroOrMore>
81
- <zeroOrMore>
82
- <ref name="bdate"/>
83
- </zeroOrMore>
84
- <zeroOrMore>
85
- <ref name="contributor"/>
86
- </zeroOrMore>
87
- <optional>
88
- <ref name="edition"/>
89
- </optional>
90
- <zeroOrMore>
91
- <ref name="biblionote"/>
92
- </zeroOrMore>
93
- <zeroOrMore>
94
- <ref name="language"/>
95
- </zeroOrMore>
96
- <zeroOrMore>
97
- <ref name="script"/>
98
- </zeroOrMore>
99
- <zeroOrMore>
100
- <ref name="abstract"/>
101
- </zeroOrMore>
102
- <optional>
103
- <ref name="status"/>
104
- </optional>
105
- <optional>
106
- <ref name="copyright"/>
107
- </optional>
108
- <zeroOrMore>
109
- <ref name="docrelation"/>
110
- </zeroOrMore>
111
- <optional>
112
- <ref name="editorialgroup"/>
113
- </optional>
114
- <zeroOrMore>
115
- <ref name="ics"/>
116
- </zeroOrMore>
117
- <optional>
118
- <ref name="allParts"/>
119
- </optional>
120
- </define>
121
- <define name="BibData">
122
- <optional>
123
- <attribute name="type">
124
- <ref name="BibItemType"/>
125
- </attribute>
126
- </optional>
127
- <oneOrMore>
128
- <ref name="btitle"/>
129
- </oneOrMore>
130
- <optional>
131
- <ref name="formattedref"/>
132
- </optional>
133
- <zeroOrMore>
134
- <ref name="bsource"/>
135
- </zeroOrMore>
136
- <zeroOrMore>
137
- <ref name="docidentifier"/>
138
- </zeroOrMore>
139
- <zeroOrMore>
140
- <ref name="bdate"/>
141
- </zeroOrMore>
142
- <zeroOrMore>
143
- <ref name="contributor"/>
144
- </zeroOrMore>
145
- <optional>
146
- <ref name="edition"/>
147
- </optional>
148
- <zeroOrMore>
149
- <ref name="biblionote"/>
150
- </zeroOrMore>
151
- <zeroOrMore>
152
- <ref name="language"/>
153
- </zeroOrMore>
154
- <zeroOrMore>
155
- <ref name="script"/>
156
- </zeroOrMore>
157
- <zeroOrMore>
158
- <ref name="abstract"/>
159
- </zeroOrMore>
160
- <optional>
161
- <ref name="status"/>
162
- </optional>
163
- <ref name="copyright"/>
164
- <zeroOrMore>
165
- <ref name="docrelation"/>
166
- </zeroOrMore>
167
40
  <ref name="editorialgroup"/>
168
41
  <zeroOrMore>
169
42
  <ref name="ics"/>
170
43
  </zeroOrMore>
171
- <optional>
172
- <ref name="allParts"/>
173
- </optional>
44
+ <ref name="structuredidentifier"/>
174
45
  </define>
175
46
  <define name="bdate">
176
47
  <element name="date">
177
48
  <attribute name="type">
178
49
  <choice>
179
- <value>published</value>
180
- <value>accessed</value>
181
- <value>created</value>
182
- <value>implemented</value>
183
- <value>obsoleted</value>
184
- <value>confirmed</value>
185
- <value>updated</value>
186
- <value>issued</value>
50
+ <ref name="BibliographicDateType"/>
51
+ <text/>
187
52
  </choice>
188
53
  </attribute>
189
- <!-- ( ( bfrom, bto? ) | date_on ) -->
190
54
  <choice>
191
55
  <group>
192
56
  <element name="from">
193
- <choice>
194
- <data type="gYear"/>
195
- <data type="date"/>
196
- </choice>
57
+ <ref name="ISO8601Date"/>
197
58
  </element>
198
59
  <optional>
199
60
  <element name="to">
200
- <choice>
201
- <data type="gYear"/>
202
- <data type="date"/>
203
- </choice>
61
+ <ref name="ISO8601Date"/>
204
62
  </element>
205
63
  </optional>
206
64
  </group>
207
65
  <element name="on">
208
66
  <choice>
209
- <data type="gYear"/>
210
- <data type="date"/>
67
+ <ref name="ISO8601Date"/>
211
68
  <value>--</value>
212
69
  </choice>
213
70
  </element>
214
71
  </choice>
215
72
  </element>
216
73
  </define>
217
- <define name="biblionote">
218
- <element name="note">
219
- <optional>
220
- <!-- Biblio date notes can be footnoted -->
221
- <attribute name="reference"/>
222
- </optional>
223
- <ref name="FormattedString"/>
224
- </element>
225
- </define>
226
- <define name="status">
227
- <element name="status">
228
- <choice>
229
- <ref name="FormattedString"/>
230
- <group>
231
- <ref name="stage"/>
232
- <optional>
233
- <ref name="substage"/>
234
- </optional>
235
- <optional>
236
- <ref name="iteration"/>
237
- </optional>
238
- </group>
239
- </choice>
240
- </element>
241
- </define>
242
- <define name="btitle">
243
- <element name="title">
244
- <choice>
245
- <ref name="FormattedString"/>
246
- <group>
247
- <optional>
248
- <ref name="title-intro"/>
249
- </optional>
250
- <ref name="title-main"/>
251
- <optional>
252
- <ref name="title-part"/>
253
- </optional>
254
- </group>
255
- </choice>
256
- </element>
257
- </define>
258
74
  <define name="sections">
259
75
  <element name="sections">
260
76
  <ref name="clause"/>
@@ -276,6 +92,12 @@
276
92
  <data type="ID"/>
277
93
  </attribute>
278
94
  </optional>
95
+ <optional>
96
+ <attribute name="language"/>
97
+ </optional>
98
+ <optional>
99
+ <attribute name="script"/>
100
+ </optional>
279
101
  <optional>
280
102
  <attribute name="obligation">
281
103
  <choice>
@@ -302,6 +124,12 @@
302
124
  <data type="ID"/>
303
125
  </attribute>
304
126
  </optional>
127
+ <optional>
128
+ <attribute name="language"/>
129
+ </optional>
130
+ <optional>
131
+ <attribute name="script"/>
132
+ </optional>
305
133
  <optional>
306
134
  <attribute name="obligation">
307
135
  <choice>
@@ -333,6 +161,12 @@
333
161
  <data type="ID"/>
334
162
  </attribute>
335
163
  </optional>
164
+ <optional>
165
+ <attribute name="language"/>
166
+ </optional>
167
+ <optional>
168
+ <attribute name="script"/>
169
+ </optional>
336
170
  <optional>
337
171
  <attribute name="inline-header">
338
172
  <data type="boolean"/>
@@ -396,6 +230,12 @@
396
230
  <data type="ID"/>
397
231
  </attribute>
398
232
  </optional>
233
+ <optional>
234
+ <attribute name="language"/>
235
+ </optional>
236
+ <optional>
237
+ <attribute name="script"/>
238
+ </optional>
399
239
  <optional>
400
240
  <attribute name="obligation">
401
241
  <choice>
@@ -414,6 +254,12 @@
414
254
  <data type="ID"/>
415
255
  </attribute>
416
256
  </optional>
257
+ <optional>
258
+ <attribute name="language"/>
259
+ </optional>
260
+ <optional>
261
+ <attribute name="script"/>
262
+ </optional>
417
263
  <optional>
418
264
  <attribute name="obligation">
419
265
  <choice>
@@ -487,6 +333,12 @@
487
333
  <data type="ID"/>
488
334
  </attribute>
489
335
  </optional>
336
+ <optional>
337
+ <attribute name="language"/>
338
+ </optional>
339
+ <optional>
340
+ <attribute name="script"/>
341
+ </optional>
490
342
  <optional>
491
343
  <attribute name="inline-header">
492
344
  <data type="boolean"/>
@@ -548,10 +400,17 @@
548
400
  </define>
549
401
  <define name="li">
550
402
  <element name="li">
551
- <oneOrMore>
552
- <!-- ( paragraph-with-footnote | table | note | formula | admonition | ol | ul | dl | quote | sourcecode | review | example )+ -->
553
- <ref name="BasicBlock"/>
554
- </oneOrMore>
403
+ <group>
404
+ <optional>
405
+ <!-- ( paragraph-with-footnote | table | note | formula | admonition | ol | ul | dl | quote | sourcecode | review | example )+ -->
406
+ <attribute name="id">
407
+ <data type="ID"/>
408
+ </attribute>
409
+ </optional>
410
+ <oneOrMore>
411
+ <ref name="BasicBlock"/>
412
+ </oneOrMore>
413
+ </group>
555
414
  <!-- exclude figures? -->
556
415
  </element>
557
416
  </define>
@@ -681,6 +540,50 @@
681
540
  <ref name="paragraph"/>
682
541
  </element>
683
542
  </define>
543
+ <define name="preface">
544
+ <element name="preface">
545
+ <optional>
546
+ <ref name="preface_abstract"/>
547
+ </optional>
548
+ <ref name="foreword"/>
549
+ <optional>
550
+ <ref name="introduction"/>
551
+ </optional>
552
+ </element>
553
+ </define>
554
+ <define name="DocumentType">
555
+ <choice>
556
+ <value>international-standard</value>
557
+ <value>technical-specification</value>
558
+ <value>technical-report</value>
559
+ <value>publicly-available-specification</value>
560
+ <value>international-workshop-agreement</value>
561
+ <value>guide</value>
562
+ </choice>
563
+ </define>
564
+ <define name="structuredidentifier">
565
+ <element name="structuredidentifier">
566
+ <optional>
567
+ <attribute name="type"/>
568
+ </optional>
569
+ <group>
570
+ <ref name="documentnumber"/>
571
+ <optional>
572
+ <ref name="tc-documentnumber"/>
573
+ </optional>
574
+ </group>
575
+ </element>
576
+ </define>
577
+ <define name="foreword">
578
+ <element name="foreword">
579
+ <ref name="Basic-Section"/>
580
+ </element>
581
+ </define>
582
+ <define name="introduction">
583
+ <element name="introduction">
584
+ <ref name="Content-Section"/>
585
+ </element>
586
+ </define>
684
587
  </include>
685
588
  <!-- end overrides -->
686
589
  <!--
@@ -690,12 +593,12 @@
690
593
  <define name="iso-standard">
691
594
  <element name="iso-standard">
692
595
  <ref name="bibdata"/>
693
- <optional>
694
- <ref name="version"/>
695
- </optional>
696
596
  <zeroOrMore>
697
597
  <ref name="termdocsource"/>
698
598
  </zeroOrMore>
599
+ <optional>
600
+ <ref name="boilerplate"/>
601
+ </optional>
699
602
  <ref name="preface"/>
700
603
  <oneOrMore>
701
604
  <ref name="sections"/>
@@ -706,14 +609,6 @@
706
609
  <ref name="bibliography"/>
707
610
  </element>
708
611
  </define>
709
- <define name="preface">
710
- <element name="preface">
711
- <ref name="foreword"/>
712
- <optional>
713
- <ref name="introduction"/>
714
- </optional>
715
- </element>
716
- </define>
717
612
  <define name="bibliography">
718
613
  <element name="bibliography">
719
614
  <oneOrMore>
@@ -724,74 +619,27 @@
724
619
  </oneOrMore>
725
620
  </element>
726
621
  </define>
727
- <define name="BibItemType" combine="choice">
728
- <choice>
729
- <value>international-standard</value>
730
- <value>technical-specification</value>
731
- <value>technical-report</value>
732
- <value>publicly-available-specification</value>
733
- <value>international-workshop-agreement</value>
734
- <value>guide</value>
735
- </choice>
736
- </define>
737
622
  <define name="editorialgroup">
738
623
  <element name="editorialgroup">
739
- <ref name="technical-committee"/>
740
- <optional>
624
+ <oneOrMore>
625
+ <ref name="technical-committee"/>
626
+ </oneOrMore>
627
+ <zeroOrMore>
741
628
  <ref name="subcommittee"/>
742
- </optional>
743
- <optional>
629
+ </zeroOrMore>
630
+ <zeroOrMore>
744
631
  <ref name="workgroup"/>
745
- </optional>
632
+ </zeroOrMore>
746
633
  <optional>
747
634
  <ref name="secretariat"/>
748
635
  </optional>
749
636
  </element>
750
637
  </define>
751
- <define name="foreword">
752
- <element name="foreword">
638
+ <define name="preface_abstract">
639
+ <element name="abstract">
753
640
  <ref name="Basic-Section"/>
754
641
  </element>
755
642
  </define>
756
- <define name="introduction">
757
- <element name="introduction">
758
- <ref name="Content-Section"/>
759
- </element>
760
- </define>
761
- <define name="stage">
762
- <element name="stage">
763
- <choice>
764
- <value>00</value>
765
- <value>10</value>
766
- <value>20</value>
767
- <value>30</value>
768
- <value>40</value>
769
- <value>50</value>
770
- <value>60</value>
771
- <value>90</value>
772
- <value>95</value>
773
- </choice>
774
- </element>
775
- </define>
776
- <define name="substage">
777
- <element name="substage">
778
- <choice>
779
- <value>00</value>
780
- <value>20</value>
781
- <value>60</value>
782
- <value>90</value>
783
- <value>92</value>
784
- <value>93</value>
785
- <value>98</value>
786
- <value>99</value>
787
- </choice>
788
- </element>
789
- </define>
790
- <define name="iteration">
791
- <element name="iteration">
792
- <data type="int"/>
793
- </element>
794
- </define>
795
643
  <define name="documentnumber">
796
644
  <element name="project-number">
797
645
  <optional>
@@ -843,26 +691,6 @@
843
691
  <text/>
844
692
  </element>
845
693
  </define>
846
- <define name="title-intro">
847
- <element name="title-intro">
848
- <ref name="FormattedString"/>
849
- </element>
850
- </define>
851
- <define name="title-main">
852
- <element name="title-main">
853
- <ref name="FormattedString"/>
854
- </element>
855
- </define>
856
- <define name="title-part">
857
- <element name="title-part">
858
- <ref name="FormattedString"/>
859
- </element>
860
- </define>
861
- <define name="allParts">
862
- <element name="allParts">
863
- <data type="boolean"/>
864
- </element>
865
- </define>
866
694
  <define name="clause-hanging-paragraph-with-footnote">
867
695
  <element name="clause">
868
696
  <optional>
@@ -870,6 +698,12 @@
870
698
  <data type="ID"/>
871
699
  </attribute>
872
700
  </optional>
701
+ <optional>
702
+ <attribute name="language"/>
703
+ </optional>
704
+ <optional>
705
+ <attribute name="script"/>
706
+ </optional>
873
707
  <optional>
874
708
  <attribute name="inline-header">
875
709
  <data type="boolean"/>
@@ -931,6 +765,12 @@
931
765
  <data type="ID"/>
932
766
  </attribute>
933
767
  </optional>
768
+ <optional>
769
+ <attribute name="language"/>
770
+ </optional>
771
+ <optional>
772
+ <attribute name="script"/>
773
+ </optional>
934
774
  <optional>
935
775
  <attribute name="inline-header">
936
776
  <data type="boolean"/>
@@ -947,17 +787,13 @@
947
787
  <optional>
948
788
  <ref name="section-title"/>
949
789
  </optional>
950
- <choice>
951
- <oneOrMore>
790
+ <zeroOrMore>
791
+ <choice>
952
792
  <ref name="term-clause"/>
953
- </oneOrMore>
954
- <zeroOrMore>
955
- <choice>
956
- <ref name="terms"/>
957
- <ref name="definitions"/>
958
- </choice>
959
- </zeroOrMore>
960
- </choice>
793
+ <ref name="terms"/>
794
+ <ref name="definitions"/>
795
+ </choice>
796
+ </zeroOrMore>
961
797
  </element>
962
798
  </define>
963
799
  <define name="reference-clause">
@@ -967,6 +803,12 @@
967
803
  <data type="ID"/>
968
804
  </attribute>
969
805
  </optional>
806
+ <optional>
807
+ <attribute name="language"/>
808
+ </optional>
809
+ <optional>
810
+ <attribute name="script"/>
811
+ </optional>
970
812
  <optional>
971
813
  <attribute name="inline-header">
972
814
  <data type="boolean"/>