metanorma-iec 1.0.4 → 1.0.9
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 +8 -7
- data/.github/workflows/ubuntu.yml +12 -9
- data/.github/workflows/windows.yml +8 -8
- data/lib/asciidoctor/iec/biblio.rng +89 -32
- data/lib/asciidoctor/iec/converter.rb +8 -0
- data/lib/asciidoctor/iec/front.rb +3 -3
- data/lib/asciidoctor/iec/isodoc.rng +475 -2
- data/lib/asciidoctor/iec/isostandard.rng +12 -1
- data/lib/asciidoctor/iec/reqt.rng +23 -0
- data/lib/isodoc/iec/base_convert.rb +17 -3
- data/lib/isodoc/iec/html/htmlstyle.scss +6 -6
- data/lib/isodoc/iec/html/isodoc.scss +15 -9
- data/lib/isodoc/iec/html/scripts.html +23 -21
- data/lib/isodoc/iec/html/wordstyle.scss +0 -3
- data/lib/isodoc/iec/html_convert.rb +8 -0
- data/lib/isodoc/iec/iec.international-standard.xsl +4133 -0
- data/lib/isodoc/iec/pdf_convert.rb +31 -0
- data/lib/isodoc/iec/word_convert.rb +17 -6
- data/lib/metanorma-iec.rb +1 -0
- data/lib/metanorma/iec/processor.rb +12 -1
- data/lib/metanorma/iec/version.rb +1 -1
- data/spec/asciidoctor-iec/base_spec.rb +9 -23
- data/spec/asciidoctor-iec/blocks_spec.rb +4 -4
- data/spec/asciidoctor-iec/cleanup_spec.rb +8 -6
- data/spec/asciidoctor-iec/iev_spec.rb +4 -4
- data/spec/asciidoctor-iec/inline_spec.rb +2 -1
- data/spec/asciidoctor-iec/section_spec.rb +8 -8
- data/spec/assets/iso.xml +65 -2
- data/spec/examples/rice.html +5 -5
- data/spec/isodoc/blocks_spec.rb +154 -0
- data/spec/isodoc/i18n_spec.rb +17 -25
- data/spec/isodoc/iev_spec.rb +15 -14
- data/spec/isodoc/inline_spec.rb +11 -11
- data/spec/isodoc/iso_spec.rb +6 -23
- data/spec/isodoc/metadata_spec.rb +90 -7
- data/spec/isodoc/postproc_spec.rb +10 -4
- data/spec/isodoc/ref_spec.rb +249 -0
- data/spec/isodoc/section_spec.rb +53 -20
- data/spec/isodoc/terms_spec.rb +12 -14
- data/spec/metanorma/processor_spec.rb +3 -6
- data/spec/spec_helper.rb +7 -0
- metadata +6 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 4b6ff62f9dcd74b090c2c917d2f3cf3a9e9189871366b83f04b21a2a1ee44571
|
|
4
|
+
data.tar.gz: 758d89c6fb5a0216f88015336dab11e0932c3c175e13c3841f48d56e62e66b8c
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: a41f914c5b7ea225c7d3adf8ea80fa6690be071dc91461c1e35a4385f54a9cabe4f7bffe9755c087d0bbe88593f18f978cb3ff448e5bb86e6444efc1300b7aa3
|
|
7
|
+
data.tar.gz: af7f0b65f1ffd961edbad483ec865f3bd26a25cf247bff849c5950239f434a046b84f1b432eec91b117ea9cedf822f0d1f06dcb62ee74c66fe7ceb62445f5f4b
|
data/.github/workflows/macos.yml
CHANGED
|
@@ -6,15 +6,23 @@ 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
|
|
@@ -26,13 +34,6 @@ jobs:
|
|
|
26
34
|
run: |
|
|
27
35
|
sudo gem install bundler --force
|
|
28
36
|
bundle install --jobs 4 --retry 3
|
|
29
|
-
- name: Use Node
|
|
30
|
-
uses: actions/setup-node@v1
|
|
31
|
-
with:
|
|
32
|
-
node-version: '8'
|
|
33
|
-
- name: Install Puppeteer
|
|
34
|
-
run: |
|
|
35
|
-
npm install -g puppeteer
|
|
36
37
|
- name: Run specs
|
|
37
38
|
run: |
|
|
38
39
|
bundle exec rake
|
|
@@ -5,16 +5,26 @@ 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
|
|
@@ -26,18 +36,11 @@ jobs:
|
|
|
26
36
|
run: |
|
|
27
37
|
gem install bundler
|
|
28
38
|
bundle install --jobs 4 --retry 3
|
|
29
|
-
- name: Use Node
|
|
30
|
-
uses: actions/setup-node@v1
|
|
31
|
-
with:
|
|
32
|
-
node-version: '8'
|
|
33
|
-
- name: Install Puppeteer
|
|
34
|
-
run: |
|
|
35
|
-
npm install -g puppeteer
|
|
36
39
|
- name: Run specs
|
|
37
40
|
run: |
|
|
38
41
|
bundle exec rake
|
|
39
42
|
- name: Trigger dependent repositories
|
|
40
|
-
if: github.ref == 'refs/heads/master'
|
|
43
|
+
if: github.ref == 'refs/heads/master' && matrix.ruby == '2.6'
|
|
41
44
|
env:
|
|
42
45
|
GH_USERNAME: ${{ secrets.PAT_USERNAME }}
|
|
43
46
|
GH_ACCESS_TOKEN: ${{ secrets.PAT_TOKEN }}
|
|
@@ -46,5 +49,5 @@ jobs:
|
|
|
46
49
|
[[ -f ".github/workflows/dependent_repos.env" ]] && source .github/workflows/dependent_repos.env
|
|
47
50
|
for repo in $DEPENDENT_REPOS
|
|
48
51
|
do
|
|
49
|
-
sh trigger-gh-actions.sh $ORGANISATION $repo $GH_USERNAME $GH_ACCESS_TOKEN $GITHUB_REPOSITORY
|
|
52
|
+
sh trigger-gh-actions.sh $ORGANISATION $repo $GH_USERNAME $GH_ACCESS_TOKEN $GITHUB_REPOSITORY "{ \"ref\": \"${GITHUB_REF}\" }"
|
|
50
53
|
done
|
|
@@ -6,15 +6,23 @@ 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
|
|
@@ -27,15 +35,7 @@ jobs:
|
|
|
27
35
|
run: |
|
|
28
36
|
gem install bundler
|
|
29
37
|
bundle config --local path vendor/bundle
|
|
30
|
-
bundle update
|
|
31
38
|
bundle install --jobs 4 --retry 3
|
|
32
|
-
- name: Use Node
|
|
33
|
-
uses: actions/setup-node@v1
|
|
34
|
-
with:
|
|
35
|
-
node-version: '8'
|
|
36
|
-
- name: Install Puppeteer
|
|
37
|
-
run: |
|
|
38
|
-
npm install -g puppeteer
|
|
39
39
|
- name: Run specs
|
|
40
40
|
run: |
|
|
41
41
|
bundle exec rake
|
|
@@ -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>
|
|
@@ -767,6 +787,8 @@
|
|
|
767
787
|
<value>unchanged</value>
|
|
768
788
|
<value>circulated</value>
|
|
769
789
|
<value>adapted</value>
|
|
790
|
+
<value>vote-started</value>
|
|
791
|
+
<value>vote-ended</value>
|
|
770
792
|
</choice>
|
|
771
793
|
</define>
|
|
772
794
|
<define name="bdate">
|
|
@@ -999,7 +1021,17 @@
|
|
|
999
1021
|
<optional>
|
|
1000
1022
|
<ref name="to"/>
|
|
1001
1023
|
</optional>
|
|
1002
|
-
<
|
|
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/>
|
|
1003
1035
|
</element>
|
|
1004
1036
|
</define>
|
|
1005
1037
|
<define name="from">
|
|
@@ -1019,38 +1051,63 @@
|
|
|
1019
1051
|
</define>
|
|
1020
1052
|
<define name="DocRelationType">
|
|
1021
1053
|
<choice>
|
|
1022
|
-
<value>obsoletes</value>
|
|
1023
|
-
<value>obsoletedBy</value>
|
|
1024
|
-
<value>supersedes</value>
|
|
1025
|
-
<value>supersededBy</value>
|
|
1026
|
-
<value>updates</value>
|
|
1027
|
-
<value>updatedBy</value>
|
|
1028
|
-
<value>complements</value>
|
|
1029
|
-
<value>derivedFrom</value>
|
|
1030
|
-
<value>translatedFrom</value>
|
|
1031
|
-
<value>hasTranslation</value>
|
|
1032
|
-
<value>adoptedFrom</value>
|
|
1033
|
-
<value>equivalent</value>
|
|
1034
|
-
<value>identical</value>
|
|
1035
|
-
<value>nonequivalent</value>
|
|
1036
|
-
<value>includedIn</value>
|
|
1037
1054
|
<value>includes</value>
|
|
1038
|
-
<value>
|
|
1039
|
-
<value>instanceOf</value>
|
|
1040
|
-
<value>partOf</value>
|
|
1055
|
+
<value>includedIn</value>
|
|
1041
1056
|
<value>hasPart</value>
|
|
1042
|
-
<value>
|
|
1043
|
-
<value>draftOf</value>
|
|
1057
|
+
<value>partOf</value>
|
|
1044
1058
|
<value>merges</value>
|
|
1059
|
+
<value>mergedInto</value>
|
|
1045
1060
|
<value>splits</value>
|
|
1046
|
-
<value>
|
|
1047
|
-
<value>
|
|
1048
|
-
<value>
|
|
1049
|
-
<value>
|
|
1050
|
-
<value>
|
|
1051
|
-
<value>
|
|
1061
|
+
<value>splitInto</value>
|
|
1062
|
+
<value>instance</value>
|
|
1063
|
+
<value>hasInstance</value>
|
|
1064
|
+
<value>exemplarOf</value>
|
|
1065
|
+
<value>hasExemplar</value>
|
|
1066
|
+
<value>manifestationOf</value>
|
|
1067
|
+
<value>hasManifestation</value>
|
|
1068
|
+
<value>reproductionOf</value>
|
|
1069
|
+
<value>hasReproduction</value>
|
|
1070
|
+
<value>reprintOf</value>
|
|
1071
|
+
<value>hasReprint</value>
|
|
1072
|
+
<value>expressionOf</value>
|
|
1073
|
+
<value>hasExpression</value>
|
|
1074
|
+
<value>translatedFrom</value>
|
|
1075
|
+
<value>hasTranslation</value>
|
|
1076
|
+
<value>arrangementOf</value>
|
|
1077
|
+
<value>hasArrangement</value>
|
|
1078
|
+
<value>abridgementOf</value>
|
|
1079
|
+
<value>hasAbridgement</value>
|
|
1080
|
+
<value>annotationOf</value>
|
|
1081
|
+
<value>hasAnnotation</value>
|
|
1082
|
+
<value>draftOf</value>
|
|
1083
|
+
<value>hasDraft</value>
|
|
1084
|
+
<value>editionOf</value>
|
|
1085
|
+
<value>hasEdition</value>
|
|
1086
|
+
<value>updates</value>
|
|
1087
|
+
<value>updatedBy</value>
|
|
1088
|
+
<value>derivedFrom</value>
|
|
1089
|
+
<value>derives</value>
|
|
1052
1090
|
<value>describes</value>
|
|
1053
1091
|
<value>describedBy</value>
|
|
1092
|
+
<value>catalogues</value>
|
|
1093
|
+
<value>cataloguedBy</value>
|
|
1094
|
+
<value>hasSuccessor</value>
|
|
1095
|
+
<value>successorOf</value>
|
|
1096
|
+
<value>adaptedFrom</value>
|
|
1097
|
+
<value>hasAdaptation</value>
|
|
1098
|
+
<value>adoptedFrom</value>
|
|
1099
|
+
<value>adoptedAs</value>
|
|
1100
|
+
<value>reviewOf</value>
|
|
1101
|
+
<value>hasReview</value>
|
|
1102
|
+
<value>commentaryOf</value>
|
|
1103
|
+
<value>hasCommentary</value>
|
|
1104
|
+
<value>related</value>
|
|
1105
|
+
<value>complements</value>
|
|
1106
|
+
<value>complementOf</value>
|
|
1107
|
+
<value>obsoletes</value>
|
|
1108
|
+
<value>obsoletedBy</value>
|
|
1109
|
+
<value>cited</value>
|
|
1110
|
+
<value>isCitedIn</value>
|
|
1054
1111
|
</choice>
|
|
1055
1112
|
</define>
|
|
1056
1113
|
<define name="docrelation">
|
|
@@ -62,6 +62,11 @@ module Asciidoctor
|
|
|
62
62
|
IsoDoc::Iec::WordConvert.new(doc_extract_attributes(node))
|
|
63
63
|
end
|
|
64
64
|
|
|
65
|
+
def pdf_converter(node)
|
|
66
|
+
node.nil? ? IsoDoc::Iec::PdfConvert.new({}) :
|
|
67
|
+
IsoDoc::Iec::PdfConvert.new(doc_extract_attributes(node))
|
|
68
|
+
end
|
|
69
|
+
|
|
65
70
|
def norm_ref_preface(f)
|
|
66
71
|
return super unless @is_iev
|
|
67
72
|
f.at("./title").next =
|
|
@@ -71,6 +76,9 @@ module Asciidoctor
|
|
|
71
76
|
def term_defs_boilerplate(div, source, term, preface, isodoc)
|
|
72
77
|
return super unless @is_iev
|
|
73
78
|
end
|
|
79
|
+
|
|
80
|
+
def sts_converter(node)
|
|
81
|
+
end
|
|
74
82
|
end
|
|
75
83
|
end
|
|
76
84
|
end
|
|
@@ -37,9 +37,9 @@ module Asciidoctor
|
|
|
37
37
|
return unless node.attr("docnumber")
|
|
38
38
|
part, subpart = node&.attr("partnumber")&.split(/-/)
|
|
39
39
|
dn = add_id_parts(node.attr("docnumber"), part, subpart)
|
|
40
|
-
dn = id_stage_prefix(dn, node)
|
|
40
|
+
dn = id_stage_prefix(dn, node, false)
|
|
41
41
|
dn = id_edition_suffix(dn, node)
|
|
42
|
-
xml.docidentifier dn, **attr_code(type: "
|
|
42
|
+
xml.docidentifier dn, **attr_code(type: "ISO")
|
|
43
43
|
end
|
|
44
44
|
|
|
45
45
|
def id_edition_suffix(dn, node)
|
|
@@ -175,7 +175,7 @@ module Asciidoctor
|
|
|
175
175
|
DOC_STAGE[stage.to_sym] || "??"
|
|
176
176
|
end
|
|
177
177
|
|
|
178
|
-
def stage_name(stage, substage)
|
|
178
|
+
def stage_name(stage, substage, _doctype, _iteration)
|
|
179
179
|
STAGE_NAMES[stage.to_sym]
|
|
180
180
|
end
|
|
181
181
|
|
|
@@ -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>
|
|
@@ -129,6 +519,9 @@
|
|
|
129
519
|
</choice>
|
|
130
520
|
</attribute>
|
|
131
521
|
</optional>
|
|
522
|
+
<attribute name="normative">
|
|
523
|
+
<data type="boolean"/>
|
|
524
|
+
</attribute>
|
|
132
525
|
<optional>
|
|
133
526
|
<ref name="section-title"/>
|
|
134
527
|
</optional>
|
|
@@ -154,6 +547,30 @@
|
|
|
154
547
|
<attribute name="id">
|
|
155
548
|
<data type="ID"/>
|
|
156
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>
|
|
157
574
|
<oneOrMore>
|
|
158
575
|
<choice>
|
|
159
576
|
<ref name="paragraph"/>
|
|
@@ -305,6 +722,21 @@
|
|
|
305
722
|
</define>
|
|
306
723
|
</include>
|
|
307
724
|
<!-- end overrides -->
|
|
725
|
+
<define name="TextElement" combine="choice">
|
|
726
|
+
<ref name="concept"/>
|
|
727
|
+
</define>
|
|
728
|
+
<define name="concept">
|
|
729
|
+
<element name="concept">
|
|
730
|
+
<optional>
|
|
731
|
+
<attribute name="term"/>
|
|
732
|
+
</optional>
|
|
733
|
+
<choice>
|
|
734
|
+
<ref name="eref"/>
|
|
735
|
+
<ref name="xref"/>
|
|
736
|
+
<ref name="termref"/>
|
|
737
|
+
</choice>
|
|
738
|
+
</element>
|
|
739
|
+
</define>
|
|
308
740
|
<define name="BasicBlock" combine="choice">
|
|
309
741
|
<choice>
|
|
310
742
|
<ref name="requirement"/>
|
|
@@ -884,7 +1316,36 @@
|
|
|
884
1316
|
<attribute name="id">
|
|
885
1317
|
<data type="ID"/>
|
|
886
1318
|
</attribute>
|
|
887
|
-
<
|
|
1319
|
+
<optional>
|
|
1320
|
+
<attribute name="unnumbered">
|
|
1321
|
+
<data type="boolean"/>
|
|
1322
|
+
</attribute>
|
|
1323
|
+
</optional>
|
|
1324
|
+
<optional>
|
|
1325
|
+
<attribute name="number"/>
|
|
1326
|
+
</optional>
|
|
1327
|
+
<optional>
|
|
1328
|
+
<attribute name="subsequence"/>
|
|
1329
|
+
</optional>
|
|
1330
|
+
<optional>
|
|
1331
|
+
<attribute name="keep-with-next">
|
|
1332
|
+
<data type="boolean"/>
|
|
1333
|
+
</attribute>
|
|
1334
|
+
</optional>
|
|
1335
|
+
<optional>
|
|
1336
|
+
<attribute name="keep-lines-together">
|
|
1337
|
+
<data type="boolean"/>
|
|
1338
|
+
</attribute>
|
|
1339
|
+
</optional>
|
|
1340
|
+
<oneOrMore>
|
|
1341
|
+
<choice>
|
|
1342
|
+
<ref name="paragraph"/>
|
|
1343
|
+
<ref name="ul"/>
|
|
1344
|
+
<ref name="ol"/>
|
|
1345
|
+
<ref name="dl"/>
|
|
1346
|
+
<ref name="formula"/>
|
|
1347
|
+
</choice>
|
|
1348
|
+
</oneOrMore>
|
|
888
1349
|
</element>
|
|
889
1350
|
</define>
|
|
890
1351
|
<define name="termexample">
|
|
@@ -911,7 +1372,10 @@
|
|
|
911
1372
|
</define>
|
|
912
1373
|
<define name="origin">
|
|
913
1374
|
<element name="origin">
|
|
914
|
-
<
|
|
1375
|
+
<choice>
|
|
1376
|
+
<ref name="erefType"/>
|
|
1377
|
+
<ref name="termref"/>
|
|
1378
|
+
</choice>
|
|
915
1379
|
</element>
|
|
916
1380
|
</define>
|
|
917
1381
|
<define name="modification">
|
|
@@ -919,6 +1383,15 @@
|
|
|
919
1383
|
<ref name="paragraph"/>
|
|
920
1384
|
</element>
|
|
921
1385
|
</define>
|
|
1386
|
+
<define name="termref">
|
|
1387
|
+
<element name="termref">
|
|
1388
|
+
<attribute name="base"/>
|
|
1389
|
+
<attribute name="target"/>
|
|
1390
|
+
<optional>
|
|
1391
|
+
<text/>
|
|
1392
|
+
</optional>
|
|
1393
|
+
</element>
|
|
1394
|
+
</define>
|
|
922
1395
|
<define name="structuredidentifier">
|
|
923
1396
|
<element name="structuredidentifier">
|
|
924
1397
|
<optional>
|