metanorma-generic 1.4.8 → 1.6.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 +8 -1
- data/.github/workflows/ubuntu.yml +20 -7
- data/.github/workflows/windows.yml +8 -1
- data/lib/asciidoctor/generic/biblio.rng +36 -6
- data/lib/asciidoctor/generic/converter.rb +21 -17
- data/lib/asciidoctor/generic/isodoc.rng +456 -7
- data/lib/asciidoctor/generic/reqt.rng +23 -0
- data/lib/isodoc/generic.rb +1 -0
- data/lib/isodoc/generic/base_convert.rb +4 -25
- data/lib/isodoc/generic/html/scripts.html +10 -6
- data/lib/isodoc/generic/html_convert.rb +5 -1
- data/lib/isodoc/generic/init.rb +27 -0
- data/lib/isodoc/generic/metadata.rb +2 -1
- data/lib/isodoc/generic/pdf_convert.rb +2 -0
- data/lib/isodoc/generic/presentation_xml_convert.rb +19 -0
- data/lib/isodoc/generic/word_convert.rb +6 -2
- data/lib/isodoc/generic/xref.rb +6 -0
- data/lib/metanorma/generic/processor.rb +21 -8
- data/lib/metanorma/generic/version.rb +1 -1
- data/metanorma-generic.gemspec +3 -2
- metadata +27 -12
- data/lib/isodoc/generic/html/scripts.pdf.html +0 -72
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 3e817f19db29a3edb02be3d16087975c2fbacc77e210288cce9389c8f988687c
|
|
4
|
+
data.tar.gz: 2f3aaa80cc738cb89e1465a769b98716de796fb33235d9e76867d91d3581310e
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 9c3aa01d6ed22902d8d5f45166a9fa7c8bf1fe341ab4237cae173c2ee332e25c8bf4117ca0ee5f287ec1d84c2317d4e68196fa1794331b36ee1cd64a5459c182
|
|
7
|
+
data.tar.gz: d545baf6c6822b5ff93baf8db5b23f22817214f556029ff1e531eca1762429440fb95f4ce3f849e2f2ba13a7cfe7aeb5dbabbdfac040fe5f409aa9a7a91b8219
|
data/.github/workflows/macos.yml
CHANGED
|
@@ -6,22 +6,29 @@ on:
|
|
|
6
6
|
push:
|
|
7
7
|
branches: [ master ]
|
|
8
8
|
pull_request:
|
|
9
|
+
paths-ignore:
|
|
10
|
+
- .github/workflows/ubuntu.yml
|
|
11
|
+
- .github/workflows/windows.yml
|
|
9
12
|
|
|
10
13
|
jobs:
|
|
11
14
|
test-macos:
|
|
12
15
|
name: Test on Ruby ${{ matrix.ruby }} macOS
|
|
13
16
|
runs-on: macos-latest
|
|
17
|
+
continue-on-error: ${{ matrix.experimental }}
|
|
14
18
|
strategy:
|
|
15
19
|
fail-fast: false
|
|
16
20
|
matrix:
|
|
17
21
|
ruby: [ '2.6', '2.5', '2.4' ]
|
|
22
|
+
experimental: [false]
|
|
23
|
+
include:
|
|
24
|
+
- ruby: '2.7'
|
|
25
|
+
experimental: true
|
|
18
26
|
steps:
|
|
19
27
|
- uses: actions/checkout@master
|
|
20
28
|
- name: Use Ruby
|
|
21
29
|
uses: actions/setup-ruby@v1
|
|
22
30
|
with:
|
|
23
31
|
ruby-version: ${{ matrix.ruby }}
|
|
24
|
-
architecture: 'x64'
|
|
25
32
|
- name: Update gems
|
|
26
33
|
run: |
|
|
27
34
|
sudo gem install bundler --force
|
|
@@ -5,23 +5,32 @@ name: ubuntu
|
|
|
5
5
|
on:
|
|
6
6
|
push:
|
|
7
7
|
branches: [ master ]
|
|
8
|
+
tags:
|
|
9
|
+
- '*'
|
|
8
10
|
pull_request:
|
|
11
|
+
paths-ignore:
|
|
12
|
+
- .github/workflows/macos.yml
|
|
13
|
+
- .github/workflows/windows.yml
|
|
9
14
|
|
|
10
15
|
jobs:
|
|
11
16
|
test-linux:
|
|
12
17
|
name: Test on Ruby ${{ matrix.ruby }} Ubuntu
|
|
13
18
|
runs-on: ubuntu-latest
|
|
19
|
+
continue-on-error: ${{ matrix.experimental }}
|
|
14
20
|
strategy:
|
|
15
21
|
fail-fast: false
|
|
16
22
|
matrix:
|
|
17
23
|
ruby: [ '2.6', '2.5', '2.4' ]
|
|
24
|
+
experimental: [false]
|
|
25
|
+
include:
|
|
26
|
+
- ruby: '2.7'
|
|
27
|
+
experimental: true
|
|
18
28
|
steps:
|
|
19
29
|
- uses: actions/checkout@master
|
|
20
30
|
- name: Use Ruby
|
|
21
31
|
uses: actions/setup-ruby@v1
|
|
22
32
|
with:
|
|
23
33
|
ruby-version: ${{ matrix.ruby }}
|
|
24
|
-
architecture: 'x64'
|
|
25
34
|
- name: Update gems
|
|
26
35
|
run: |
|
|
27
36
|
gem install bundler
|
|
@@ -29,15 +38,19 @@ jobs:
|
|
|
29
38
|
- name: Run specs
|
|
30
39
|
run: |
|
|
31
40
|
bundle exec rake
|
|
32
|
-
- name: Trigger
|
|
33
|
-
if:
|
|
41
|
+
- name: Trigger repositories
|
|
42
|
+
if: matrix.ruby == '2.6'
|
|
34
43
|
env:
|
|
35
|
-
GH_USERNAME:
|
|
36
|
-
GH_ACCESS_TOKEN: ${{ secrets.
|
|
44
|
+
GH_USERNAME: metanorma-ci
|
|
45
|
+
GH_ACCESS_TOKEN: ${{ secrets.METANORMA_CI_PAT_TOKEN }}
|
|
37
46
|
run: |
|
|
38
47
|
curl -LO --retry 3 https://raw.githubusercontent.com/metanorma/metanorma-build-scripts/master/trigger-gh-actions.sh
|
|
39
48
|
[[ -f ".github/workflows/dependent_repos.env" ]] && source .github/workflows/dependent_repos.env
|
|
40
|
-
|
|
49
|
+
CLIENT_PAYLOAD=$(cat <<EOF
|
|
50
|
+
"{ "ref": "${GITHUB_REF}", "repo": "${GITHUB_REPOSITORY}" }"
|
|
51
|
+
EOF
|
|
52
|
+
)
|
|
53
|
+
for repo in $REPOS
|
|
41
54
|
do
|
|
42
|
-
sh trigger-gh-actions.sh $ORGANISATION $repo $GH_USERNAME $GH_ACCESS_TOKEN $GITHUB_REPOSITORY "
|
|
55
|
+
sh trigger-gh-actions.sh $ORGANISATION $repo $GH_USERNAME $GH_ACCESS_TOKEN $GITHUB_REPOSITORY "$CLIENT_PAYLOAD"
|
|
43
56
|
done
|
|
@@ -6,22 +6,29 @@ on:
|
|
|
6
6
|
push:
|
|
7
7
|
branches: [ master ]
|
|
8
8
|
pull_request:
|
|
9
|
+
paths-ignore:
|
|
10
|
+
- .github/workflows/macos.yml
|
|
11
|
+
- .github/workflows/ubuntu.yml
|
|
9
12
|
|
|
10
13
|
jobs:
|
|
11
14
|
test-windows:
|
|
12
15
|
name: Test on Ruby ${{ matrix.ruby }} Windows
|
|
13
16
|
runs-on: windows-latest
|
|
17
|
+
continue-on-error: ${{ matrix.experimental }}
|
|
14
18
|
strategy:
|
|
15
19
|
fail-fast: false
|
|
16
20
|
matrix:
|
|
17
21
|
ruby: [ '2.6', '2.5', '2.4' ]
|
|
22
|
+
experimental: [false]
|
|
23
|
+
include:
|
|
24
|
+
- ruby: '2.7'
|
|
25
|
+
experimental: true
|
|
18
26
|
steps:
|
|
19
27
|
- uses: actions/checkout@master
|
|
20
28
|
- name: Use Ruby
|
|
21
29
|
uses: actions/setup-ruby@v1
|
|
22
30
|
with:
|
|
23
31
|
ruby-version: ${{ matrix.ruby }}
|
|
24
|
-
architecture: 'x64'
|
|
25
32
|
- name: Update gems
|
|
26
33
|
shell: pwsh
|
|
27
34
|
run: |
|
|
@@ -88,7 +88,7 @@
|
|
|
88
88
|
<text/>
|
|
89
89
|
</element>
|
|
90
90
|
</define>
|
|
91
|
-
<define name="
|
|
91
|
+
<define name="LocalizedString1">
|
|
92
92
|
<optional>
|
|
93
93
|
<!-- multiple languages and scripts possible: comma delimit them if so -->
|
|
94
94
|
<attribute name="language"/>
|
|
@@ -98,6 +98,16 @@
|
|
|
98
98
|
</optional>
|
|
99
99
|
<text/>
|
|
100
100
|
</define>
|
|
101
|
+
<define name="LocalizedString">
|
|
102
|
+
<choice>
|
|
103
|
+
<ref name="LocalizedString1"/>
|
|
104
|
+
<oneOrMore>
|
|
105
|
+
<element name="variant">
|
|
106
|
+
<ref name="LocalizedString1"/>
|
|
107
|
+
</element>
|
|
108
|
+
</oneOrMore>
|
|
109
|
+
</choice>
|
|
110
|
+
</define>
|
|
101
111
|
<!--
|
|
102
112
|
Unlike UML, change type to format: type is overloaded
|
|
103
113
|
Would be need if plain were default value and could omit the attribute
|
|
@@ -121,7 +131,7 @@
|
|
|
121
131
|
</optional>
|
|
122
132
|
<ref name="LocalizedStringOrXsAny"/>
|
|
123
133
|
</define>
|
|
124
|
-
<define name="
|
|
134
|
+
<define name="LocalizedStringOrXsAny1">
|
|
125
135
|
<optional>
|
|
126
136
|
<!-- multiple languages and scripts possible: comma delimit them if so -->
|
|
127
137
|
<attribute name="language"/>
|
|
@@ -136,6 +146,16 @@
|
|
|
136
146
|
</choice>
|
|
137
147
|
</oneOrMore>
|
|
138
148
|
</define>
|
|
149
|
+
<define name="LocalizedStringOrXsAny">
|
|
150
|
+
<choice>
|
|
151
|
+
<ref name="LocalizedStringOrXsAny1"/>
|
|
152
|
+
<oneOrMore>
|
|
153
|
+
<element name="variant">
|
|
154
|
+
<ref name="LocalizedStringOrXsAny1"/>
|
|
155
|
+
</element>
|
|
156
|
+
</oneOrMore>
|
|
157
|
+
</choice>
|
|
158
|
+
</define>
|
|
139
159
|
<define name="contributor">
|
|
140
160
|
<element name="contributor">
|
|
141
161
|
<zeroOrMore>
|
|
@@ -512,7 +532,7 @@
|
|
|
512
532
|
</define>
|
|
513
533
|
<define name="LocalityType">
|
|
514
534
|
<data type="string">
|
|
515
|
-
<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>
|
|
516
536
|
</data>
|
|
517
537
|
</define>
|
|
518
538
|
<define name="referenceFrom">
|
|
@@ -641,9 +661,9 @@
|
|
|
641
661
|
<optional>
|
|
642
662
|
<ref name="status"/>
|
|
643
663
|
</optional>
|
|
644
|
-
<
|
|
664
|
+
<zeroOrMore>
|
|
645
665
|
<ref name="copyright"/>
|
|
646
|
-
</
|
|
666
|
+
</zeroOrMore>
|
|
647
667
|
<zeroOrMore>
|
|
648
668
|
<ref name="docrelation"/>
|
|
649
669
|
</zeroOrMore>
|
|
@@ -1001,7 +1021,17 @@
|
|
|
1001
1021
|
<optional>
|
|
1002
1022
|
<ref name="to"/>
|
|
1003
1023
|
</optional>
|
|
1004
|
-
<
|
|
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/>
|
|
1005
1035
|
</element>
|
|
1006
1036
|
</define>
|
|
1007
1037
|
<define name="from">
|
|
@@ -24,7 +24,8 @@ module Asciidoctor
|
|
|
24
24
|
|
|
25
25
|
def baselocation(loc)
|
|
26
26
|
return nil if loc.nil?
|
|
27
|
-
File.expand_path(File.join(File.dirname(
|
|
27
|
+
File.expand_path(File.join(File.dirname(
|
|
28
|
+
self.class::_file || __FILE__), "..", "..", "..", loc))
|
|
28
29
|
end
|
|
29
30
|
|
|
30
31
|
def metadata_author(node, xml)
|
|
@@ -138,20 +139,19 @@ module Asciidoctor
|
|
|
138
139
|
|
|
139
140
|
def document(node)
|
|
140
141
|
read_config_file(node.attr("customize")) if node.attr("customize")
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
ret
|
|
142
|
+
super
|
|
143
|
+
end
|
|
144
|
+
|
|
145
|
+
def outputs(node, ret)
|
|
146
|
+
File.open(@filename + ".xml", "w:UTF-8") { |f| f.write(ret) }
|
|
147
|
+
presentation_xml_converter(node).convert(@filename + ".xml")
|
|
148
|
+
html_converter(node).convert(@filename + ".presentation.xml",
|
|
149
|
+
nil, false, "#{@filename}.html")
|
|
150
|
+
doc_converter(node).convert(@filename + ".presentation.xml",
|
|
151
|
+
nil, false, "#{@filename}.doc")
|
|
152
|
+
pdf_converter(node)&.convert(@filename + ".presentation.xml",
|
|
153
|
+
nil, false, "#{@filename}.pdf")
|
|
154
|
+
|
|
155
155
|
end
|
|
156
156
|
|
|
157
157
|
def validate(doc)
|
|
@@ -191,11 +191,15 @@ module Asciidoctor
|
|
|
191
191
|
IsoDoc::Generic::HtmlConvert.new(html_extract_attributes(node))
|
|
192
192
|
end
|
|
193
193
|
|
|
194
|
+
def presentation_xml_converter(node)
|
|
195
|
+
IsoDoc::Generic::PresentationXMLConvert.new(html_extract_attributes(node))
|
|
196
|
+
end
|
|
197
|
+
|
|
194
198
|
alias_method :pdf_converter, :html_converter
|
|
195
199
|
alias_method :style, :blank_method
|
|
196
200
|
alias_method :title_validate, :blank_method
|
|
197
201
|
|
|
198
|
-
def
|
|
202
|
+
def doc_converter(node)
|
|
199
203
|
IsoDoc::Generic::WordConvert.new(doc_extract_attributes(node))
|
|
200
204
|
end
|
|
201
205
|
|
|
@@ -206,7 +210,7 @@ module Asciidoctor
|
|
|
206
210
|
def boilerplate_isodoc(xmldoc)
|
|
207
211
|
conv = super
|
|
208
212
|
Metanorma::Generic::Configuration::CONFIG_ATTRS.each do |a|
|
|
209
|
-
conv.
|
|
213
|
+
conv.i18n.set(a, configuration.send(a))
|
|
210
214
|
end
|
|
211
215
|
conv
|
|
212
216
|
end
|
|
@@ -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">
|