metanorma-csa 1.4.0 → 1.4.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/workflows/macos.yml +5 -1
- data/.github/workflows/ubuntu.yml +5 -1
- data/.github/workflows/windows.yml +5 -1
- data/lib/asciidoctor/csa/basicdoc.rng +20 -6
- data/lib/asciidoctor/csa/csa.rng +4 -4
- data/lib/asciidoctor/csa/isodoc.rng +532 -18
- data/lib/asciidoctor/csa/reqt.rng +2 -2
- data/lib/metanorma/csa/version.rb +1 -1
- metadata +2 -3
- data/lib/asciidoctor/csa/isostandard.rng +0 -860
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 90ace3ef3a5619fd56d0e0bb08c4e7e3cb0e0151822c8f2ccf8478f0b14ac3da
|
|
4
|
+
data.tar.gz: dbea8ba7d8df8b46f8b31a37eabc7399d0d02db6fa6e762ca2cb5104c29efcf8
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: cb81e420fdad3e01b87121e226f3c9fa018629f646bd5da4a4d5c31eb18e82d170c295dc201a68e3e4d10d481133befa74e69a492f6d3e41f5f7a83232e17526
|
|
7
|
+
data.tar.gz: 4e6aa3b8e7053bf1a0881ddea6675141c60032549453749ce9dc2f2c3e313613737095efa42ee4a561bde14562b09f37145366010d07578e61aa2ee191786850
|
data/.github/workflows/macos.yml
CHANGED
|
@@ -55,9 +55,6 @@
|
|
|
55
55
|
<zeroOrMore>
|
|
56
56
|
<ref name="BasicBlock"/>
|
|
57
57
|
</zeroOrMore>
|
|
58
|
-
<zeroOrMore>
|
|
59
|
-
<ref name="note"/>
|
|
60
|
-
</zeroOrMore>
|
|
61
58
|
</define>
|
|
62
59
|
<define name="references">
|
|
63
60
|
<element name="references">
|
|
@@ -99,6 +96,10 @@
|
|
|
99
96
|
<ref name="example"/>
|
|
100
97
|
<ref name="review"/>
|
|
101
98
|
<ref name="pre"/>
|
|
99
|
+
<ref name="note"/>
|
|
100
|
+
<ref name="pagebreak"/>
|
|
101
|
+
<ref name="hr"/>
|
|
102
|
+
<ref name="bookmark"/>
|
|
102
103
|
</choice>
|
|
103
104
|
</define>
|
|
104
105
|
<define name="paragraph">
|
|
@@ -341,7 +342,14 @@
|
|
|
341
342
|
<define name="tname">
|
|
342
343
|
<element name="name">
|
|
343
344
|
<oneOrMore>
|
|
344
|
-
<
|
|
345
|
+
<choice>
|
|
346
|
+
<ref name="PureTextElement"/>
|
|
347
|
+
<ref name="eref"/>
|
|
348
|
+
<ref name="stem"/>
|
|
349
|
+
<ref name="keyword"/>
|
|
350
|
+
<ref name="xref"/>
|
|
351
|
+
<ref name="hyperlink"/>
|
|
352
|
+
</choice>
|
|
345
353
|
</oneOrMore>
|
|
346
354
|
</element>
|
|
347
355
|
</define>
|
|
@@ -592,14 +600,20 @@
|
|
|
592
600
|
<define name="em">
|
|
593
601
|
<element name="em">
|
|
594
602
|
<zeroOrMore>
|
|
595
|
-
<
|
|
603
|
+
<choice>
|
|
604
|
+
<ref name="PureTextElement"/>
|
|
605
|
+
<ref name="stem"/>
|
|
606
|
+
</choice>
|
|
596
607
|
</zeroOrMore>
|
|
597
608
|
</element>
|
|
598
609
|
</define>
|
|
599
610
|
<define name="strong">
|
|
600
611
|
<element name="strong">
|
|
601
612
|
<zeroOrMore>
|
|
602
|
-
<
|
|
613
|
+
<choice>
|
|
614
|
+
<ref name="PureTextElement"/>
|
|
615
|
+
<ref name="stem"/>
|
|
616
|
+
</choice>
|
|
603
617
|
</zeroOrMore>
|
|
604
618
|
</element>
|
|
605
619
|
</define>
|
data/lib/asciidoctor/csa/csa.rng
CHANGED
|
@@ -5,9 +5,9 @@
|
|
|
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 csand additions. And we do not want that.
|
|
7
7
|
-->
|
|
8
|
-
<include href="
|
|
8
|
+
<include href="isodoc.rng">
|
|
9
9
|
<start>
|
|
10
|
-
<ref name="
|
|
10
|
+
<ref name="csand-standard"/>
|
|
11
11
|
</start>
|
|
12
12
|
<define name="figure">
|
|
13
13
|
<element name="figure">
|
|
@@ -79,8 +79,8 @@
|
|
|
79
79
|
</element>
|
|
80
80
|
</define>
|
|
81
81
|
</include>
|
|
82
|
-
<define name="
|
|
83
|
-
<element name="
|
|
82
|
+
<define name="csand-standard">
|
|
83
|
+
<element name="csand-standard">
|
|
84
84
|
<ref name="bibdata"/>
|
|
85
85
|
<zeroOrMore>
|
|
86
86
|
<ref name="termdocsource"/>
|
|
@@ -24,8 +24,79 @@
|
|
|
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>
|
|
@@ -39,6 +110,7 @@
|
|
|
39
110
|
<choice>
|
|
40
111
|
<ref name="clause"/>
|
|
41
112
|
<ref name="terms"/>
|
|
113
|
+
<ref name="term-clause"/>
|
|
42
114
|
<ref name="definitions"/>
|
|
43
115
|
</choice>
|
|
44
116
|
</oneOrMore>
|
|
@@ -51,21 +123,285 @@
|
|
|
51
123
|
<data type="ID"/>
|
|
52
124
|
</attribute>
|
|
53
125
|
</optional>
|
|
126
|
+
<optional>
|
|
127
|
+
<attribute name="obligation">
|
|
128
|
+
<choice>
|
|
129
|
+
<value>normative</value>
|
|
130
|
+
<value>informative</value>
|
|
131
|
+
</choice>
|
|
132
|
+
</attribute>
|
|
133
|
+
</optional>
|
|
54
134
|
<optional>
|
|
55
135
|
<ref name="section-title"/>
|
|
56
136
|
</optional>
|
|
57
137
|
<zeroOrMore>
|
|
58
138
|
<ref name="BasicBlock"/>
|
|
59
139
|
</zeroOrMore>
|
|
140
|
+
<zeroOrMore>
|
|
141
|
+
<ref name="note"/>
|
|
142
|
+
</zeroOrMore>
|
|
60
143
|
<zeroOrMore>
|
|
61
144
|
<ref name="bibitem"/>
|
|
62
145
|
<zeroOrMore>
|
|
63
146
|
<ref name="note"/>
|
|
64
147
|
</zeroOrMore>
|
|
65
148
|
</zeroOrMore>
|
|
149
|
+
<zeroOrMore>
|
|
150
|
+
<ref name="references"/>
|
|
151
|
+
</zeroOrMore>
|
|
152
|
+
</element>
|
|
153
|
+
</define>
|
|
154
|
+
<define name="note">
|
|
155
|
+
<element name="note">
|
|
156
|
+
<attribute name="id">
|
|
157
|
+
<data type="ID"/>
|
|
158
|
+
</attribute>
|
|
159
|
+
<oneOrMore>
|
|
160
|
+
<choice>
|
|
161
|
+
<ref name="paragraph"/>
|
|
162
|
+
<ref name="ul"/>
|
|
163
|
+
<ref name="ol"/>
|
|
164
|
+
<ref name="dl"/>
|
|
165
|
+
<ref name="formula"/>
|
|
166
|
+
</choice>
|
|
167
|
+
</oneOrMore>
|
|
168
|
+
</element>
|
|
169
|
+
</define>
|
|
170
|
+
<define name="Basic-Section">
|
|
171
|
+
<optional>
|
|
172
|
+
<attribute name="id">
|
|
173
|
+
<data type="ID"/>
|
|
174
|
+
</attribute>
|
|
175
|
+
</optional>
|
|
176
|
+
<optional>
|
|
177
|
+
<attribute name="language"/>
|
|
178
|
+
</optional>
|
|
179
|
+
<optional>
|
|
180
|
+
<attribute name="script"/>
|
|
181
|
+
</optional>
|
|
182
|
+
<optional>
|
|
183
|
+
<attribute name="obligation">
|
|
184
|
+
<choice>
|
|
185
|
+
<value>normative</value>
|
|
186
|
+
<value>informative</value>
|
|
187
|
+
</choice>
|
|
188
|
+
</attribute>
|
|
189
|
+
</optional>
|
|
190
|
+
<optional>
|
|
191
|
+
<ref name="section-title"/>
|
|
192
|
+
</optional>
|
|
193
|
+
<group>
|
|
194
|
+
<oneOrMore>
|
|
195
|
+
<ref name="BasicBlock"/>
|
|
196
|
+
</oneOrMore>
|
|
197
|
+
<zeroOrMore>
|
|
198
|
+
<ref name="note"/>
|
|
199
|
+
</zeroOrMore>
|
|
200
|
+
</group>
|
|
201
|
+
</define>
|
|
202
|
+
<define name="li">
|
|
203
|
+
<element name="li">
|
|
204
|
+
<group>
|
|
205
|
+
<optional>
|
|
206
|
+
<attribute name="id">
|
|
207
|
+
<data type="ID"/>
|
|
208
|
+
</attribute>
|
|
209
|
+
</optional>
|
|
210
|
+
<oneOrMore>
|
|
211
|
+
<ref name="BasicBlock"/>
|
|
212
|
+
</oneOrMore>
|
|
213
|
+
</group>
|
|
214
|
+
<!-- exclude figures? -->
|
|
215
|
+
</element>
|
|
216
|
+
</define>
|
|
217
|
+
<define name="dd">
|
|
218
|
+
<element name="dd">
|
|
219
|
+
<zeroOrMore>
|
|
220
|
+
<!-- exclude figures? -->
|
|
221
|
+
<ref name="BasicBlock"/>
|
|
222
|
+
</zeroOrMore>
|
|
223
|
+
</element>
|
|
224
|
+
</define>
|
|
225
|
+
<define name="thead">
|
|
226
|
+
<element name="thead">
|
|
227
|
+
<oneOrMore>
|
|
228
|
+
<ref name="tr"/>
|
|
229
|
+
</oneOrMore>
|
|
230
|
+
</element>
|
|
231
|
+
</define>
|
|
232
|
+
<define name="td">
|
|
233
|
+
<element name="td">
|
|
234
|
+
<optional>
|
|
235
|
+
<attribute name="colspan"/>
|
|
236
|
+
</optional>
|
|
237
|
+
<optional>
|
|
238
|
+
<attribute name="rowspan"/>
|
|
239
|
+
</optional>
|
|
240
|
+
<optional>
|
|
241
|
+
<attribute name="align">
|
|
242
|
+
<choice>
|
|
243
|
+
<value>left</value>
|
|
244
|
+
<value>right</value>
|
|
245
|
+
<value>center</value>
|
|
246
|
+
</choice>
|
|
247
|
+
</attribute>
|
|
248
|
+
</optional>
|
|
249
|
+
<choice>
|
|
250
|
+
<zeroOrMore>
|
|
251
|
+
<choice>
|
|
252
|
+
<ref name="TextElement"/>
|
|
253
|
+
<ref name="fn"/>
|
|
254
|
+
</choice>
|
|
255
|
+
</zeroOrMore>
|
|
256
|
+
<oneOrMore>
|
|
257
|
+
<choice>
|
|
258
|
+
<ref name="paragraph-with-footnote"/>
|
|
259
|
+
<ref name="dl"/>
|
|
260
|
+
<ref name="ul"/>
|
|
261
|
+
<ref name="ol"/>
|
|
262
|
+
<ref name="figure"/>
|
|
263
|
+
</choice>
|
|
264
|
+
</oneOrMore>
|
|
265
|
+
</choice>
|
|
266
|
+
</element>
|
|
267
|
+
</define>
|
|
268
|
+
<define name="th">
|
|
269
|
+
<element name="th">
|
|
270
|
+
<optional>
|
|
271
|
+
<attribute name="colspan"/>
|
|
272
|
+
</optional>
|
|
273
|
+
<optional>
|
|
274
|
+
<attribute name="rowspan"/>
|
|
275
|
+
</optional>
|
|
276
|
+
<optional>
|
|
277
|
+
<attribute name="align">
|
|
278
|
+
<choice>
|
|
279
|
+
<value>left</value>
|
|
280
|
+
<value>right</value>
|
|
281
|
+
<value>center</value>
|
|
282
|
+
</choice>
|
|
283
|
+
</attribute>
|
|
284
|
+
</optional>
|
|
285
|
+
<choice>
|
|
286
|
+
<zeroOrMore>
|
|
287
|
+
<choice>
|
|
288
|
+
<ref name="TextElement"/>
|
|
289
|
+
<ref name="fn"/>
|
|
290
|
+
</choice>
|
|
291
|
+
</zeroOrMore>
|
|
292
|
+
<oneOrMore>
|
|
293
|
+
<ref name="paragraph-with-footnote"/>
|
|
294
|
+
</oneOrMore>
|
|
295
|
+
</choice>
|
|
296
|
+
</element>
|
|
297
|
+
</define>
|
|
298
|
+
<define name="table-note">
|
|
299
|
+
<element name="note">
|
|
300
|
+
<optional>
|
|
301
|
+
<attribute name="id">
|
|
302
|
+
<data type="ID"/>
|
|
303
|
+
</attribute>
|
|
304
|
+
</optional>
|
|
305
|
+
<ref name="paragraph"/>
|
|
66
306
|
</element>
|
|
67
307
|
</define>
|
|
68
308
|
</include>
|
|
309
|
+
<!-- end overrides -->
|
|
310
|
+
<define name="BasicBlock" combine="choice">
|
|
311
|
+
<choice>
|
|
312
|
+
<ref name="requirement"/>
|
|
313
|
+
<ref name="recommendation"/>
|
|
314
|
+
<ref name="permission"/>
|
|
315
|
+
</choice>
|
|
316
|
+
</define>
|
|
317
|
+
<define name="bibliography">
|
|
318
|
+
<element name="bibliography">
|
|
319
|
+
<oneOrMore>
|
|
320
|
+
<choice>
|
|
321
|
+
<ref name="references"/>
|
|
322
|
+
<ref name="reference-clause"/>
|
|
323
|
+
</choice>
|
|
324
|
+
</oneOrMore>
|
|
325
|
+
</element>
|
|
326
|
+
</define>
|
|
327
|
+
<define name="reference-clause">
|
|
328
|
+
<element name="clause">
|
|
329
|
+
<optional>
|
|
330
|
+
<attribute name="id">
|
|
331
|
+
<data type="ID"/>
|
|
332
|
+
</attribute>
|
|
333
|
+
</optional>
|
|
334
|
+
<optional>
|
|
335
|
+
<attribute name="language"/>
|
|
336
|
+
</optional>
|
|
337
|
+
<optional>
|
|
338
|
+
<attribute name="script"/>
|
|
339
|
+
</optional>
|
|
340
|
+
<optional>
|
|
341
|
+
<attribute name="inline-header">
|
|
342
|
+
<data type="boolean"/>
|
|
343
|
+
</attribute>
|
|
344
|
+
</optional>
|
|
345
|
+
<optional>
|
|
346
|
+
<attribute name="obligation">
|
|
347
|
+
<choice>
|
|
348
|
+
<value>normative</value>
|
|
349
|
+
<value>informative</value>
|
|
350
|
+
</choice>
|
|
351
|
+
</attribute>
|
|
352
|
+
</optional>
|
|
353
|
+
<optional>
|
|
354
|
+
<ref name="section-title"/>
|
|
355
|
+
</optional>
|
|
356
|
+
<zeroOrMore>
|
|
357
|
+
<ref name="BasicBlock"/>
|
|
358
|
+
</zeroOrMore>
|
|
359
|
+
<zeroOrMore>
|
|
360
|
+
<ref name="note"/>
|
|
361
|
+
</zeroOrMore>
|
|
362
|
+
<choice>
|
|
363
|
+
<oneOrMore>
|
|
364
|
+
<ref name="reference-clause"/>
|
|
365
|
+
</oneOrMore>
|
|
366
|
+
<zeroOrMore>
|
|
367
|
+
<ref name="references"/>
|
|
368
|
+
</zeroOrMore>
|
|
369
|
+
</choice>
|
|
370
|
+
</element>
|
|
371
|
+
</define>
|
|
372
|
+
<define name="editorialgroup">
|
|
373
|
+
<element name="editorialgroup">
|
|
374
|
+
<oneOrMore>
|
|
375
|
+
<ref name="technical-committee"/>
|
|
376
|
+
</oneOrMore>
|
|
377
|
+
</element>
|
|
378
|
+
</define>
|
|
379
|
+
<define name="technical-committee">
|
|
380
|
+
<element name="technical-committee">
|
|
381
|
+
<ref name="IsoWorkgroup"/>
|
|
382
|
+
</element>
|
|
383
|
+
</define>
|
|
384
|
+
<define name="IsoWorkgroup">
|
|
385
|
+
<optional>
|
|
386
|
+
<attribute name="number">
|
|
387
|
+
<data type="int"/>
|
|
388
|
+
</attribute>
|
|
389
|
+
</optional>
|
|
390
|
+
<optional>
|
|
391
|
+
<attribute name="type"/>
|
|
392
|
+
</optional>
|
|
393
|
+
<text/>
|
|
394
|
+
</define>
|
|
395
|
+
<define name="ics">
|
|
396
|
+
<element name="ics">
|
|
397
|
+
<element name="code">
|
|
398
|
+
<text/>
|
|
399
|
+
</element>
|
|
400
|
+
<element name="text">
|
|
401
|
+
<text/>
|
|
402
|
+
</element>
|
|
403
|
+
</element>
|
|
404
|
+
</define>
|
|
69
405
|
<define name="standard-document">
|
|
70
406
|
<element name="standard-document">
|
|
71
407
|
<ref name="bibdata"/>
|
|
@@ -89,7 +425,7 @@
|
|
|
89
425
|
<oneOrMore>
|
|
90
426
|
<choice>
|
|
91
427
|
<ref name="content"/>
|
|
92
|
-
<ref name="
|
|
428
|
+
<ref name="preface_abstract"/>
|
|
93
429
|
<ref name="foreword"/>
|
|
94
430
|
<ref name="introduction"/>
|
|
95
431
|
<ref name="acknowledgements"/>
|
|
@@ -156,6 +492,14 @@
|
|
|
156
492
|
<optional>
|
|
157
493
|
<attribute name="script"/>
|
|
158
494
|
</optional>
|
|
495
|
+
<optional>
|
|
496
|
+
<attribute name="obligation">
|
|
497
|
+
<choice>
|
|
498
|
+
<value>normative</value>
|
|
499
|
+
<value>informative</value>
|
|
500
|
+
</choice>
|
|
501
|
+
</attribute>
|
|
502
|
+
</optional>
|
|
159
503
|
<optional>
|
|
160
504
|
<ref name="section-title"/>
|
|
161
505
|
</optional>
|
|
@@ -163,6 +507,9 @@
|
|
|
163
507
|
<zeroOrMore>
|
|
164
508
|
<ref name="BasicBlock"/>
|
|
165
509
|
</zeroOrMore>
|
|
510
|
+
<zeroOrMore>
|
|
511
|
+
<ref name="note"/>
|
|
512
|
+
</zeroOrMore>
|
|
166
513
|
<ref name="dl"/>
|
|
167
514
|
</oneOrMore>
|
|
168
515
|
</element>
|
|
@@ -202,10 +549,23 @@
|
|
|
202
549
|
<optional>
|
|
203
550
|
<attribute name="script"/>
|
|
204
551
|
</optional>
|
|
552
|
+
<optional>
|
|
553
|
+
<attribute name="inline-header">
|
|
554
|
+
<data type="boolean"/>
|
|
555
|
+
</attribute>
|
|
556
|
+
</optional>
|
|
557
|
+
<optional>
|
|
558
|
+
<attribute name="obligation">
|
|
559
|
+
<choice>
|
|
560
|
+
<value>normative</value>
|
|
561
|
+
<value>informative</value>
|
|
562
|
+
</choice>
|
|
563
|
+
</attribute>
|
|
564
|
+
</optional>
|
|
205
565
|
<optional>
|
|
206
566
|
<ref name="section-title"/>
|
|
207
567
|
</optional>
|
|
208
|
-
<
|
|
568
|
+
<group>
|
|
209
569
|
<group>
|
|
210
570
|
<zeroOrMore>
|
|
211
571
|
<ref name="BasicBlock"/>
|
|
@@ -214,10 +574,10 @@
|
|
|
214
574
|
<ref name="note"/>
|
|
215
575
|
</zeroOrMore>
|
|
216
576
|
</group>
|
|
217
|
-
<
|
|
577
|
+
<zeroOrMore>
|
|
218
578
|
<ref name="content-subsection"/>
|
|
219
|
-
</
|
|
220
|
-
</
|
|
579
|
+
</zeroOrMore>
|
|
580
|
+
</group>
|
|
221
581
|
</define>
|
|
222
582
|
<define name="clause">
|
|
223
583
|
<element name="clause">
|
|
@@ -239,10 +599,23 @@
|
|
|
239
599
|
<optional>
|
|
240
600
|
<attribute name="script"/>
|
|
241
601
|
</optional>
|
|
602
|
+
<optional>
|
|
603
|
+
<attribute name="inline-header">
|
|
604
|
+
<data type="boolean"/>
|
|
605
|
+
</attribute>
|
|
606
|
+
</optional>
|
|
607
|
+
<optional>
|
|
608
|
+
<attribute name="obligation">
|
|
609
|
+
<choice>
|
|
610
|
+
<value>normative</value>
|
|
611
|
+
<value>informative</value>
|
|
612
|
+
</choice>
|
|
613
|
+
</attribute>
|
|
614
|
+
</optional>
|
|
242
615
|
<optional>
|
|
243
616
|
<ref name="section-title"/>
|
|
244
617
|
</optional>
|
|
245
|
-
<
|
|
618
|
+
<group>
|
|
246
619
|
<group>
|
|
247
620
|
<zeroOrMore>
|
|
248
621
|
<ref name="BasicBlock"/>
|
|
@@ -251,20 +624,67 @@
|
|
|
251
624
|
<ref name="note"/>
|
|
252
625
|
</zeroOrMore>
|
|
253
626
|
</group>
|
|
254
|
-
<
|
|
627
|
+
<zeroOrMore>
|
|
255
628
|
<choice>
|
|
256
629
|
<ref name="clause-subsection"/>
|
|
257
630
|
<ref name="terms"/>
|
|
258
631
|
<ref name="definitions"/>
|
|
259
632
|
</choice>
|
|
260
|
-
</
|
|
261
|
-
</
|
|
633
|
+
</zeroOrMore>
|
|
634
|
+
</group>
|
|
635
|
+
</define>
|
|
636
|
+
<define name="Annex-Section">
|
|
637
|
+
<optional>
|
|
638
|
+
<attribute name="id">
|
|
639
|
+
<data type="ID"/>
|
|
640
|
+
</attribute>
|
|
641
|
+
</optional>
|
|
642
|
+
<optional>
|
|
643
|
+
<attribute name="language"/>
|
|
644
|
+
</optional>
|
|
645
|
+
<optional>
|
|
646
|
+
<attribute name="script"/>
|
|
647
|
+
</optional>
|
|
648
|
+
<optional>
|
|
649
|
+
<attribute name="obligation">
|
|
650
|
+
<choice>
|
|
651
|
+
<value>normative</value>
|
|
652
|
+
<value>informative</value>
|
|
653
|
+
</choice>
|
|
654
|
+
</attribute>
|
|
655
|
+
</optional>
|
|
656
|
+
<optional>
|
|
657
|
+
<ref name="section-title"/>
|
|
658
|
+
</optional>
|
|
659
|
+
<group>
|
|
660
|
+
<group>
|
|
661
|
+
<zeroOrMore>
|
|
662
|
+
<ref name="BasicBlock"/>
|
|
663
|
+
</zeroOrMore>
|
|
664
|
+
<zeroOrMore>
|
|
665
|
+
<ref name="note"/>
|
|
666
|
+
</zeroOrMore>
|
|
667
|
+
</group>
|
|
668
|
+
<zeroOrMore>
|
|
669
|
+
<choice>
|
|
670
|
+
<ref name="annex-subsection"/>
|
|
671
|
+
<ref name="terms"/>
|
|
672
|
+
<ref name="definitions"/>
|
|
673
|
+
<ref name="references"/>
|
|
674
|
+
</choice>
|
|
675
|
+
</zeroOrMore>
|
|
676
|
+
</group>
|
|
262
677
|
</define>
|
|
263
678
|
<define name="clause-subsection">
|
|
264
679
|
<element name="clause">
|
|
265
680
|
<ref name="Clause-Section"/>
|
|
266
681
|
</element>
|
|
267
682
|
</define>
|
|
683
|
+
<define name="annex-subsection">
|
|
684
|
+
<element name="clause">
|
|
685
|
+
<ref name="Annex-Section"/>
|
|
686
|
+
</element>
|
|
687
|
+
</define>
|
|
268
688
|
<define name="annex">
|
|
269
689
|
<element name="annex">
|
|
270
690
|
<optional>
|
|
@@ -278,6 +698,11 @@
|
|
|
278
698
|
<optional>
|
|
279
699
|
<attribute name="script"/>
|
|
280
700
|
</optional>
|
|
701
|
+
<optional>
|
|
702
|
+
<attribute name="inline-header">
|
|
703
|
+
<data type="boolean"/>
|
|
704
|
+
</attribute>
|
|
705
|
+
</optional>
|
|
281
706
|
<attribute name="obligation">
|
|
282
707
|
<choice>
|
|
283
708
|
<value>normative</value>
|
|
@@ -287,7 +712,7 @@
|
|
|
287
712
|
<optional>
|
|
288
713
|
<ref name="section-title"/>
|
|
289
714
|
</optional>
|
|
290
|
-
<
|
|
715
|
+
<group>
|
|
291
716
|
<group>
|
|
292
717
|
<zeroOrMore>
|
|
293
718
|
<ref name="BasicBlock"/>
|
|
@@ -296,10 +721,15 @@
|
|
|
296
721
|
<ref name="note"/>
|
|
297
722
|
</zeroOrMore>
|
|
298
723
|
</group>
|
|
299
|
-
<
|
|
300
|
-
<
|
|
301
|
-
|
|
302
|
-
|
|
724
|
+
<zeroOrMore>
|
|
725
|
+
<choice>
|
|
726
|
+
<ref name="annex-subsection"/>
|
|
727
|
+
<ref name="terms"/>
|
|
728
|
+
<ref name="definitions"/>
|
|
729
|
+
<ref name="references"/>
|
|
730
|
+
</choice>
|
|
731
|
+
</zeroOrMore>
|
|
732
|
+
</group>
|
|
303
733
|
</element>
|
|
304
734
|
</define>
|
|
305
735
|
<define name="terms">
|
|
@@ -315,12 +745,36 @@
|
|
|
315
745
|
<optional>
|
|
316
746
|
<attribute name="script"/>
|
|
317
747
|
</optional>
|
|
748
|
+
<optional>
|
|
749
|
+
<attribute name="obligation">
|
|
750
|
+
<choice>
|
|
751
|
+
<value>normative</value>
|
|
752
|
+
<value>informative</value>
|
|
753
|
+
</choice>
|
|
754
|
+
</attribute>
|
|
755
|
+
</optional>
|
|
756
|
+
<optional>
|
|
757
|
+
<ref name="section-title"/>
|
|
758
|
+
</optional>
|
|
318
759
|
<zeroOrMore>
|
|
319
760
|
<ref name="BasicBlock"/>
|
|
320
761
|
</zeroOrMore>
|
|
321
|
-
<
|
|
322
|
-
<ref name="
|
|
323
|
-
</
|
|
762
|
+
<zeroOrMore>
|
|
763
|
+
<ref name="note"/>
|
|
764
|
+
</zeroOrMore>
|
|
765
|
+
<choice>
|
|
766
|
+
<oneOrMore>
|
|
767
|
+
<ref name="term"/>
|
|
768
|
+
</oneOrMore>
|
|
769
|
+
<group>
|
|
770
|
+
<zeroOrMore>
|
|
771
|
+
<ref name="terms"/>
|
|
772
|
+
</zeroOrMore>
|
|
773
|
+
<optional>
|
|
774
|
+
<ref name="definitions"/>
|
|
775
|
+
</optional>
|
|
776
|
+
</group>
|
|
777
|
+
</choice>
|
|
324
778
|
</element>
|
|
325
779
|
</define>
|
|
326
780
|
<define name="term">
|
|
@@ -413,7 +867,13 @@
|
|
|
413
867
|
</define>
|
|
414
868
|
<define name="definition">
|
|
415
869
|
<element name="definition">
|
|
416
|
-
<
|
|
870
|
+
<oneOrMore>
|
|
871
|
+
<choice>
|
|
872
|
+
<ref name="paragraph"/>
|
|
873
|
+
<ref name="figure"/>
|
|
874
|
+
<ref name="formula"/>
|
|
875
|
+
</choice>
|
|
876
|
+
</oneOrMore>
|
|
417
877
|
</element>
|
|
418
878
|
</define>
|
|
419
879
|
<define name="termnote">
|
|
@@ -511,4 +971,58 @@
|
|
|
511
971
|
</optional>
|
|
512
972
|
</element>
|
|
513
973
|
</define>
|
|
974
|
+
<define name="preface_abstract">
|
|
975
|
+
<element name="abstract">
|
|
976
|
+
<ref name="Basic-Section"/>
|
|
977
|
+
</element>
|
|
978
|
+
</define>
|
|
979
|
+
<define name="term-clause">
|
|
980
|
+
<element name="clause">
|
|
981
|
+
<optional>
|
|
982
|
+
<attribute name="id">
|
|
983
|
+
<data type="ID"/>
|
|
984
|
+
</attribute>
|
|
985
|
+
</optional>
|
|
986
|
+
<optional>
|
|
987
|
+
<attribute name="language"/>
|
|
988
|
+
</optional>
|
|
989
|
+
<optional>
|
|
990
|
+
<attribute name="script"/>
|
|
991
|
+
</optional>
|
|
992
|
+
<optional>
|
|
993
|
+
<attribute name="inline-header">
|
|
994
|
+
<data type="boolean"/>
|
|
995
|
+
</attribute>
|
|
996
|
+
</optional>
|
|
997
|
+
<optional>
|
|
998
|
+
<attribute name="obligation">
|
|
999
|
+
<choice>
|
|
1000
|
+
<value>normative</value>
|
|
1001
|
+
<value>informative</value>
|
|
1002
|
+
</choice>
|
|
1003
|
+
</attribute>
|
|
1004
|
+
</optional>
|
|
1005
|
+
<optional>
|
|
1006
|
+
<ref name="section-title"/>
|
|
1007
|
+
</optional>
|
|
1008
|
+
<zeroOrMore>
|
|
1009
|
+
<ref name="BasicBlock"/>
|
|
1010
|
+
</zeroOrMore>
|
|
1011
|
+
<zeroOrMore>
|
|
1012
|
+
<ref name="note"/>
|
|
1013
|
+
</zeroOrMore>
|
|
1014
|
+
<zeroOrMore>
|
|
1015
|
+
<choice>
|
|
1016
|
+
<ref name="term-clause"/>
|
|
1017
|
+
<ref name="terms"/>
|
|
1018
|
+
<ref name="definitions"/>
|
|
1019
|
+
</choice>
|
|
1020
|
+
</zeroOrMore>
|
|
1021
|
+
</element>
|
|
1022
|
+
</define>
|
|
1023
|
+
<define name="termdocsource">
|
|
1024
|
+
<element name="termdocsource">
|
|
1025
|
+
<ref name="CitationType"/>
|
|
1026
|
+
</element>
|
|
1027
|
+
</define>
|
|
514
1028
|
</grammar>
|