relaton-bsi 1.9.5 → 1.10.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: 9db2a5ff65039b9e7bbda2507f116444d0f0cccc7919da1e3be8d735c94d5324
4
- data.tar.gz: 903b68e85f928546ae715b4c0f88cf602e31717d38a39e8f7455df8d4c03ef31
3
+ metadata.gz: bd1ba0c493bc7618a485f2cc4e25db0ce6faf11e615afedcc2572562cc3a9794
4
+ data.tar.gz: a8d996b7dbc6f6143b8907d4e8b749f8d62cd7ba8290c5ead65d731160449a5e
5
5
  SHA512:
6
- metadata.gz: bb7f32531e7aedc5eb0d6499a31cabe1d642809f8b7f324e44bd3ea3af9e751415eb1f06fdb0cf003a3499b543fa202a046e9fce54e16965f39e6ca36c1b4ffd
7
- data.tar.gz: d943a7d57ab744e350eb56bd325b7df2e2ea86c513032899b208aa8e9600a0a48c22a76b6cb887885f85edceb545bbe018a855870312e18a15ebd973a03b006a
6
+ metadata.gz: c7b742f50ce2f8ba7241ec2bb98ad8b288f8cf06ae0689ed31b7f9eecc8a9829f277c9f41091c1e7f90e39415bf5ad69ba66d291fdbd29fcb3665df17b6ef03d
7
+ data.tar.gz: 62e2b8d4bab5542febe748e476ccdad6eb7d215701ef28fdfdbf006ec8a84012831af65eb2ce1f58d73a815bcab5d3ee86ce8d130540637d9c428f7ab90aac88
@@ -173,9 +173,11 @@
173
173
  <data type="dateTime"/>
174
174
  </attribute>
175
175
  </optional>
176
- <attribute name="from">
177
- <data type="IDREF"/>
178
- </attribute>
176
+ <optional>
177
+ <attribute name="from">
178
+ <data type="IDREF"/>
179
+ </attribute>
180
+ </optional>
179
181
  <optional>
180
182
  <attribute name="to">
181
183
  <data type="IDREF"/>
@@ -624,6 +626,9 @@
624
626
  <choice>
625
627
  <ref name="PureTextElement"/>
626
628
  <ref name="stem"/>
629
+ <ref name="eref"/>
630
+ <ref name="xref"/>
631
+ <ref name="hyperlink"/>
627
632
  </choice>
628
633
  </zeroOrMore>
629
634
  </element>
@@ -634,6 +639,9 @@
634
639
  <choice>
635
640
  <ref name="PureTextElement"/>
636
641
  <ref name="stem"/>
642
+ <ref name="eref"/>
643
+ <ref name="xref"/>
644
+ <ref name="hyperlink"/>
637
645
  </choice>
638
646
  </zeroOrMore>
639
647
  </element>
@@ -641,7 +649,12 @@
641
649
  <define name="tt">
642
650
  <element name="tt">
643
651
  <zeroOrMore>
644
- <ref name="PureTextElement"/>
652
+ <choice>
653
+ <ref name="PureTextElement"/>
654
+ <ref name="eref"/>
655
+ <ref name="xref"/>
656
+ <ref name="hyperlink"/>
657
+ </choice>
645
658
  </zeroOrMore>
646
659
  </element>
647
660
  </define>
@@ -822,7 +835,9 @@
822
835
  <attribute name="alt"/>
823
836
  </optional>
824
837
  <ref name="CitationType"/>
825
- <text/>
838
+ <oneOrMore>
839
+ <ref name="PureTextElement"/>
840
+ </oneOrMore>
826
841
  </define>
827
842
  <define name="hyperlink">
828
843
  <element name="link">
@@ -835,7 +850,9 @@
835
850
  <optional>
836
851
  <attribute name="alt"/>
837
852
  </optional>
838
- <text/>
853
+ <oneOrMore>
854
+ <ref name="PureTextElement"/>
855
+ </oneOrMore>
839
856
  </element>
840
857
  </define>
841
858
  <define name="xref">
@@ -849,7 +866,9 @@
849
866
  <optional>
850
867
  <attribute name="alt"/>
851
868
  </optional>
852
- <text/>
869
+ <oneOrMore>
870
+ <ref name="PureTextElement"/>
871
+ </oneOrMore>
853
872
  </element>
854
873
  </define>
855
874
  <define name="fn">
data/grammars/biblio.rng CHANGED
@@ -401,9 +401,9 @@
401
401
  <choice>
402
402
  <!-- iso191606 TODO -->
403
403
  <group>
404
- <oneOrMore>
404
+ <zeroOrMore>
405
405
  <ref name="street"/>
406
- </oneOrMore>
406
+ </zeroOrMore>
407
407
  <ref name="city"/>
408
408
  <optional>
409
409
  <ref name="state"/>
data/grammars/bsi.rng CHANGED
@@ -81,6 +81,193 @@
81
81
  </zeroOrMore>
82
82
  </element>
83
83
  </define>
