metanorma-iho 0.0.2 → 0.2.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/macos.yml +0 -1
- data/.github/workflows/ubuntu.yml +6 -3
- data/.github/workflows/windows.yml +0 -1
- data/Rakefile +2 -0
- data/lib/asciidoctor/iho/biblio.rng +14 -4
- data/lib/asciidoctor/iho/converter.rb +13 -2
- data/lib/asciidoctor/iho/iho.rng +2 -2
- data/lib/asciidoctor/iho/isodoc.rng +456 -7
- data/lib/asciidoctor/iho/reqt.rng +23 -0
- data/lib/isodoc/iho/base_convert.rb +0 -54
- data/lib/isodoc/iho/html/htmlstyle.css +1007 -0
- data/lib/isodoc/iho/html/iho.css +798 -0
- data/lib/isodoc/iho/html/iho.scss +0 -1
- data/lib/isodoc/iho/html/wordstyle.css +1252 -0
- data/lib/isodoc/iho/html/wordstyle.scss +0 -1
- data/lib/isodoc/iho/html_convert.rb +13 -12
- data/lib/isodoc/iho/iho.specification.xsl +3501 -0
- data/lib/isodoc/iho/iho.standard.xsl +3501 -0
- data/lib/isodoc/iho/init.rb +23 -0
- data/lib/isodoc/iho/pdf_convert.rb +5 -13
- data/lib/isodoc/iho/presentation_xml_convert.rb +12 -0
- data/lib/isodoc/iho/word_convert.rb +2 -1
- data/lib/isodoc/iho/xref.rb +64 -0
- data/lib/metanorma-iho.rb +1 -0
- data/lib/metanorma/iho/processor.rb +10 -4
- data/lib/metanorma/iho/version.rb +1 -1
- data/metanorma-iho.gemspec +4 -3
- metadata +34 -13
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 3eb1d1f60faf44b8588778468d67ab66d77fd558474b98e39d76a22f2e0a676d
|
|
4
|
+
data.tar.gz: 6623c86cc70970450bc8f07c01523e1c365dbc065d0db954ea36a391d1521c80
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: f06bebea95255d6239531f171e86cb95837fb6c69fe91eb25915ca15b87faa245cbddb4a9283e1a65cbc3b1f87230494ff3edf680d58cbad587f1339740e873a
|
|
7
|
+
data.tar.gz: c7b4085bf8a18ef1e28740f1dd70d79d7ef6980bb9a1033e11f8be5761db9cf46c987e8fe4a1c308dda7b79bcee980320ec87efd9816c45e56ab63fa5553f74d
|
data/.github/workflows/macos.yml
CHANGED
|
@@ -29,14 +29,17 @@ jobs:
|
|
|
29
29
|
uses: actions/setup-ruby@v1
|
|
30
30
|
with:
|
|
31
31
|
ruby-version: ${{ matrix.ruby }}
|
|
32
|
-
architecture: 'x64'
|
|
33
32
|
- name: Update gems
|
|
34
33
|
run: |
|
|
35
34
|
gem install bundler
|
|
36
35
|
bundle install --jobs 4 --retry 3
|
|
37
36
|
- name: Install PlantUML
|
|
38
|
-
|
|
39
|
-
|
|
37
|
+
uses: nick-invision/retry@v1
|
|
38
|
+
with:
|
|
39
|
+
polling_interval_seconds: 5
|
|
40
|
+
timeout_minutes: 5
|
|
41
|
+
max_attempts: 3
|
|
42
|
+
command: sudo bash -c "curl -L https://github.com/metanorma/plantuml-install/raw/master/ubuntu.sh | bash"
|
|
40
43
|
- name: Run specs
|
|
41
44
|
run: |
|
|
42
45
|
bundle exec rake
|
data/Rakefile
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">
|
|
@@ -661,9 +661,9 @@
|
|
|
661
661
|
<optional>
|
|
662
662
|
<ref name="status"/>
|
|
663
663
|
</optional>
|
|
664
|
-
<
|
|
664
|
+
<zeroOrMore>
|
|
665
665
|
<ref name="copyright"/>
|
|
666
|
-
</
|
|
666
|
+
</zeroOrMore>
|
|
667
667
|
<zeroOrMore>
|
|
668
668
|
<ref name="docrelation"/>
|
|
669
669
|
</zeroOrMore>
|
|
@@ -1021,7 +1021,17 @@
|
|
|
1021
1021
|
<optional>
|
|
1022
1022
|
<ref name="to"/>
|
|
1023
1023
|
</optional>
|
|
1024
|
-
<
|
|
1024
|
+
<oneOrMore>
|
|
1025
|
+
<ref name="owner"/>
|
|
1026
|
+
</oneOrMore>
|
|
1027
|
+
<optional>
|
|
1028
|
+
<ref name="copyright_scope"/>
|
|
1029
|
+
</optional>
|
|
1030
|
+
</element>
|
|
1031
|
+
</define>
|
|
1032
|
+
<define name="copyright_scope">
|
|
1033
|
+
<element name="scope">
|
|
1034
|
+
<text/>
|
|
1025
1035
|
</element>
|
|
1026
1036
|
</define>
|
|
1027
1037
|
<define name="from">
|
|
@@ -58,7 +58,14 @@ module Asciidoctor
|
|
|
58
58
|
end
|
|
59
59
|
|
|
60
60
|
def metadata_committee(node, xml)
|
|
61
|
-
|
|
61
|
+
unless node.attr("workgroup")
|
|
62
|
+
@log.add("AsciiDoc Input", nil, "Missing workgroup attribute for document")
|
|
63
|
+
return
|
|
64
|
+
end
|
|
65
|
+
metadata_committee1(node, xml)
|
|
66
|
+
end
|
|
67
|
+
|
|
68
|
+
def metadata_committee1(node, xml)
|
|
62
69
|
xml.editorialgroup do |a|
|
|
63
70
|
a.committee node.attr("committee")
|
|
64
71
|
a.workgroup node.attr("workgroup")
|
|
@@ -77,6 +84,10 @@ module Asciidoctor
|
|
|
77
84
|
Metanorma::IHO.configuration
|
|
78
85
|
end
|
|
79
86
|
|
|
87
|
+
def presentation_xml_converter(node)
|
|
88
|
+
IsoDoc::IHO::PresentationXMLConvert.new(html_extract_attributes(node))
|
|
89
|
+
end
|
|
90
|
+
|
|
80
91
|
def html_converter(node)
|
|
81
92
|
IsoDoc::IHO::HtmlConvert.new(html_extract_attributes(node))
|
|
82
93
|
end
|
|
@@ -86,7 +97,7 @@ module Asciidoctor
|
|
|
86
97
|
IsoDoc::IHO::PdfConvert.new(html_extract_attributes(node))
|
|
87
98
|
end
|
|
88
99
|
|
|
89
|
-
def
|
|
100
|
+
def doc_converter(node)
|
|
90
101
|
IsoDoc::IHO::WordConvert.new(doc_extract_attributes(node))
|
|
91
102
|
end
|
|
92
103
|
end
|
data/lib/asciidoctor/iho/iho.rng
CHANGED
|
@@ -53,9 +53,96 @@
|
|
|
53
53
|
<optional>
|
|
54
54
|
<attribute name="alt"/>
|
|
55
55
|
</optional>
|
|
56
|
+
<optional>
|
|
57
|
+
<attribute name="case">
|
|
58
|
+
<choice>
|
|
59
|
+
<value>capital</value>
|
|
60
|
+
<value>lowercase</value>
|
|
61
|
+
</choice>
|
|
62
|
+
</attribute>
|
|
63
|
+
</optional>
|
|
56
64
|
<text/>
|
|
57
65
|
</element>
|
|
58
66
|
</define>
|
|
67
|
+
<define name="ul">
|
|
68
|
+
<element name="ul">
|
|
69
|
+
<attribute name="id">
|
|
70
|
+
<data type="ID"/>
|
|
71
|
+
</attribute>
|
|
72
|
+
<optional>
|
|
73
|
+
<attribute name="keep-with-next">
|
|
74
|
+
<data type="boolean"/>
|
|
75
|
+
</attribute>
|
|
76
|
+
</optional>
|
|
77
|
+
<optional>
|
|
78
|
+
<attribute name="keep-lines-together">
|
|
79
|
+
<data type="boolean"/>
|
|
80
|
+
</attribute>
|
|
81
|
+
</optional>
|
|
82
|
+
<oneOrMore>
|
|
83
|
+
<ref name="li"/>
|
|
84
|
+
</oneOrMore>
|
|
85
|
+
<zeroOrMore>
|
|
86
|
+
<ref name="note"/>
|
|
87
|
+
</zeroOrMore>
|
|
88
|
+
</element>
|
|
89
|
+
</define>
|
|
90
|
+
<define name="ol">
|
|
91
|
+
<element name="ol">
|
|
92
|
+
<attribute name="id">
|
|
93
|
+
<data type="ID"/>
|
|
94
|
+
</attribute>
|
|
95
|
+
<optional>
|
|
96
|
+
<attribute name="keep-with-next">
|
|
97
|
+
<data type="boolean"/>
|
|
98
|
+
</attribute>
|
|
99
|
+
</optional>
|
|
100
|
+
<optional>
|
|
101
|
+
<attribute name="keep-lines-together">
|
|
102
|
+
<data type="boolean"/>
|
|
103
|
+
</attribute>
|
|
104
|
+
</optional>
|
|
105
|
+
<attribute name="type">
|
|
106
|
+
<choice>
|
|
107
|
+
<value>roman</value>
|
|
108
|
+
<value>alphabet</value>
|
|
109
|
+
<value>arabic</value>
|
|
110
|
+
<value>roman_upper</value>
|
|
111
|
+
<value>alphabet_upper</value>
|
|
112
|
+
</choice>
|
|
113
|
+
</attribute>
|
|
114
|
+
<oneOrMore>
|
|
115
|
+
<ref name="li"/>
|
|
116
|
+
</oneOrMore>
|
|
117
|
+
<zeroOrMore>
|
|
118
|
+
<ref name="note"/>
|
|
119
|
+
</zeroOrMore>
|
|
120
|
+
</element>
|
|
121
|
+
</define>
|
|
122
|
+
<define name="dl">
|
|
123
|
+
<element name="dl">
|
|
124
|
+
<attribute name="id">
|
|
125
|
+
<data type="ID"/>
|
|
126
|
+
</attribute>
|
|
127
|
+
<optional>
|
|
128
|
+
<attribute name="keep-with-next">
|
|
129
|
+
<data type="boolean"/>
|
|
130
|
+
</attribute>
|
|
131
|
+
</optional>
|
|
132
|
+
<optional>
|
|
133
|
+
<attribute name="keep-lines-together">
|
|
134
|
+
<data type="boolean"/>
|
|
135
|
+
</attribute>
|
|
136
|
+
</optional>
|
|
137
|
+
<oneOrMore>
|
|
138
|
+
<ref name="dt"/>
|
|
139
|
+
<ref name="dd"/>
|
|
140
|
+
</oneOrMore>
|
|
141
|
+
<zeroOrMore>
|
|
142
|
+
<ref name="note"/>
|
|
143
|
+
</zeroOrMore>
|
|
144
|
+
</element>
|
|
145
|
+
</define>
|
|
59
146
|
<define name="example">
|
|
60
147
|
<element name="example">
|
|
61
148
|
<attribute name="id">
|
|
@@ -69,6 +156,19 @@
|
|
|
69
156
|
<optional>
|
|
70
157
|
<attribute name="subsequence"/>
|
|
71
158
|
</optional>
|
|
159
|
+
<optional>
|
|
160
|
+
<attribute name="number"/>
|
|
161
|
+
</optional>
|
|
162
|
+
<optional>
|
|
163
|
+
<attribute name="keep-with-next">
|
|
164
|
+
<data type="boolean"/>
|
|
165
|
+
</attribute>
|
|
166
|
+
</optional>
|
|
167
|
+
<optional>
|
|
168
|
+
<attribute name="keep-lines-together">
|
|
169
|
+
<data type="boolean"/>
|
|
170
|
+
</attribute>
|
|
171
|
+
</optional>
|
|
72
172
|
<optional>
|
|
73
173
|
<ref name="tname"/>
|
|
74
174
|
</optional>
|
|
@@ -89,6 +189,296 @@
|
|
|
89
189
|
</zeroOrMore>
|
|
90
190
|
</element>
|
|
91
191
|
</define>
|
|
192
|
+
<define name="table">
|
|
193
|
+
<element name="table">
|
|
194
|
+
<attribute name="id">
|
|
195
|
+
<data type="ID"/>
|
|
196
|
+
</attribute>
|
|
197
|
+
<optional>
|
|
198
|
+
<attribute name="unnumbered">
|
|
199
|
+
<data type="boolean"/>
|
|
200
|
+
</attribute>
|
|
201
|
+
</optional>
|
|
202
|
+
<optional>
|
|
203
|
+
<attribute name="number"/>
|
|
204
|
+
</optional>
|
|
205
|
+
<optional>
|
|
206
|
+
<attribute name="subsequence"/>
|
|
207
|
+
</optional>
|
|
208
|
+
<optional>
|
|
209
|
+
<attribute name="alt"/>
|
|
210
|
+
</optional>
|
|
211
|
+
<optional>
|
|
212
|
+
<attribute name="summary"/>
|
|
213
|
+
</optional>
|
|
214
|
+
<optional>
|
|
215
|
+
<attribute name="uri">
|
|
216
|
+
<data type="anyURI"/>
|
|
217
|
+
</attribute>
|
|
218
|
+
</optional>
|
|
219
|
+
<optional>
|
|
220
|
+
<attribute name="keep-with-next">
|
|
221
|
+
<data type="boolean"/>
|
|
222
|
+
</attribute>
|
|
223
|
+
</optional>
|
|
224
|
+
<optional>
|
|
225
|
+
<attribute name="keep-lines-together">
|
|
226
|
+
<data type="boolean"/>
|
|
227
|
+
</attribute>
|
|
228
|
+
</optional>
|
|
229
|
+
<optional>
|
|
230
|
+
<ref name="tname"/>
|
|
231
|
+
</optional>
|
|
232
|
+
<optional>
|
|
233
|
+
<ref name="thead"/>
|
|
234
|
+
</optional>
|
|
235
|
+
<ref name="tbody"/>
|
|
236
|
+
<optional>
|
|
237
|
+
<ref name="tfoot"/>
|
|
238
|
+
</optional>
|
|
239
|
+
<zeroOrMore>
|
|
240
|
+
<ref name="table-note"/>
|
|
241
|
+
</zeroOrMore>
|
|
242
|
+
<optional>
|
|
243
|
+
<ref name="dl"/>
|
|
244
|
+
</optional>
|
|
245
|
+
</element>
|
|
246
|
+
</define>
|
|
247
|
+
<define name="figure">
|
|
248
|
+
<element name="figure">
|
|
249
|
+
<attribute name="id">
|
|
250
|
+
<data type="ID"/>
|
|
251
|
+
</attribute>
|
|
252
|
+
<optional>
|
|
253
|
+
<attribute name="unnumbered">
|
|
254
|
+
<data type="boolean"/>
|
|
255
|
+
</attribute>
|
|
256
|
+
</optional>
|
|
257
|
+
<optional>
|
|
258
|
+
<attribute name="number"/>
|
|
259
|
+
</optional>
|
|
260
|
+
<optional>
|
|
261
|
+
<attribute name="subsequence"/>
|
|
262
|
+
</optional>
|
|
263
|
+
<optional>
|
|
264
|
+
<attribute name="keep-with-next">
|
|
265
|
+
<data type="boolean"/>
|
|
266
|
+
</attribute>
|
|
267
|
+
</optional>
|
|
268
|
+
<optional>
|
|
269
|
+
<attribute name="keep-lines-together">
|
|
270
|
+
<data type="boolean"/>
|
|
271
|
+
</attribute>
|
|
272
|
+
</optional>
|
|
273
|
+
<optional>
|
|
274
|
+
<attribute name="class"/>
|
|
275
|
+
</optional>
|
|
276
|
+
<optional>
|
|
277
|
+
<ref name="source"/>
|
|
278
|
+
</optional>
|
|
279
|
+
<optional>
|
|
280
|
+
<ref name="tname"/>
|
|
281
|
+
</optional>
|
|
282
|
+
<choice>
|
|
283
|
+
<ref name="image"/>
|
|
284
|
+
<ref name="video"/>
|
|
285
|
+
<ref name="audio"/>
|
|
286
|
+
<ref name="pre"/>
|
|
287
|
+
<oneOrMore>
|
|
288
|
+
<ref name="paragraph-with-footnote"/>
|
|
289
|
+
</oneOrMore>
|
|
290
|
+
<zeroOrMore>
|
|
291
|
+
<ref name="figure"/>
|
|
292
|
+
</zeroOrMore>
|
|
293
|
+
</choice>
|
|
294
|
+
<zeroOrMore>
|
|
295
|
+
<ref name="fn"/>
|
|
296
|
+
</zeroOrMore>
|
|
297
|
+
<optional>
|
|
298
|
+
<ref name="dl"/>
|
|
299
|
+
</optional>
|
|
300
|
+
<zeroOrMore>
|
|
301
|
+
<ref name="note"/>
|
|
302
|
+
</zeroOrMore>
|
|
303
|
+
</element>
|
|
304
|
+
</define>
|
|
305
|
+
<define name="sourcecode">
|
|
306
|
+
<element name="sourcecode">
|
|
307
|
+
<attribute name="id">
|
|
308
|
+
<data type="ID"/>
|
|
309
|
+
</attribute>
|
|
310
|
+
<optional>
|
|
311
|
+
<attribute name="unnumbered">
|
|
312
|
+
<data type="boolean"/>
|
|
313
|
+
</attribute>
|
|
314
|
+
</optional>
|
|
315
|
+
<optional>
|
|
316
|
+
<attribute name="number"/>
|
|
317
|
+
</optional>
|
|
318
|
+
<optional>
|
|
319
|
+
<attribute name="subsequence"/>
|
|
320
|
+
</optional>
|
|
321
|
+
<optional>
|
|
322
|
+
<attribute name="keep-with-next">
|
|
323
|
+
<data type="boolean"/>
|
|
324
|
+
</attribute>
|
|
325
|
+
</optional>
|
|
326
|
+
<optional>
|
|
327
|
+
<attribute name="keep-lines-together">
|
|
328
|
+
<data type="boolean"/>
|
|
329
|
+
</attribute>
|
|
330
|
+
</optional>
|
|
331
|
+
<optional>
|
|
332
|
+
<attribute name="lang"/>
|
|
333
|
+
</optional>
|
|
334
|
+
<optional>
|
|
335
|
+
<ref name="tname"/>
|
|
336
|
+
</optional>
|
|
337
|
+
<oneOrMore>
|
|
338
|
+
<choice>
|
|
339
|
+
<text/>
|
|
340
|
+
<ref name="callout"/>
|
|
341
|
+
</choice>
|
|
342
|
+
</oneOrMore>
|
|
343
|
+
<zeroOrMore>
|
|
344
|
+
<ref name="annotation"/>
|
|
345
|
+
</zeroOrMore>
|
|
346
|
+
<zeroOrMore>
|
|
347
|
+
<ref name="note"/>
|
|
348
|
+
</zeroOrMore>
|
|
349
|
+
</element>
|
|
350
|
+
</define>
|
|
351
|
+
<define name="formula">
|
|
352
|
+
<element name="formula">
|
|
353
|
+
<attribute name="id">
|
|
354
|
+
<data type="ID"/>
|
|
355
|
+
</attribute>
|
|
356
|
+
<optional>
|
|
357
|
+
<attribute name="unnumbered">
|
|
358
|
+
<data type="boolean"/>
|
|
359
|
+
</attribute>
|
|
360
|
+
</optional>
|
|
361
|
+
<optional>
|
|
362
|
+
<attribute name="number"/>
|
|
363
|
+
</optional>
|
|
364
|
+
<optional>
|
|
365
|
+
<attribute name="subsequence"/>
|
|
366
|
+
</optional>
|
|
367
|
+
<optional>
|
|
368
|
+
<attribute name="keep-with-next">
|
|
369
|
+
<data type="boolean"/>
|
|
370
|
+
</attribute>
|
|
371
|
+
</optional>
|
|
372
|
+
<optional>
|
|
373
|
+
<attribute name="keep-lines-together">
|
|
374
|
+
<data type="boolean"/>
|
|
375
|
+
</attribute>
|
|
376
|
+
</optional>
|
|
377
|
+
<optional>
|
|
378
|
+
<attribute name="inequality">
|
|
379
|
+
<data type="boolean"/>
|
|
380
|
+
</attribute>
|
|
381
|
+
</optional>
|
|
382
|
+
<ref name="stem"/>
|
|
383
|
+
<optional>
|
|
384
|
+
<ref name="dl"/>
|
|
385
|
+
</optional>
|
|
386
|
+
<zeroOrMore>
|
|
387
|
+
<ref name="note"/>
|
|
388
|
+
</zeroOrMore>
|
|
389
|
+
</element>
|
|
390
|
+
</define>
|
|
391
|
+
<define name="ParagraphType">
|
|
392
|
+
<attribute name="id">
|
|
393
|
+
<data type="ID"/>
|
|
394
|
+
</attribute>
|
|
395
|
+
<optional>
|
|
396
|
+
<attribute name="align">
|
|
397
|
+
<ref name="Alignments"/>
|
|
398
|
+
</attribute>
|
|
399
|
+
</optional>
|
|
400
|
+
<optional>
|
|
401
|
+
<attribute name="keep-with-next">
|
|
402
|
+
<data type="boolean"/>
|
|
403
|
+
</attribute>
|
|
404
|
+
</optional>
|
|
405
|
+
<optional>
|
|
406
|
+
<attribute name="keep-lines-together">
|
|
407
|
+
<data type="boolean"/>
|
|
408
|
+
</attribute>
|
|
409
|
+
</optional>
|
|
410
|
+
<zeroOrMore>
|
|
411
|
+
<ref name="TextElement"/>
|
|
412
|
+
</zeroOrMore>
|
|
413
|
+
<zeroOrMore>
|
|
414
|
+
<ref name="note"/>
|
|
415
|
+
</zeroOrMore>
|
|
416
|
+
</define>
|
|
417
|
+
<define name="paragraph-with-footnote">
|
|
418
|
+
<element name="p">
|
|
419
|
+
<attribute name="id">
|
|
420
|
+
<data type="ID"/>
|
|
421
|
+
</attribute>
|
|
422
|
+
<optional>
|
|
423
|
+
<attribute name="align">
|
|
424
|
+
<ref name="Alignments"/>
|
|
425
|
+
</attribute>
|
|
426
|
+
</optional>
|
|
427
|
+
<optional>
|
|
428
|
+
<attribute name="keep-with-next">
|
|
429
|
+
<data type="boolean"/>
|
|
430
|
+
</attribute>
|
|
431
|
+
</optional>
|
|
432
|
+
<optional>
|
|
433
|
+
<attribute name="keep-lines-together">
|
|
434
|
+
<data type="boolean"/>
|
|
435
|
+
</attribute>
|
|
436
|
+
</optional>
|
|
437
|
+
<zeroOrMore>
|
|
438
|
+
<choice>
|
|
439
|
+
<ref name="TextElement"/>
|
|
440
|
+
<ref name="fn"/>
|
|
441
|
+
</choice>
|
|
442
|
+
</zeroOrMore>
|
|
443
|
+
<zeroOrMore>
|
|
444
|
+
<ref name="note"/>
|
|
445
|
+
</zeroOrMore>
|
|
446
|
+
</element>
|
|
447
|
+
</define>
|
|
448
|
+
<define name="quote">
|
|
449
|
+
<element name="quote">
|
|
450
|
+
<attribute name="id">
|
|
451
|
+
<data type="ID"/>
|
|
452
|
+
</attribute>
|
|
453
|
+
<optional>
|
|
454
|
+
<attribute name="alignment">
|
|
455
|
+
<ref name="Alignments"/>
|
|
456
|
+
</attribute>
|
|
457
|
+
</optional>
|
|
458
|
+
<optional>
|
|
459
|
+
<attribute name="keep-with-next">
|
|
460
|
+
<data type="boolean"/>
|
|
461
|
+
</attribute>
|
|
462
|
+
</optional>
|
|
463
|
+
<optional>
|
|
464
|
+
<attribute name="keep-lines-together">
|
|
465
|
+
<data type="boolean"/>
|
|
466
|
+
</attribute>
|
|
467
|
+
</optional>
|
|
468
|
+
<optional>
|
|
469
|
+
<ref name="quote-source"/>
|
|
470
|
+
</optional>
|
|
471
|
+
<optional>
|
|
472
|
+
<ref name="quote-author"/>
|
|
473
|
+
</optional>
|
|
474
|
+
<oneOrMore>
|
|
475
|
+
<ref name="paragraph-with-footnote"/>
|
|
476
|
+
</oneOrMore>
|
|
477
|
+
<zeroOrMore>
|
|
478
|
+
<ref name="note"/>
|
|
479
|
+
</zeroOrMore>
|
|
480
|
+
</element>
|
|
481
|
+
</define>
|
|
92
482
|
<define name="BibDataExtensionType">
|
|
93
483
|
<ref name="doctype"/>
|
|
94
484
|
<optional>
|
|
@@ -157,6 +547,30 @@
|
|
|
157
547
|
<attribute name="id">
|
|
158
548
|
<data type="ID"/>
|
|
159
549
|
</attribute>
|
|
550
|
+
<optional>
|
|
551
|
+
<attribute name="unnumbered">
|
|
552
|
+
<data type="boolean"/>
|
|
553
|
+
</attribute>
|
|
554
|
+
</optional>
|
|
555
|
+
<optional>
|
|
556
|
+
<attribute name="number"/>
|
|
557
|
+
</optional>
|
|
558
|
+
<optional>
|
|
559
|
+
<attribute name="subsequence"/>
|
|
560
|
+
</optional>
|
|
561
|
+
<optional>
|
|
562
|
+
<attribute name="keep-with-next">
|
|
563
|
+
<data type="boolean"/>
|
|
564
|
+
</attribute>
|
|
565
|
+
</optional>
|
|
566
|
+
<optional>
|
|
567
|
+
<attribute name="keep-lines-together">
|
|
568
|
+
<data type="boolean"/>
|
|
569
|
+
</attribute>
|
|
570
|
+
</optional>
|
|
571
|
+
<optional>
|
|
572
|
+
<attribute name="type"/>
|
|
573
|
+
</optional>
|
|
160
574
|
<oneOrMore>
|
|
161
575
|
<choice>
|
|
162
576
|
<ref name="paragraph"/>
|
|
@@ -508,6 +922,9 @@
|
|
|
508
922
|
<optional>
|
|
509
923
|
<attribute name="script"/>
|
|
510
924
|
</optional>
|
|
925
|
+
<optional>
|
|
926
|
+
<attribute name="type"/>
|
|
927
|
+
</optional>
|
|
511
928
|
<optional>
|
|
512
929
|
<attribute name="obligation">
|
|
513
930
|
<choice>
|
|
@@ -547,9 +964,6 @@
|
|
|
547
964
|
</define>
|
|
548
965
|
<define name="content-subsection">
|
|
549
966
|
<element name="clause">
|
|
550
|
-
<optional>
|
|
551
|
-
<attribute name="type"/>
|
|
552
|
-
</optional>
|
|
553
967
|
<ref name="Content-Section"/>
|
|
554
968
|
</element>
|
|
555
969
|
</define>
|
|
@@ -578,6 +992,9 @@
|
|
|
578
992
|
</choice>
|
|
579
993
|
</attribute>
|
|
580
994
|
</optional>
|
|
995
|
+
<optional>
|
|
996
|
+
<attribute name="type"/>
|
|
997
|
+
</optional>
|
|
581
998
|
<optional>
|
|
582
999
|
<ref name="section-title"/>
|
|
583
1000
|
</optional>
|
|
@@ -597,9 +1014,6 @@
|
|
|
597
1014
|
</define>
|
|
598
1015
|
<define name="clause">
|
|
599
1016
|
<element name="clause">
|
|
600
|
-
<optional>
|
|
601
|
-
<attribute name="type"/>
|
|
602
|
-
</optional>
|
|
603
1017
|
<ref name="Clause-Section"/>
|
|
604
1018
|
</element>
|
|
605
1019
|
</define>
|
|
@@ -628,6 +1042,9 @@
|
|
|
628
1042
|
</choice>
|
|
629
1043
|
</attribute>
|
|
630
1044
|
</optional>
|
|
1045
|
+
<optional>
|
|
1046
|
+
<attribute name="type"/>
|
|
1047
|
+
</optional>
|
|
631
1048
|
<optional>
|
|
632
1049
|
<ref name="section-title"/>
|
|
633
1050
|
</optional>
|
|
@@ -766,6 +1183,9 @@
|
|
|
766
1183
|
<optional>
|
|
767
1184
|
<attribute name="script"/>
|
|
768
1185
|
</optional>
|
|
1186
|
+
<optional>
|
|
1187
|
+
<attribute name="type"/>
|
|
1188
|
+
</optional>
|
|
769
1189
|
<optional>
|
|
770
1190
|
<attribute name="obligation">
|
|
771
1191
|
<choice>
|
|
@@ -902,7 +1322,36 @@
|
|
|
902
1322
|
<attribute name="id">
|
|
903
1323
|
<data type="ID"/>
|
|
904
1324
|
</attribute>
|
|
905
|
-
<
|
|
1325
|
+
<optional>
|
|
1326
|
+
<attribute name="unnumbered">
|
|
1327
|
+
<data type="boolean"/>
|
|
1328
|
+
</attribute>
|
|
1329
|
+
</optional>
|
|
1330
|
+
<optional>
|
|
1331
|
+
<attribute name="number"/>
|
|
1332
|
+
</optional>
|
|
1333
|
+
<optional>
|
|
1334
|
+
<attribute name="subsequence"/>
|
|
1335
|
+
</optional>
|
|
1336
|
+
<optional>
|
|
1337
|
+
<attribute name="keep-with-next">
|
|
1338
|
+
<data type="boolean"/>
|
|
1339
|
+
</attribute>
|
|
1340
|
+
</optional>
|
|
1341
|
+
<optional>
|
|
1342
|
+
<attribute name="keep-lines-together">
|
|
1343
|
+
<data type="boolean"/>
|
|
1344
|
+
</attribute>
|
|
1345
|
+
</optional>
|
|
1346
|
+
<oneOrMore>
|
|
1347
|
+
<choice>
|
|
1348
|
+
<ref name="paragraph"/>
|
|
1349
|
+
<ref name="ul"/>
|
|
1350
|
+
<ref name="ol"/>
|
|
1351
|
+
<ref name="dl"/>
|
|
1352
|
+
<ref name="formula"/>
|
|
1353
|
+
</choice>
|
|
1354
|
+
</oneOrMore>
|
|
906
1355
|
</element>
|
|
907
1356
|
</define>
|
|
908
1357
|
<define name="termexample">
|