relaton-ietf 1.1.3 → 1.4.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.github/workflows/ubuntu.yml +1 -0
- data/.rubocop.yml +2 -2
- data/README.adoc +8 -44
- data/grammars/biblio.rng +1 -1
- data/grammars/ietf.rng +8 -2
- data/grammars/isodoc.rng +557 -21
- data/lib/relaton_ietf/ietf_bibliographic_item.rb +6 -18
- data/lib/relaton_ietf/scrapper.rb +10 -4
- data/lib/relaton_ietf/version.rb +1 -1
- data/lib/relaton_ietf/xml_parser.rb +5 -18
- data/relaton_ietf.gemspec +1 -1
- metadata +7 -8
- data/grammars/isostandard.rng +0 -530
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 83a2f0b3b5ed6676e4e431c67cd8f67378548c9bc669cda70b069cc84d85b3f0
|
|
4
|
+
data.tar.gz: b340e52f7a2e7d250691e9ad41bfbdc16e5e26a63bf309069cce2662809b5a0a
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 4431cce31069e59ea086d4b1fd55a96cf54db668ab125acbc524f9b226024ac6b9d51b9abb0c112a3e8f2e403d32b2650416d9d63ab07303ee53de6a9c6e2895
|
|
7
|
+
data.tar.gz: 18ca76a0c41767f7931cc6fa562a8ab561b15bc21da578c50d0dc8282cd4e310aa0221a7431f44bcef2ecfa13e3b2afb0ee2c9e875c21b687b19b840f9cc85ba
|
data/.rubocop.yml
CHANGED
data/README.adoc
CHANGED
|
@@ -45,7 +45,7 @@ item = RelatonIetf::IetfBibliography.search 'RFC 8341'
|
|
|
45
45
|
|
|
46
46
|
# Return nil if document doesn't exist.
|
|
47
47
|
RelatonIetf::IetfBibliography.search '1111'
|
|
48
|
-
1111
|
|
48
|
+
RelatonBib::RequestError: 1111: not recognised for RFC
|
|
49
49
|
=> nil
|
|
50
50
|
----
|
|
51
51
|
|
|
@@ -59,48 +59,9 @@ item.to_xml
|
|
|
59
59
|
<title format="text/plain" language="en" script="Latn">Network Configuration Access Control Model</title>
|
|
60
60
|
<uri type="src">https://www.rfc-editor.org/info/rfc8341</uri>
|
|
61
61
|
<docidentifier type="IETF">RFC 8341</docidentifier>
|
|
62
|
+
<docidentifier type=\"rfc-anchor\">RFC8341</docidentifier>
|
|
62
63
|
<docidentifier type="DOI">10.17487/RFC8341</docidentifier>
|
|
63
|
-
|
|
64
|
-
<on>2018-03</on>
|
|
65
|
-
</date>
|
|
66
|
-
<contributor>
|
|
67
|
-
<role type="author"/>
|
|
68
|
-
<person>
|
|
69
|
-
<name>
|
|
70
|
-
<completename language="en">A. Bierman</completename>
|
|
71
|
-
</name>
|
|
72
|
-
<affiliation>
|
|
73
|
-
<organization>
|
|
74
|
-
<name>IETF</name>
|
|
75
|
-
<abbreviation>IETF</abbreviation>
|
|
76
|
-
</organization>
|
|
77
|
-
</affiliation>
|
|
78
|
-
</person>
|
|
79
|
-
</contributor>
|
|
80
|
-
<contributor>
|
|
81
|
-
<role type="author"/>
|
|
82
|
-
<person>
|
|
83
|
-
<name>
|
|
84
|
-
<completename language="en">M. Bjorklund</completename>
|
|
85
|
-
</name>
|
|
86
|
-
<affiliation>
|
|
87
|
-
<organization>
|
|
88
|
-
<name>IETF</name>
|
|
89
|
-
<abbreviation>IETF</abbreviation>
|
|
90
|
-
</organization>
|
|
91
|
-
</affiliation>
|
|
92
|
-
</person>
|
|
93
|
-
</contributor>
|
|
94
|
-
<language>en</language>
|
|
95
|
-
<script>Latn</script>
|
|
96
|
-
<series type="main">
|
|
97
|
-
<title format="text/plain" language="en" script="Latn">STD</title>
|
|
98
|
-
<number>91</number>
|
|
99
|
-
</series>
|
|
100
|
-
<series type="main">
|
|
101
|
-
<title format="text/plain" language="en" script="Latn">RFC</title>
|
|
102
|
-
<number>8341</number>
|
|
103
|
-
</series>
|
|
64
|
+
....
|
|
104
65
|
</bibitem>"
|
|
105
66
|
----
|
|
106
67
|
With `bibdata: true` option XML output wrapped with `bibdata` element and `ext` element added.
|
|
@@ -122,13 +83,16 @@ item.to_xml bibdata: true
|
|
|
122
83
|
|
|
123
84
|
[source,ruby]
|
|
124
85
|
----
|
|
125
|
-
item = Relaton::Provider::Ietf.from_rfcxml File.read("rfc.xml")
|
|
86
|
+
item = Relaton::Provider::Ietf.from_rfcxml File.read("spec/examples/rfc.xml")
|
|
126
87
|
=> #<RelatonIetf::IetfBibliographicItem:0x007fa8cda79ab8
|
|
127
88
|
...
|
|
128
89
|
|
|
129
90
|
item.to_xml bibdata: true
|
|
130
91
|
=>"<bibdata>
|
|
131
|
-
|
|
92
|
+
<fetched>2020-09-15</fetched>
|
|
93
|
+
<title format="text/plain" language="en" script="Latn">ACVP Secure Hash Algorithm (SHA) JSON Specification</title>
|
|
94
|
+
...
|
|
95
|
+
</bibdata>"
|
|
132
96
|
----
|
|
133
97
|
|
|
134
98
|
=== Create bibliographic item form YAML
|
data/grammars/biblio.rng
CHANGED
|
@@ -532,7 +532,7 @@
|
|
|
532
532
|
</define>
|
|
533
533
|
<define name="LocalityType">
|
|
534
534
|
<data type="string">
|
|
535
|
-
<param name="pattern">section|clause|part|paragraph|chapter|page|whole|table|annex|figure|note|list|example|volume|issue|time|locality:[a-zA-Z0-9_]+</param>
|
|
535
|
+
<param name="pattern">section|clause|part|paragraph|chapter|page|whole|table|annex|figure|note|list|example|volume|issue|time|anchor|locality:[a-zA-Z0-9_]+</param>
|
|
536
536
|
</data>
|
|
537
537
|
</define>
|
|
538
538
|
<define name="referenceFrom">
|
data/grammars/ietf.rng
CHANGED
|
@@ -69,12 +69,12 @@
|
|
|
69
69
|
</attribute>
|
|
70
70
|
</optional>
|
|
71
71
|
<optional>
|
|
72
|
-
<attribute name="
|
|
72
|
+
<attribute name="keep-with-next">
|
|
73
73
|
<data type="boolean"/>
|
|
74
74
|
</attribute>
|
|
75
75
|
</optional>
|
|
76
76
|
<optional>
|
|
77
|
-
<attribute name="
|
|
77
|
+
<attribute name="keep-with-previous">
|
|
78
78
|
<data type="boolean"/>
|
|
79
79
|
</attribute>
|
|
80
80
|
</optional>
|
|
@@ -297,6 +297,9 @@
|
|
|
297
297
|
<data type="boolean"/>
|
|
298
298
|
</attribute>
|
|
299
299
|
</optional>
|
|
300
|
+
<optional>
|
|
301
|
+
<attribute name="number"/>
|
|
302
|
+
</optional>
|
|
300
303
|
<optional>
|
|
301
304
|
<attribute name="subsequence"/>
|
|
302
305
|
</optional>
|
|
@@ -379,6 +382,9 @@
|
|
|
379
382
|
<data type="boolean"/>
|
|
380
383
|
</attribute>
|
|
381
384
|
</optional>
|
|
385
|
+
<optional>
|
|
386
|
+
<attribute name="number"/>
|
|
387
|
+
</optional>
|
|
382
388
|
<optional>
|
|
383
389
|
<attribute name="subsequence"/>
|
|
384
390
|
</optional>
|
data/grammars/isodoc.rng
CHANGED
|
@@ -42,8 +42,11 @@
|
|
|
42
42
|
</define>
|
|
43
43
|
<define name="xref">
|
|
44
44
|
<element name="xref">
|
|
45
|
+
<!-- attribute target { xsd:IDREF }, -->
|
|
45
46
|
<attribute name="target">
|
|
46
|
-
<data type="
|
|
47
|
+
<data type="string">
|
|
48
|
+
<param name="pattern">\i\c*|\c+#\c+</param>
|
|
49
|
+
</data>
|
|
47
50
|
</attribute>
|
|
48
51
|
<optional>
|
|
49
52
|
<attribute name="type">
|
|
@@ -61,9 +64,93 @@
|
|
|
61
64
|
</choice>
|
|
62
65
|
</attribute>
|
|
63
66
|
</optional>
|
|
67
|
+
<optional>
|
|
68
|
+
<attribute name="droploc">
|
|
69
|
+
<data type="boolean"/>
|
|
70
|
+
</attribute>
|
|
71
|
+
</optional>
|
|
64
72
|
<text/>
|
|
65
73
|
</element>
|
|
66
74
|
</define>
|
|
75
|
+
<define name="ul">
|
|
76
|
+
<element name="ul">
|
|
77
|
+
<attribute name="id">
|
|
78
|
+
<data type="ID"/>
|
|
79
|
+
</attribute>
|
|
80
|
+
<optional>
|
|
81
|
+
<attribute name="keep-with-next">
|
|
82
|
+
<data type="boolean"/>
|
|
83
|
+
</attribute>
|
|
84
|
+
</optional>
|
|
85
|
+
<optional>
|
|
86
|
+
<attribute name="keep-lines-together">
|
|
87
|
+
<data type="boolean"/>
|
|
88
|
+
</attribute>
|
|
89
|
+
</optional>
|
|
90
|
+
<oneOrMore>
|
|
91
|
+
<ref name="li"/>
|
|
92
|
+
</oneOrMore>
|
|
93
|
+
<zeroOrMore>
|
|
94
|
+
<ref name="note"/>
|
|
95
|
+
</zeroOrMore>
|
|
96
|
+
</element>
|
|
97
|
+
</define>
|
|
98
|
+
<define name="ol">
|
|
99
|
+
<element name="ol">
|
|
100
|
+
<attribute name="id">
|
|
101
|
+
<data type="ID"/>
|
|
102
|
+
</attribute>
|
|
103
|
+
<optional>
|
|
104
|
+
<attribute name="keep-with-next">
|
|
105
|
+
<data type="boolean"/>
|
|
106
|
+
</attribute>
|
|
107
|
+
</optional>
|
|
108
|
+
<optional>
|
|
109
|
+
<attribute name="keep-lines-together">
|
|
110
|
+
<data type="boolean"/>
|
|
111
|
+
</attribute>
|
|
112
|
+
</optional>
|
|
113
|
+
<attribute name="type">
|
|
114
|
+
<choice>
|
|
115
|
+
<value>roman</value>
|
|
116
|
+
<value>alphabet</value>
|
|
117
|
+
<value>arabic</value>
|
|
118
|
+
<value>roman_upper</value>
|
|
119
|
+
<value>alphabet_upper</value>
|
|
120
|
+
</choice>
|
|
121
|
+
</attribute>
|
|
122
|
+
<oneOrMore>
|
|
123
|
+
<ref name="li"/>
|
|
124
|
+
</oneOrMore>
|
|
125
|
+
<zeroOrMore>
|
|
126
|
+
<ref name="note"/>
|
|
127
|
+
</zeroOrMore>
|
|
128
|
+
</element>
|
|
129
|
+
</define>
|
|
130
|
+
<define name="dl">
|
|
131
|
+
<element name="dl">
|
|
132
|
+
<attribute name="id">
|
|
133
|
+
<data type="ID"/>
|
|
134
|
+
</attribute>
|
|
135
|
+
<optional>
|
|
136
|
+
<attribute name="keep-with-next">
|
|
137
|
+
<data type="boolean"/>
|
|
138
|
+
</attribute>
|
|
139
|
+
</optional>
|
|
140
|
+
<optional>
|
|
141
|
+
<attribute name="keep-lines-together">
|
|
142
|
+
<data type="boolean"/>
|
|
143
|
+
</attribute>
|
|
144
|
+
</optional>
|
|
145
|
+
<oneOrMore>
|
|
146
|
+
<ref name="dt"/>
|
|
147
|
+
<ref name="dd"/>
|
|
148
|
+
</oneOrMore>
|
|
149
|
+
<zeroOrMore>
|
|
150
|
+
<ref name="note"/>
|
|
151
|
+
</zeroOrMore>
|
|
152
|
+
</element>
|
|
153
|
+
</define>
|
|
67
154
|
<define name="example">
|
|
68
155
|
<element name="example">
|
|
69
156
|
<attribute name="id">
|
|
@@ -77,6 +164,19 @@
|
|
|
77
164
|
<optional>
|
|
78
165
|
<attribute name="subsequence"/>
|
|
79
166
|
</optional>
|
|
167
|
+
<optional>
|
|
168
|
+
<attribute name="number"/>
|
|
169
|
+
</optional>
|
|
170
|
+
<optional>
|
|
171
|
+
<attribute name="keep-with-next">
|
|
172
|
+
<data type="boolean"/>
|
|
173
|
+
</attribute>
|
|
174
|
+
</optional>
|
|
175
|
+
<optional>
|
|
176
|
+
<attribute name="keep-lines-together">
|
|
177
|
+
<data type="boolean"/>
|
|
178
|
+
</attribute>
|
|
179
|
+
</optional>
|
|
80
180
|
<optional>
|
|
81
181
|
<ref name="tname"/>
|
|
82
182
|
</optional>
|
|
@@ -97,6 +197,296 @@
|
|
|
97
197
|
</zeroOrMore>
|
|
98
198
|
</element>
|
|
99
199
|
</define>
|
|
200
|
+
<define name="table">
|
|
201
|
+
<element name="table">
|
|
202
|
+
<attribute name="id">
|
|
203
|
+
<data type="ID"/>
|
|
204
|
+
</attribute>
|
|
205
|
+
<optional>
|
|
206
|
+
<attribute name="unnumbered">
|
|
207
|
+
<data type="boolean"/>
|
|
208
|
+
</attribute>
|
|
209
|
+
</optional>
|
|
210
|
+
<optional>
|
|
211
|
+
<attribute name="number"/>
|
|
212
|
+
</optional>
|
|
213
|
+
<optional>
|
|
214
|
+
<attribute name="subsequence"/>
|
|
215
|
+
</optional>
|
|
216
|
+
<optional>
|
|
217
|
+
<attribute name="alt"/>
|
|
218
|
+
</optional>
|
|
219
|
+
<optional>
|
|
220
|
+
<attribute name="summary"/>
|
|
221
|
+
</optional>
|
|
222
|
+
<optional>
|
|
223
|
+
<attribute name="uri">
|
|
224
|
+
<data type="anyURI"/>
|
|
225
|
+
</attribute>
|
|
226
|
+
</optional>
|
|
227
|
+
<optional>
|
|
228
|
+
<attribute name="keep-with-next">
|
|
229
|
+
<data type="boolean"/>
|
|
230
|
+
</attribute>
|
|
231
|
+
</optional>
|
|
232
|
+
<optional>
|
|
233
|
+
<attribute name="keep-lines-together">
|
|
234
|
+
<data type="boolean"/>
|
|
235
|
+
</attribute>
|
|
236
|
+
</optional>
|
|
237
|
+
<optional>
|
|
238
|
+
<ref name="tname"/>
|
|
239
|
+
</optional>
|
|
240
|
+
<optional>
|
|
241
|
+
<ref name="thead"/>
|
|
242
|
+
</optional>
|
|
243
|
+
<ref name="tbody"/>
|
|
244
|
+
<optional>
|
|
245
|
+
<ref name="tfoot"/>
|
|
246
|
+
</optional>
|
|
247
|
+
<zeroOrMore>
|
|
248
|
+
<ref name="table-note"/>
|
|
249
|
+
</zeroOrMore>
|
|
250
|
+
<optional>
|
|
251
|
+
<ref name="dl"/>
|
|
252
|
+
</optional>
|
|
253
|
+
</element>
|
|
254
|
+
</define>
|
|
255
|
+
<define name="figure">
|
|
256
|
+
<element name="figure">
|
|
257
|
+
<attribute name="id">
|
|
258
|
+
<data type="ID"/>
|
|
259
|
+
</attribute>
|
|
260
|
+
<optional>
|
|
261
|
+
<attribute name="unnumbered">
|
|
262
|
+
<data type="boolean"/>
|
|
263
|
+
</attribute>
|
|
264
|
+
</optional>
|
|
265
|
+
<optional>
|
|
266
|
+
<attribute name="number"/>
|
|
267
|
+
</optional>
|
|
268
|
+
<optional>
|
|
269
|
+
<attribute name="subsequence"/>
|
|
270
|
+
</optional>
|
|
271
|
+
<optional>
|
|
272
|
+
<attribute name="keep-with-next">
|
|
273
|
+
<data type="boolean"/>
|
|
274
|
+
</attribute>
|
|
275
|
+
</optional>
|
|
276
|
+
<optional>
|
|
277
|
+
<attribute name="keep-lines-together">
|
|
278
|
+
<data type="boolean"/>
|
|
279
|
+
</attribute>
|
|
280
|
+
</optional>
|
|
281
|
+
<optional>
|
|
282
|
+
<attribute name="class"/>
|
|
283
|
+
</optional>
|
|
284
|
+
<optional>
|
|
285
|
+
<ref name="source"/>
|
|
286
|
+
</optional>
|
|
287
|
+
<optional>
|
|
288
|
+
<ref name="tname"/>
|
|
289
|
+
</optional>
|
|
290
|
+
<choice>
|
|
291
|
+
<ref name="image"/>
|
|
292
|
+
<ref name="video"/>
|
|
293
|
+
<ref name="audio"/>
|
|
294
|
+
<ref name="pre"/>
|
|
295
|
+
<oneOrMore>
|
|
296
|
+
<ref name="paragraph-with-footnote"/>
|
|
297
|
+
</oneOrMore>
|
|
298
|
+
<zeroOrMore>
|
|
299
|
+
<ref name="figure"/>
|
|
300
|
+
</zeroOrMore>
|
|
301
|
+
</choice>
|
|
302
|
+
<zeroOrMore>
|
|
303
|
+
<ref name="fn"/>
|
|
304
|
+
</zeroOrMore>
|
|
305
|
+
<optional>
|
|
306
|
+
<ref name="dl"/>
|
|
307
|
+
</optional>
|
|
308
|
+
<zeroOrMore>
|
|
309
|
+
<ref name="note"/>
|
|
310
|
+
</zeroOrMore>
|
|
311
|
+
</element>
|
|
312
|
+
</define>
|
|
313
|
+
<define name="sourcecode">
|
|
314
|
+
<element name="sourcecode">
|
|
315
|
+
<attribute name="id">
|
|
316
|
+
<data type="ID"/>
|
|
317
|
+
</attribute>
|
|
318
|
+
<optional>
|
|
319
|
+
<attribute name="unnumbered">
|
|
320
|
+
<data type="boolean"/>
|
|
321
|
+
</attribute>
|
|
322
|
+
</optional>
|
|
323
|
+
<optional>
|
|
324
|
+
<attribute name="number"/>
|
|
325
|
+
</optional>
|
|
326
|
+
<optional>
|
|
327
|
+
<attribute name="subsequence"/>
|
|
328
|
+
</optional>
|
|
329
|
+
<optional>
|
|
330
|
+
<attribute name="keep-with-next">
|
|
331
|
+
<data type="boolean"/>
|
|
332
|
+
</attribute>
|
|
333
|
+
</optional>
|
|
334
|
+
<optional>
|
|
335
|
+
<attribute name="keep-lines-together">
|
|
336
|
+
<data type="boolean"/>
|
|
337
|
+
</attribute>
|
|
338
|
+
</optional>
|
|
339
|
+
<optional>
|
|
340
|
+
<attribute name="lang"/>
|
|
341
|
+
</optional>
|
|
342
|
+
<optional>
|
|
343
|
+
<ref name="tname"/>
|
|
344
|
+
</optional>
|
|
345
|
+
<oneOrMore>
|
|
346
|
+
<choice>
|
|
347
|
+
<text/>
|
|
348
|
+
<ref name="callout"/>
|
|
349
|
+
</choice>
|
|
350
|
+
</oneOrMore>
|
|
351
|
+
<zeroOrMore>
|
|
352
|
+
<ref name="annotation"/>
|
|
353
|
+
</zeroOrMore>
|
|
354
|
+
<zeroOrMore>
|
|
355
|
+
<ref name="note"/>
|
|
356
|
+
</zeroOrMore>
|
|
357
|
+
</element>
|
|
358
|
+
</define>
|
|
359
|
+
<define name="formula">
|
|
360
|
+
<element name="formula">
|
|
361
|
+
<attribute name="id">
|
|
362
|
+
<data type="ID"/>
|
|
363
|
+
</attribute>
|
|
364
|
+
<optional>
|
|
365
|
+
<attribute name="unnumbered">
|
|
366
|
+
<data type="boolean"/>
|
|
367
|
+
</attribute>
|
|
368
|
+
</optional>
|
|
369
|
+
<optional>
|
|
370
|
+
<attribute name="number"/>
|
|
371
|
+
</optional>
|
|
372
|
+
<optional>
|
|
373
|
+
<attribute name="subsequence"/>
|
|
374
|
+
</optional>
|
|
375
|
+
<optional>
|
|
376
|
+
<attribute name="keep-with-next">
|
|
377
|
+
<data type="boolean"/>
|
|
378
|
+
</attribute>
|
|
379
|
+
</optional>
|
|
380
|
+
<optional>
|
|
381
|
+
<attribute name="keep-lines-together">
|
|
382
|
+
<data type="boolean"/>
|
|
383
|
+
</attribute>
|
|
384
|
+
</optional>
|
|
385
|
+
<optional>
|
|
386
|
+
<attribute name="inequality">
|
|
387
|
+
<data type="boolean"/>
|
|
388
|
+
</attribute>
|
|
389
|
+
</optional>
|
|
390
|
+
<ref name="stem"/>
|
|
391
|
+
<optional>
|
|
392
|
+
<ref name="dl"/>
|
|
393
|
+
</optional>
|
|
394
|
+
<zeroOrMore>
|
|
395
|
+
<ref name="note"/>
|
|
396
|
+
</zeroOrMore>
|
|
397
|
+
</element>
|
|
398
|
+
</define>
|
|
399
|
+
<define name="ParagraphType">
|
|
400
|
+
<attribute name="id">
|
|
401
|
+
<data type="ID"/>
|
|
402
|
+
</attribute>
|
|
403
|
+
<optional>
|
|
404
|
+
<attribute name="align">
|
|
405
|
+
<ref name="Alignments"/>
|
|
406
|
+
</attribute>
|
|
407
|
+
</optional>
|
|
408
|
+
<optional>
|
|
409
|
+
<attribute name="keep-with-next">
|
|
410
|
+
<data type="boolean"/>
|
|
411
|
+
</attribute>
|
|
412
|
+
</optional>
|
|
413
|
+
<optional>
|
|
414
|
+
<attribute name="keep-lines-together">
|
|
415
|
+
<data type="boolean"/>
|
|
416
|
+
</attribute>
|
|
417
|
+
</optional>
|
|
418
|
+
<zeroOrMore>
|
|
419
|
+
<ref name="TextElement"/>
|
|
420
|
+
</zeroOrMore>
|
|
421
|
+
<zeroOrMore>
|
|
422
|
+
<ref name="note"/>
|
|
423
|
+
</zeroOrMore>
|
|
424
|
+
</define>
|
|
425
|
+
<define name="paragraph-with-footnote">
|
|
426
|
+
<element name="p">
|
|
427
|
+
<attribute name="id">
|
|
428
|
+
<data type="ID"/>
|
|
429
|
+
</attribute>
|
|
430
|
+
<optional>
|
|
431
|
+
<attribute name="align">
|
|
432
|
+
<ref name="Alignments"/>
|
|
433
|
+
</attribute>
|
|
434
|
+
</optional>
|
|
435
|
+
<optional>
|
|
436
|
+
<attribute name="keep-with-next">
|
|
437
|
+
<data type="boolean"/>
|
|
438
|
+
</attribute>
|
|
439
|
+
</optional>
|
|
440
|
+
<optional>
|
|
441
|
+
<attribute name="keep-lines-together">
|
|
442
|
+
<data type="boolean"/>
|
|
443
|
+
</attribute>
|
|
444
|
+
</optional>
|
|
445
|
+
<zeroOrMore>
|
|
446
|
+
<choice>
|
|
447
|
+
<ref name="TextElement"/>
|
|
448
|
+
<ref name="fn"/>
|
|
449
|
+
</choice>
|
|
450
|
+
</zeroOrMore>
|
|
451
|
+
<zeroOrMore>
|
|
452
|
+
<ref name="note"/>
|
|
453
|
+
</zeroOrMore>
|
|
454
|
+
</element>
|
|
455
|
+
</define>
|
|
456
|
+
<define name="quote">
|
|
457
|
+
<element name="quote">
|
|
458
|
+
<attribute name="id">
|
|
459
|
+
<data type="ID"/>
|
|
460
|
+
</attribute>
|
|
461
|
+
<optional>
|
|
462
|
+
<attribute name="alignment">
|
|
463
|
+
<ref name="Alignments"/>
|
|
464
|
+
</attribute>
|
|
465
|
+
</optional>
|
|
466
|
+
<optional>
|
|
467
|
+
<attribute name="keep-with-next">
|
|
468
|
+
<data type="boolean"/>
|
|
469
|
+
</attribute>
|
|
470
|
+
</optional>
|
|
471
|
+
<optional>
|
|
472
|
+
<attribute name="keep-lines-together">
|
|
473
|
+
<data type="boolean"/>
|
|
474
|
+
</attribute>
|
|
475
|
+
</optional>
|
|
476
|
+
<optional>
|
|
477
|
+
<ref name="quote-source"/>
|
|
478
|
+
</optional>
|
|
479
|
+
<optional>
|
|
480
|
+
<ref name="quote-author"/>
|
|
481
|
+
</optional>
|
|
482
|
+
<oneOrMore>
|
|
483
|
+
<ref name="paragraph-with-footnote"/>
|
|
484
|
+
</oneOrMore>
|
|
485
|
+
<zeroOrMore>
|
|
486
|
+
<ref name="note"/>
|
|
487
|
+
</zeroOrMore>
|
|
488
|
+
</element>
|
|
489
|
+
</define>
|
|
100
490
|
<define name="BibDataExtensionType">
|
|
101
491
|
<ref name="doctype"/>
|
|
102
492
|
<optional>
|
|
@@ -165,6 +555,30 @@
|
|
|
165
555
|
<attribute name="id">
|
|
166
556
|
<data type="ID"/>
|
|
167
557
|
</attribute>
|
|
558
|
+
<optional>
|
|
559
|
+
<attribute name="unnumbered">
|
|
560
|
+
<data type="boolean"/>
|
|
561
|
+
</attribute>
|
|
562
|
+
</optional>
|
|
563
|
+
<optional>
|
|
564
|
+
<attribute name="number"/>
|
|
565
|
+
</optional>
|
|
566
|
+
<optional>
|
|
567
|
+
<attribute name="subsequence"/>
|
|
568
|
+
</optional>
|
|
569
|
+
<optional>
|
|
570
|
+
<attribute name="keep-with-next">
|
|
571
|
+
<data type="boolean"/>
|
|
572
|
+
</attribute>
|
|
573
|
+
</optional>
|
|
574
|
+
<optional>
|
|
575
|
+
<attribute name="keep-lines-together">
|
|
576
|
+
<data type="boolean"/>
|
|
577
|
+
</attribute>
|
|
578
|
+
</optional>
|
|
579
|
+
<optional>
|
|
580
|
+
<attribute name="type"/>
|
|
581
|
+
</optional>
|
|
168
582
|
<oneOrMore>
|
|
169
583
|
<choice>
|
|
170
584
|
<ref name="paragraph"/>
|
|
@@ -172,6 +586,8 @@
|
|
|
172
586
|
<ref name="ol"/>
|
|
173
587
|
<ref name="dl"/>
|
|
174
588
|
<ref name="formula"/>
|
|
589
|
+
<ref name="quote"/>
|
|
590
|
+
<ref name="sourcecode"/>
|
|
175
591
|
</choice>
|
|
176
592
|
</oneOrMore>
|
|
177
593
|
</element>
|
|
@@ -255,6 +671,16 @@
|
|
|
255
671
|
</choice>
|
|
256
672
|
</attribute>
|
|
257
673
|
</optional>
|
|
674
|
+
<optional>
|
|
675
|
+
<attribute name="valign">
|
|
676
|
+
<choice>
|
|
677
|
+
<value>top</value>
|
|
678
|
+
<value>middle</value>
|
|
679
|
+
<value>bottom</value>
|
|
680
|
+
<value>baseline</value>
|
|
681
|
+
</choice>
|
|
682
|
+
</attribute>
|
|
683
|
+
</optional>
|
|
258
684
|
<choice>
|
|
259
685
|
<zeroOrMore>
|
|
260
686
|
<choice>
|
|
@@ -291,6 +717,16 @@
|
|
|
291
717
|
</choice>
|
|
292
718
|
</attribute>
|
|
293
719
|
</optional>
|
|
720
|
+
<optional>
|
|
721
|
+
<attribute name="valign">
|
|
722
|
+
<choice>
|
|
723
|
+
<value>top</value>
|
|
724
|
+
<value>middle</value>
|
|
725
|
+
<value>bottom</value>
|
|
726
|
+
<value>baseline</value>
|
|
727
|
+
</choice>
|
|
728
|
+
</attribute>
|
|
729
|
+
</optional>
|
|
294
730
|
<choice>
|
|
295
731
|
<zeroOrMore>
|
|
296
732
|
<choice>
|
|
@@ -449,7 +885,7 @@
|
|
|
449
885
|
<oneOrMore>
|
|
450
886
|
<choice>
|
|
451
887
|
<ref name="content"/>
|
|
452
|
-
<ref name="
|
|
888
|
+
<ref name="abstract"/>
|
|
453
889
|
<ref name="foreword"/>
|
|
454
890
|
<ref name="introduction"/>
|
|
455
891
|
<ref name="acknowledgements"/>
|
|
@@ -516,6 +952,9 @@
|
|
|
516
952
|
<optional>
|
|
517
953
|
<attribute name="script"/>
|
|
518
954
|
</optional>
|
|
955
|
+
<optional>
|
|
956
|
+
<attribute name="type"/>
|
|
957
|
+
</optional>
|
|
519
958
|
<optional>
|
|
520
959
|
<attribute name="obligation">
|
|
521
960
|
<choice>
|
|
@@ -555,9 +994,6 @@
|
|
|
555
994
|
</define>
|
|
556
995
|
<define name="content-subsection">
|
|
557
996
|
<element name="clause">
|
|
558
|
-
<optional>
|
|
559
|
-
<attribute name="type"/>
|
|
560
|
-
</optional>
|
|
561
997
|
<ref name="Content-Section"/>
|
|
562
998
|
</element>
|
|
563
999
|
</define>
|
|
@@ -586,6 +1022,9 @@
|
|
|
586
1022
|
</choice>
|
|
587
1023
|
</attribute>
|
|
588
1024
|
</optional>
|
|
1025
|
+
<optional>
|
|
1026
|
+
<attribute name="type"/>
|
|
1027
|
+
</optional>
|
|
589
1028
|
<optional>
|
|
590
1029
|
<ref name="section-title"/>
|
|
591
1030
|
</optional>
|
|
@@ -605,9 +1044,6 @@
|
|
|
605
1044
|
</define>
|
|
606
1045
|
<define name="clause">
|
|
607
1046
|
<element name="clause">
|
|
608
|
-
<optional>
|
|
609
|
-
<attribute name="type"/>
|
|
610
|
-
</optional>
|
|
611
1047
|
<ref name="Clause-Section"/>
|
|
612
1048
|
</element>
|
|
613
1049
|
</define>
|
|
@@ -636,18 +1072,24 @@
|
|
|
636
1072
|
</choice>
|
|
637
1073
|
</attribute>
|
|
638
1074
|
</optional>
|
|
1075
|
+
<optional>
|
|
1076
|
+
<attribute name="type"/>
|
|
1077
|
+
</optional>
|
|
639
1078
|
<optional>
|
|
640
1079
|
<ref name="section-title"/>
|
|
641
1080
|
</optional>
|
|
642
1081
|
<group>
|
|
643
|
-
<
|
|
644
|
-
<
|
|
645
|
-
<
|
|
646
|
-
|
|
647
|
-
|
|
648
|
-
<
|
|
649
|
-
|
|
650
|
-
|
|
1082
|
+
<choice>
|
|
1083
|
+
<group>
|
|
1084
|
+
<zeroOrMore>
|
|
1085
|
+
<ref name="BasicBlock"/>
|
|
1086
|
+
</zeroOrMore>
|
|
1087
|
+
<zeroOrMore>
|
|
1088
|
+
<ref name="note"/>
|
|
1089
|
+
</zeroOrMore>
|
|
1090
|
+
</group>
|
|
1091
|
+
<ref name="amend"/>
|
|
1092
|
+
</choice>
|
|
651
1093
|
<zeroOrMore>
|
|
652
1094
|
<choice>
|
|
653
1095
|
<ref name="clause-subsection"/>
|
|
@@ -774,6 +1216,9 @@
|
|
|
774
1216
|
<optional>
|
|
775
1217
|
<attribute name="script"/>
|
|
776
1218
|
</optional>
|
|
1219
|
+
<optional>
|
|
1220
|
+
<attribute name="type"/>
|
|
1221
|
+
</optional>
|
|
777
1222
|
<optional>
|
|
778
1223
|
<attribute name="obligation">
|
|
779
1224
|
<choice>
|
|
@@ -910,6 +1355,27 @@
|
|
|
910
1355
|
<attribute name="id">
|
|
911
1356
|
<data type="ID"/>
|
|
912
1357
|
</attribute>
|
|
1358
|
+
<optional>
|
|
1359
|
+
<attribute name="unnumbered">
|
|
1360
|
+
<data type="boolean"/>
|
|
1361
|
+
</attribute>
|
|
1362
|
+
</optional>
|
|
1363
|
+
<optional>
|
|
1364
|
+
<attribute name="number"/>
|
|
1365
|
+
</optional>
|
|
1366
|
+
<optional>
|
|
1367
|
+
<attribute name="subsequence"/>
|
|
1368
|
+
</optional>
|
|
1369
|
+
<optional>
|
|
1370
|
+
<attribute name="keep-with-next">
|
|
1371
|
+
<data type="boolean"/>
|
|
1372
|
+
</attribute>
|
|
1373
|
+
</optional>
|
|
1374
|
+
<optional>
|
|
1375
|
+
<attribute name="keep-lines-together">
|
|
1376
|
+
<data type="boolean"/>
|
|
1377
|
+
</attribute>
|
|
1378
|
+
</optional>
|
|
913
1379
|
<oneOrMore>
|
|
914
1380
|
<choice>
|
|
915
1381
|
<ref name="paragraph"/>
|
|
@@ -1020,11 +1486,6 @@
|
|
|
1020
1486
|
</optional>
|
|
1021
1487
|
</element>
|
|
1022
1488
|
</define>
|
|
1023
|
-
<define name="preface_abstract">
|
|
1024
|
-
<element name="abstract">
|
|
1025
|
-
<ref name="Basic-Section"/>
|
|
1026
|
-
</element>
|
|
1027
|
-
</define>
|
|
1028
1489
|
<define name="term-clause">
|
|
1029
1490
|
<element name="clause">
|
|
1030
1491
|
<optional>
|
|
@@ -1074,4 +1535,79 @@
|
|
|
1074
1535
|
<ref name="CitationType"/>
|
|
1075
1536
|
</element>
|
|
1076
1537
|
</define>
|
|
1538
|
+
<define name="amend">
|
|
1539
|
+
<element name="amend">
|
|
1540
|
+
<optional>
|
|
1541
|
+
<attribute name="id">
|
|
1542
|
+
<data type="ID"/>
|
|
1543
|
+
</attribute>
|
|
1544
|
+
</optional>
|
|
1545
|
+
<attribute name="change">
|
|
1546
|
+
<choice>
|
|
1547
|
+
<value>add</value>
|
|
1548
|
+
<value>modify</value>
|
|
1549
|
+
<value>delete</value>
|
|
1550
|
+
</choice>
|
|
1551
|
+
</attribute>
|
|
1552
|
+
<optional>
|
|
1553
|
+
<attribute name="path"/>
|
|
1554
|
+
</optional>
|
|
1555
|
+
<optional>
|
|
1556
|
+
<attribute name="path_end"/>
|
|
1557
|
+
</optional>
|
|
1558
|
+
<optional>
|
|
1559
|
+
<attribute name="title"/>
|
|
1560
|
+
</optional>
|
|
1561
|
+
<optional>
|
|
1562
|
+
<element name="location">
|
|
1563
|
+
<zeroOrMore>
|
|
1564
|
+
<ref name="locality"/>
|
|
1565
|
+
</zeroOrMore>
|
|
1566
|
+
</element>
|
|
1567
|
+
</optional>
|
|
1568
|
+
<zeroOrMore>
|
|
1569
|
+
<ref name="autonumber"/>
|
|
1570
|
+
</zeroOrMore>
|
|
1571
|
+
<optional>
|
|
1572
|
+
<element name="description">
|
|
1573
|
+
<zeroOrMore>
|
|
1574
|
+
<ref name="BasicBlock"/>
|
|
1575
|
+
</zeroOrMore>
|
|
1576
|
+
</element>
|
|
1577
|
+
</optional>
|
|
1578
|
+
<optional>
|
|
1579
|
+
<element name="newcontent">
|
|
1580
|
+
<zeroOrMore>
|
|
1581
|
+
<ref name="BasicBlock"/>
|
|
1582
|
+
</zeroOrMore>
|
|
1583
|
+
</element>
|
|
1584
|
+
</optional>
|
|
1585
|
+
<optional>
|
|
1586
|
+
<element name="description">
|
|
1587
|
+
<zeroOrMore>
|
|
1588
|
+
<ref name="BasicBlock"/>
|
|
1589
|
+
</zeroOrMore>
|
|
1590
|
+
</element>
|
|
1591
|
+
</optional>
|
|
1592
|
+
</element>
|
|
1593
|
+
</define>
|
|
1594
|
+
<define name="autonumber">
|
|
1595
|
+
<element name="autonumber">
|
|
1596
|
+
<attribute name="type">
|
|
1597
|
+
<choice>
|
|
1598
|
+
<value>requirement</value>
|
|
1599
|
+
<value>recommendation</value>
|
|
1600
|
+
<value>permission</value>
|
|
1601
|
+
<value>table</value>
|
|
1602
|
+
<value>figure</value>
|
|
1603
|
+
<value>admonition</value>
|
|
1604
|
+
<value>formula</value>
|
|
1605
|
+
<value>sourcecode</value>
|
|
1606
|
+
<value>example</value>
|
|
1607
|
+
<value>note</value>
|
|
1608
|
+
</choice>
|
|
1609
|
+
</attribute>
|
|
1610
|
+
<text/>
|
|
1611
|
+
</element>
|
|
1612
|
+
</define>
|
|
1077
1613
|
</grammar>
|