84
+ <define name="Clause-Section">
85
+ <optional>
86
+ <attribute name="id">
87
+ <data type="ID"/>
88
+ </attribute>
89
+ </optional>
90
+ <optional>
91
+ <attribute name="language"/>
92
+ </optional>
93
+ <optional>
94
+ <attribute name="script"/>
95
+ </optional>
96
+ <optional>
97
+ <attribute name="inline-header">
98
+ <data type="boolean"/>
99
+ </attribute>
100
+ </optional>
101
+ <optional>
102
+ <attribute name="obligation">
103
+ <choice>
104
+ <value>normative</value>
105
+ <value>informative</value>
106
+ </choice>
107
+ </attribute>
108
+ </optional>
109
+ <optional>
110
+ <attribute name="type"/>
111
+ </optional>
112
+ <optional>
113
+ <ref name="section-title"/>
114
+ </optional>
115
+ <choice>
116
+ <choice>
117
+ <oneOrMore>
118
+ <ref name="BasicBlock"/>
119
+ </oneOrMore>
120
+ <ref name="amend"/>
121
+ </choice>
122
+ <oneOrMore>
123
+ <choice>
124
+ <ref name="clause-subsection"/>
125
+ <ref name="floating-title"/>
126
+ </choice>
127
+ </oneOrMore>
128
+ </choice>
129
+ </define>
130
+ <define name="annex">
131
+ <element name="annex">
132
+ <optional>
133
+ <attribute name="id">
134
+ <data type="ID"/>
135
+ </attribute>
136
+ </optional>
137
+ <optional>
138
+ <attribute name="language"/>
139
+ </optional>
140
+ <optional>
141
+ <attribute name="script"/>
142
+ </optional>
143
+ <optional>
144
+ <attribute name="inline-header">
145
+ <data type="boolean"/>
146
+ </attribute>
147
+ </optional>
148
+ <optional>
149
+ <attribute name="obligation">
150
+ <choice>
151
+ <value>normative</value>
152
+ <value>informative</value>
153
+ </choice>
154
+ </attribute>
155
+ </optional>
156
+ <optional>
157
+ <ref name="section-title"/>
158
+ </optional>
159
+ <zeroOrMore>
160
+ <!--
161
+ allow hanging paragraps in annexes: they introduce lists
162
+ ( paragraph-with-footnote | table | note | formula | admonition | ol | ul | dl | figure | quote | sourcecode | review | example )*,
163
+ -->
164
+ <ref name="BasicBlock"/>
165
+ </zeroOrMore>
166
+ <zeroOrMore>
167
+ <choice>
168
+ <ref name="clause-hanging-paragraph-with-footnote"/>
169
+ <ref name="floating-title"/>
170
+ </choice>
171
+ </zeroOrMore>
172
+ <zeroOrMore>
173
+ <ref name="annex-appendix"/>
174
+ </zeroOrMore>
175
+ </element>
176
+ </define>
177
+ <define name="clause-hanging-paragraph-with-footnote">
178
+ <element name="clause">
179
+ <optional>
180
+ <attribute name="id">
181
+ <data type="ID"/>
182
+ </attribute>
183
+ </optional>
184
+ <optional>
185
+ <attribute name="language"/>
186
+ </optional>
187
+ <optional>
188
+ <attribute name="script"/>
189
+ </optional>
190
+ <optional>
191
+ <attribute name="inline-header">
192
+ <data type="boolean"/>
193
+ </attribute>
194
+ </optional>
195
+ <optional>
196
+ <attribute name="obligation">
197
+ <choice>
198
+ <value>normative</value>
199
+ <value>informative</value>
200
+ </choice>
201
+ </attribute>
202
+ </optional>
203
+ <optional>
204
+ <ref name="section-title"/>
205
+ </optional>
206
+ <zeroOrMore>
207
+ <!-- allow hanging paragraphs in annexes: they introduce lists -->
208
+ <ref name="BasicBlock"/>
209
+ </zeroOrMore>
210
+ <zeroOrMore>
211
+ <choice>
212
+ <ref name="clause-hanging-paragraph-with-footnote"/>
213
+ <ref name="floating-title"/>
214
+ </choice>
215
+ </zeroOrMore>
216
+ </element>
217
+ </define>
218
+ <define name="sections">
219
+ <element name="sections">
220
+ <zeroOrMore>
221
+ <choice>
222
+ <ref name="note"/>
223
+ <ref name="admonition"/>
224
+ </choice>
225
+ </zeroOrMore>
226
+ <optional>
227
+ <choice>
228
+ <ref name="floating-title"/>
229
+ <ref name="section-title"/>
230
+ </choice>
231
+ </optional>
232
+ <ref name="clause"/>
233
+ <optional>
234
+ <choice>
235
+ <ref name="floating-title"/>
236
+ <ref name="section-title"/>
237
+ </choice>
238
+ </optional>
239
+ <optional>
240
+ <choice>
241
+ <ref name="term-clause"/>
242
+ <ref name="terms"/>
243
+ </choice>
244
+ </optional>
245
+ <optional>
246
+ <choice>
247
+ <ref name="floating-title"/>
248
+ <ref name="section-title"/>
249
+ </choice>
250
+ </optional>
251
+ <optional>
252
+ <ref name="definitions"/>
253
+ </optional>
254
+ <optional>
255
+ <choice>
256
+ <ref name="floating-title"/>
257
+ <ref name="section-title"/>
258
+ </choice>
259
+ </optional>
260
+ <oneOrMore>
261
+ <choice>
262
+ <ref name="clause"/>
263
+ <ref name="term-clause"/>
264
+ <ref name="terms"/>
265
+ <ref name="floating-title"/>
266
+ <ref name="section-title"/>
267
+ </choice>
268
+ </oneOrMore>
269
+ </element>
270
+ </define>
84
271
  </include>
85
272
  <!-- end overrides -->
86
273
  <define name="AdmonitionType" combine="choice">
@@ -129,4 +316,17 @@
129
316
  </zeroOrMore>
130
317
  </element>
131
318
  </define>
319
+ <!-- <define name="section-title">
320
+ <element name="section-title">
321
+ <attribute name="id">
322
+ <data type="ID"/>
323
+ </attribute>
324
+ <attribute name="depth">
325
+ <data type="int"/>
326
+ </attribute>
327
+ <zeroOrMore>
328
+ <ref name="TextElement"/>
329
+ </zeroOrMore>
330
+ </element>
331
+ </define> -->
132
332
  </grammar>