metanorma-generic 1.9.0 → 1.10.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/workflows/rake.yml +11 -33
- data/.gitignore +2 -0
- data/.hound.yml +3 -1
- data/.rubocop.yml +7 -7
- data/lib/asciidoctor/generic/biblio.rng +5 -6
- data/lib/asciidoctor/generic/generic.rng +9 -0
- data/lib/asciidoctor/generic/isodoc.rng +499 -13
- data/lib/asciidoctor/generic/reqt.rng +15 -4
- data/lib/isodoc/generic.rb +0 -1
- data/lib/isodoc/generic/html_convert.rb +1 -2
- data/lib/isodoc/generic/metadata.rb +26 -21
- data/lib/metanorma/generic/processor.rb +9 -28
- data/lib/metanorma/generic/version.rb +1 -1
- data/metanorma-generic.gemspec +10 -10
- metadata +36 -41
- data/.rubocop.ribose.yml +0 -66
- data/.rubocop.tb.yml +0 -650
- data/lib/isodoc/generic/pdf_convert.rb +0 -66
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 25641110b45e76829391dc1a8d7558ed8a57b1c205ed3edd68b7691e13efffa4
|
|
4
|
+
data.tar.gz: 7370721bedccaca54ee3277d9d03a96af28582c3a787b75900971e812992b4f0
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 783da8466b07f8e9afc0bb8553e1363b8587a4b5883371b0db5611f53fce39a2ae2dd990c556e65424511bf4241f451d9efc3cddbf75644f9d93760416477aad
|
|
7
|
+
data.tar.gz: 4dac2a50657d08b05e23e4c3e2ad59c200d9a3413e1ec37077b233a4a6c4b9e3ec31deb25d40f278dfe2e77460fbc21237b1461995da82fed95eae7aa4f02521
|
data/.github/workflows/rake.yml
CHANGED
|
@@ -4,7 +4,7 @@ name: rake
|
|
|
4
4
|
|
|
5
5
|
on:
|
|
6
6
|
push:
|
|
7
|
-
branches: [ master, main
|
|
7
|
+
branches: [ master, main ]
|
|
8
8
|
tags: [ v* ]
|
|
9
9
|
pull_request:
|
|
10
10
|
|
|
@@ -16,38 +16,18 @@ jobs:
|
|
|
16
16
|
strategy:
|
|
17
17
|
fail-fast: false
|
|
18
18
|
matrix:
|
|
19
|
-
ruby: [ '2.
|
|
19
|
+
ruby: [ '3.0', '2.7', '2.6', '2.5' ]
|
|
20
20
|
os: [ ubuntu-latest, windows-latest, macos-latest ]
|
|
21
21
|
experimental: [ false ]
|
|
22
|
-
include:
|
|
23
|
-
- ruby: '2.7'
|
|
24
|
-
os: 'ubuntu-latest'
|
|
25
|
-
experimental: true
|
|
26
|
-
- ruby: '2.7'
|
|
27
|
-
os: 'windows-latest'
|
|
28
|
-
experimental: true
|
|
29
|
-
- ruby: '2.7'
|
|
30
|
-
os: 'macos-latest'
|
|
31
|
-
experimental: true
|
|
32
22
|
steps:
|
|
33
|
-
- uses: actions/checkout@
|
|
23
|
+
- uses: actions/checkout@v2
|
|
24
|
+
with:
|
|
25
|
+
submodules: true
|
|
34
26
|
|
|
35
27
|
- uses: ruby/setup-ruby@v1
|
|
36
28
|
with:
|
|
37
29
|
ruby-version: ${{ matrix.ruby }}
|
|
38
|
-
|
|
39
|
-
- if: matrix.os == 'macos-latest'
|
|
40
|
-
run: brew install autoconf automake libtool
|
|
41
|
-
|
|
42
|
-
- uses: actions/cache@v2
|
|
43
|
-
with:
|
|
44
|
-
path: vendor/bundle
|
|
45
|
-
key: bundle-${{ matrix.os }}-${{ matrix.ruby }}-${{ hashFiles('**/*.gemspec') }}
|
|
46
|
-
restore-keys: bundle-${{ matrix.os }}-${{ matrix.ruby }}
|
|
47
|
-
|
|
48
|
-
- run: bundle config set path 'vendor/bundle'
|
|
49
|
-
|
|
50
|
-
- run: bundle install --jobs 4 --retry 3
|
|
30
|
+
bundler-cache: true
|
|
51
31
|
|
|
52
32
|
- run: bundle exec rake
|
|
53
33
|
|
|
@@ -55,11 +35,9 @@ jobs:
|
|
|
55
35
|
needs: rake
|
|
56
36
|
runs-on: ubuntu-latest
|
|
57
37
|
steps:
|
|
58
|
-
-
|
|
59
|
-
uses: Sibz/github-status-action@v1
|
|
38
|
+
- uses: peter-evans/repository-dispatch@v1
|
|
60
39
|
with:
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
sha: ${{ github.event.pull_request.head.sha || github.sha }}
|
|
40
|
+
token: ${{ secrets.METANORMA_CI_PAT_TOKEN || secrets.GITHUB_TOKEN }}
|
|
41
|
+
repository: ${{ github.repository }}
|
|
42
|
+
event-type: tests-passed
|
|
43
|
+
client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'
|
data/.gitignore
CHANGED
data/.hound.yml
CHANGED
data/.rubocop.yml
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
#
|
|
2
|
-
# https://github.com/
|
|
3
|
-
# All project-specific additions and overrides should be specified in this file.
|
|
4
|
-
|
|
1
|
+
# Auto-generated by Cimas: Do not edit it manually!
|
|
2
|
+
# See https://github.com/metanorma/cimas
|
|
5
3
|
inherit_from:
|
|
6
4
|
- https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
|
|
5
|
+
|
|
6
|
+
# local repo-specific modifications
|
|
7
|
+
# ...
|
|
8
|
+
|
|
7
9
|
AllCops:
|
|
8
|
-
TargetRubyVersion: 2.
|
|
9
|
-
Rails:
|
|
10
|
-
Enabled: true
|
|
10
|
+
TargetRubyVersion: 2.5
|
|
@@ -124,7 +124,7 @@
|
|
|
124
124
|
<value>application/tei+xml</value>
|
|
125
125
|
<value>text/x-asciidoc</value>
|
|
126
126
|
<value>text/markdown</value>
|
|
127
|
-
<value>application/x-
|
|
127
|
+
<value>application/x-metanorma+xml</value>
|
|
128
128
|
<text/>
|
|
129
129
|
</choice>
|
|
130
130
|
</attribute>
|
|
@@ -452,6 +452,7 @@
|
|
|
452
452
|
<attribute name="type">
|
|
453
453
|
<choice>
|
|
454
454
|
<value>isni</value>
|
|
455
|
+
<value>orcid</value>
|
|
455
456
|
<value>uri</value>
|
|
456
457
|
</choice>
|
|
457
458
|
</attribute>
|
|
@@ -461,10 +462,7 @@
|
|
|
461
462
|
<define name="org-identifier">
|
|
462
463
|
<element name="identifier">
|
|
463
464
|
<attribute name="type">
|
|
464
|
-
<
|
|
465
|
-
<value>orcid</value>
|
|
466
|
-
<value>uri</value>
|
|
467
|
-
</choice>
|
|
465
|
+
<data type="string" datatypeLibrary=""/>
|
|
468
466
|
</attribute>
|
|
469
467
|
<text/>
|
|
470
468
|
</element>
|
|
@@ -789,6 +787,7 @@
|
|
|
789
787
|
<value>adapted</value>
|
|
790
788
|
<value>vote-started</value>
|
|
791
789
|
<value>vote-ended</value>
|
|
790
|
+
<value>announced</value>
|
|
792
791
|
</choice>
|
|
793
792
|
</define>
|
|
794
793
|
<define name="bdate">
|
|
@@ -1106,7 +1105,7 @@
|
|
|
1106
1105
|
<value>complementOf</value>
|
|
1107
1106
|
<value>obsoletes</value>
|
|
1108
1107
|
<value>obsoletedBy</value>
|
|
1109
|
-
<value>
|
|
1108
|
+
<value>cites</value>
|
|
1110
1109
|
<value>isCitedIn</value>
|
|
1111
1110
|
</choice>
|
|
1112
1111
|
</define>
|
|
@@ -32,6 +32,9 @@
|
|
|
32
32
|
<optional>
|
|
33
33
|
<ref name="doctype"/>
|
|
34
34
|
</optional>
|
|
35
|
+
<optional>
|
|
36
|
+
<ref name="docsubtype"/>
|
|
37
|
+
</optional>
|
|
35
38
|
<ref name="editorialgroup"/>
|
|
36
39
|
<zeroOrMore>
|
|
37
40
|
<ref name="ics"/>
|
|
@@ -70,6 +73,9 @@
|
|
|
70
73
|
<zeroOrMore>
|
|
71
74
|
<ref name="termdocsource"/>
|
|
72
75
|
</zeroOrMore>
|
|
76
|
+
<optional>
|
|
77
|
+
<ref name="misccontainer"/>
|
|
78
|
+
</optional>
|
|
73
79
|
<optional>
|
|
74
80
|
<ref name="boilerplate"/>
|
|
75
81
|
</optional>
|
|
@@ -81,6 +87,9 @@
|
|
|
81
87
|
<ref name="annex"/>
|
|
82
88
|
</zeroOrMore>
|
|
83
89
|
<ref name="bibliography"/>
|
|
90
|
+
<zeroOrMore>
|
|
91
|
+
<ref name="indexsect"/>
|
|
92
|
+
</zeroOrMore>
|
|
84
93
|
</element>
|
|
85
94
|
</define>
|
|
86
95
|
</grammar>
|
|
@@ -32,6 +32,18 @@
|
|
|
32
32
|
<ref name="DocumentType"/>
|
|
33
33
|
</element>
|
|
34
34
|
</define>
|
|
35
|
+
<define name="section-title">
|
|
36
|
+
<element name="title">
|
|
37
|
+
<zeroOrMore>
|
|
38
|
+
<ref name="TextElement"/>
|
|
39
|
+
</zeroOrMore>
|
|
40
|
+
</element>
|
|
41
|
+
<zeroOrMore>
|
|
42
|
+
<element name="variant-title">
|
|
43
|
+
<ref name="TypedTitleString"/>
|
|
44
|
+
</element>
|
|
45
|
+
</zeroOrMore>
|
|
46
|
+
</define>
|
|
35
47
|
<define name="hyperlink">
|
|
36
48
|
<element name="link">
|
|
37
49
|
<attribute name="target">
|
|
@@ -45,6 +57,11 @@
|
|
|
45
57
|
<optional>
|
|
46
58
|
<attribute name="alt"/>
|
|
47
59
|
</optional>
|
|
60
|
+
<optional>
|
|
61
|
+
<attribute name="updatetype">
|
|
62
|
+
<data type="boolean"/>
|
|
63
|
+
</attribute>
|
|
64
|
+
</optional>
|
|
48
65
|
<text/>
|
|
49
66
|
</element>
|
|
50
67
|
</define>
|
|
@@ -86,6 +103,35 @@
|
|
|
86
103
|
<text/>
|
|
87
104
|
</element>
|
|
88
105
|
</define>
|
|
106
|
+
<define name="erefType">
|
|
107
|
+
<optional>
|
|
108
|
+
<attribute name="normative">
|
|
109
|
+
<data type="boolean"/>
|
|
110
|
+
</attribute>
|
|
111
|
+
</optional>
|
|
112
|
+
<attribute name="citeas"/>
|
|
113
|
+
<attribute name="type">
|
|
114
|
+
<ref name="ReferenceFormat"/>
|
|
115
|
+
</attribute>
|
|
116
|
+
<optional>
|
|
117
|
+
<attribute name="alt"/>
|
|
118
|
+
</optional>
|
|
119
|
+
<optional>
|
|
120
|
+
<attribute name="case">
|
|
121
|
+
<choice>
|
|
122
|
+
<value>capital</value>
|
|
123
|
+
<value>lowercase</value>
|
|
124
|
+
</choice>
|
|
125
|
+
</attribute>
|
|
126
|
+
</optional>
|
|
127
|
+
<optional>
|
|
128
|
+
<attribute name="droploc">
|
|
129
|
+
<data type="boolean"/>
|
|
130
|
+
</attribute>
|
|
131
|
+
</optional>
|
|
132
|
+
<ref name="CitationType"/>
|
|
133
|
+
<text/>
|
|
134
|
+
</define>
|
|
89
135
|
<define name="ul">
|
|
90
136
|
<element name="ul">
|
|
91
137
|
<attribute name="id">
|
|
@@ -102,7 +148,7 @@
|
|
|
102
148
|
</attribute>
|
|
103
149
|
</optional>
|
|
104
150
|
<oneOrMore>
|
|
105
|
-
<ref name="
|
|
151
|
+
<ref name="ul_li"/>
|
|
106
152
|
</oneOrMore>
|
|
107
153
|
<zeroOrMore>
|
|
108
154
|
<ref name="note"/>
|
|
@@ -170,6 +216,18 @@
|
|
|
170
216
|
</zeroOrMore>
|
|
171
217
|
</element>
|
|
172
218
|
</define>
|
|
219
|
+
<define name="dt">
|
|
220
|
+
<element name="dt">
|
|
221
|
+
<optional>
|
|
222
|
+
<attribute name="id">
|
|
223
|
+
<data type="ID"/>
|
|
224
|
+
</attribute>
|
|
225
|
+
</optional>
|
|
226
|
+
<zeroOrMore>
|
|
227
|
+
<ref name="TextElement"/>
|
|
228
|
+
</zeroOrMore>
|
|
229
|
+
</element>
|
|
230
|
+
</define>
|
|
173
231
|
<define name="example">
|
|
174
232
|
<element name="example">
|
|
175
233
|
<attribute name="id">
|
|
@@ -514,6 +572,9 @@
|
|
|
514
572
|
</define>
|
|
515
573
|
<define name="BibDataExtensionType">
|
|
516
574
|
<ref name="doctype"/>
|
|
575
|
+
<optional>
|
|
576
|
+
<ref name="docsubtype"/>
|
|
577
|
+
</optional>
|
|
517
578
|
<optional>
|
|
518
579
|
<ref name="editorialgroup"/>
|
|
519
580
|
</optional>
|
|
@@ -775,8 +836,100 @@
|
|
|
775
836
|
<ref name="paragraph"/>
|
|
776
837
|
</element>
|
|
777
838
|
</define>
|
|
839
|
+
<define name="em">
|
|
840
|
+
<element name="em">
|
|
841
|
+
<zeroOrMore>
|
|
842
|
+
<choice>
|
|
843
|
+
<ref name="PureTextElement"/>
|
|
844
|
+
<ref name="stem"/>
|
|
845
|
+
<ref name="index"/>
|
|
846
|
+
</choice>
|
|
847
|
+
</zeroOrMore>
|
|
848
|
+
</element>
|
|
849
|
+
</define>
|
|
850
|
+
<define name="strong">
|
|
851
|
+
<element name="strong">
|
|
852
|
+
<zeroOrMore>
|
|
853
|
+
<choice>
|
|
854
|
+
<ref name="PureTextElement"/>
|
|
855
|
+
<ref name="stem"/>
|
|
856
|
+
<ref name="index"/>
|
|
857
|
+
</choice>
|
|
858
|
+
</zeroOrMore>
|
|
859
|
+
</element>
|
|
860
|
+
</define>
|
|
861
|
+
<define name="tt">
|
|
862
|
+
<element name="tt">
|
|
863
|
+
<zeroOrMore>
|
|
864
|
+
<choice>
|
|
865
|
+
<ref name="PureTextElement"/>
|
|
866
|
+
<ref name="index"/>
|
|
867
|
+
</choice>
|
|
868
|
+
</zeroOrMore>
|
|
869
|
+
</element>
|
|
870
|
+
</define>
|
|
871
|
+
<define name="keyword">
|
|
872
|
+
<element name="keyword">
|
|
873
|
+
<zeroOrMore>
|
|
874
|
+
<choice>
|
|
875
|
+
<ref name="PureTextElement"/>
|
|
876
|
+
<ref name="index"/>
|
|
877
|
+
</choice>
|
|
878
|
+
</zeroOrMore>
|
|
879
|
+
</element>
|
|
880
|
+
</define>
|
|
881
|
+
<define name="strike">
|
|
882
|
+
<element name="strike">
|
|
883
|
+
<zeroOrMore>
|
|
884
|
+
<choice>
|
|
885
|
+
<ref name="PureTextElement"/>
|
|
886
|
+
<ref name="index"/>
|
|
887
|
+
</choice>
|
|
888
|
+
</zeroOrMore>
|
|
889
|
+
</element>
|
|
890
|
+
</define>
|
|
891
|
+
<define name="underline">
|
|
892
|
+
<element name="underline">
|
|
893
|
+
<zeroOrMore>
|
|
894
|
+
<choice>
|
|
895
|
+
<ref name="PureTextElement"/>
|
|
896
|
+
<ref name="index"/>
|
|
897
|
+
</choice>
|
|
898
|
+
</zeroOrMore>
|
|
899
|
+
</element>
|
|
900
|
+
</define>
|
|
901
|
+
<define name="smallcap">
|
|
902
|
+
<element name="smallcap">
|
|
903
|
+
<zeroOrMore>
|
|
904
|
+
<choice>
|
|
905
|
+
<ref name="PureTextElement"/>
|
|
906
|
+
<ref name="index"/>
|
|
907
|
+
</choice>
|
|
908
|
+
</zeroOrMore>
|
|
909
|
+
</element>
|
|
910
|
+
</define>
|
|
911
|
+
<define name="pagebreak">
|
|
912
|
+
<element name="pagebreak">
|
|
913
|
+
<optional>
|
|
914
|
+
<attribute name="orientation">
|
|
915
|
+
<choice>
|
|
916
|
+
<value>landscape</value>
|
|
917
|
+
<value>portrait</value>
|
|
918
|
+
</choice>
|
|
919
|
+
</attribute>
|
|
920
|
+
</optional>
|
|
921
|
+
</element>
|
|
922
|
+
</define>
|
|
778
923
|
</include>
|
|
779
924
|
<!-- end overrides -->
|
|
925
|
+
<define name="docsubtype">
|
|
926
|
+
<element name="subdoctype">
|
|
927
|
+
<ref name="DocumentSubtype"/>
|
|
928
|
+
</element>
|
|
929
|
+
</define>
|
|
930
|
+
<define name="DocumentSubtype">
|
|
931
|
+
<text/>
|
|
932
|
+
</define>
|
|
780
933
|
<define name="colgroup">
|
|
781
934
|
<element name="colgroup">
|
|
782
935
|
<oneOrMore>
|
|
@@ -793,12 +946,67 @@
|
|
|
793
946
|
<value>internal</value>
|
|
794
947
|
</define>
|
|
795
948
|
<define name="TextElement" combine="choice">
|
|
796
|
-
<
|
|
949
|
+
<choice>
|
|
950
|
+
<ref name="concept"/>
|
|
951
|
+
<ref name="add"/>
|
|
952
|
+
<ref name="del"/>
|
|
953
|
+
</choice>
|
|
954
|
+
</define>
|
|
955
|
+
<define name="add">
|
|
956
|
+
<element name="add">
|
|
957
|
+
<choice>
|
|
958
|
+
<ref name="PureTextElement"/>
|
|
959
|
+
<ref name="eref"/>
|
|
960
|
+
<ref name="stem"/>
|
|
961
|
+
<ref name="keyword"/>
|
|
962
|
+
<ref name="xref"/>
|
|
963
|
+
<ref name="hyperlink"/>
|
|
964
|
+
</choice>
|
|
965
|
+
</element>
|
|
966
|
+
</define>
|
|
967
|
+
<define name="del">
|
|
968
|
+
<element name="del">
|
|
969
|
+
<choice>
|
|
970
|
+
<ref name="PureTextElement"/>
|
|
971
|
+
<ref name="eref"/>
|
|
972
|
+
<ref name="stem"/>
|
|
973
|
+
<ref name="keyword"/>
|
|
974
|
+
<ref name="xref"/>
|
|
975
|
+
<ref name="hyperlink"/>
|
|
976
|
+
</choice>
|
|
977
|
+
</element>
|
|
797
978
|
</define>
|
|
798
979
|
<define name="concept">
|
|
799
980
|
<element name="concept">
|
|
800
981
|
<optional>
|
|
801
|
-
<attribute name="
|
|
982
|
+
<attribute name="ital">
|
|
983
|
+
<data type="boolean"/>
|
|
984
|
+
</attribute>
|
|
985
|
+
</optional>
|
|
986
|
+
<optional>
|
|
987
|
+
<attribute name="ref">
|
|
988
|
+
<data type="boolean"/>
|
|
989
|
+
</attribute>
|
|
990
|
+
</optional>
|
|
991
|
+
<optional>
|
|
992
|
+
<element name="refterm">
|
|
993
|
+
<zeroOrMore>
|
|
994
|
+
<choice>
|
|
995
|
+
<ref name="PureTextElement"/>
|
|
996
|
+
<ref name="stem"/>
|
|
997
|
+
</choice>
|
|
998
|
+
</zeroOrMore>
|
|
999
|
+
</element>
|
|
1000
|
+
</optional>
|
|
1001
|
+
<optional>
|
|
1002
|
+
<element name="renderterm">
|
|
1003
|
+
<zeroOrMore>
|
|
1004
|
+
<choice>
|
|
1005
|
+
<ref name="PureTextElement"/>
|
|
1006
|
+
<ref name="stem"/>
|
|
1007
|
+
</choice>
|
|
1008
|
+
</zeroOrMore>
|
|
1009
|
+
</element>
|
|
802
1010
|
</optional>
|
|
803
1011
|
<choice>
|
|
804
1012
|
<ref name="eref"/>
|
|
@@ -812,8 +1020,181 @@
|
|
|
812
1020
|
<ref name="requirement"/>
|
|
813
1021
|
<ref name="recommendation"/>
|
|
814
1022
|
<ref name="permission"/>
|
|
1023
|
+
<ref name="imagemap"/>
|
|
1024
|
+
<ref name="svgmap"/>
|
|
1025
|
+
<ref name="inputform"/>
|
|
1026
|
+
<ref name="toc"/>
|
|
1027
|
+
</choice>
|
|
1028
|
+
</define>
|
|
1029
|
+
<define name="toc">
|
|
1030
|
+
<element name="toc">
|
|
1031
|
+
<ref name="ul"/>
|
|
1032
|
+
</element>
|
|
1033
|
+
</define>
|
|
1034
|
+
<define name="inputform">
|
|
1035
|
+
<element name="form">
|
|
1036
|
+
<attribute name="id">
|
|
1037
|
+
<data type="ID"/>
|
|
1038
|
+
</attribute>
|
|
1039
|
+
<attribute name="name"/>
|
|
1040
|
+
<attribute name="action"/>
|
|
1041
|
+
<optional>
|
|
1042
|
+
<attribute name="class"/>
|
|
1043
|
+
</optional>
|
|
1044
|
+
<zeroOrMore>
|
|
1045
|
+
<choice>
|
|
1046
|
+
<ref name="TextElement"/>
|
|
1047
|
+
<ref name="FormInput"/>
|
|
1048
|
+
</choice>
|
|
1049
|
+
</zeroOrMore>
|
|
1050
|
+
</element>
|
|
1051
|
+
</define>
|
|
1052
|
+
<define name="FormInput">
|
|
1053
|
+
<choice>
|
|
1054
|
+
<ref name="input"/>
|
|
1055
|
+
<ref name="formlabel"/>
|
|
1056
|
+
<ref name="select"/>
|
|
1057
|
+
<ref name="textarea"/>
|
|
815
1058
|
</choice>
|
|
816
1059
|
</define>
|
|
1060
|
+
<define name="InputType">
|
|
1061
|
+
<choice>
|
|
1062
|
+
<value>button</value>
|
|
1063
|
+
<value>checkbox</value>
|
|
1064
|
+
<value>date</value>
|
|
1065
|
+
<value>file</value>
|
|
1066
|
+
<value>password</value>
|
|
1067
|
+
<value>radio</value>
|
|
1068
|
+
<value>submit</value>
|
|
1069
|
+
<value>text</value>
|
|
1070
|
+
</choice>
|
|
1071
|
+
</define>
|
|
1072
|
+
<define name="input">
|
|
1073
|
+
<element name="input">
|
|
1074
|
+
<attribute name="type">
|
|
1075
|
+
<ref name="InputType"/>
|
|
1076
|
+
</attribute>
|
|
1077
|
+
<optional>
|
|
1078
|
+
<attribute name="checked">
|
|
1079
|
+
<data type="boolean"/>
|
|
1080
|
+
</attribute>
|
|
1081
|
+
</optional>
|
|
1082
|
+
<optional>
|
|
1083
|
+
<attribute name="disabled">
|
|
1084
|
+
<data type="boolean"/>
|
|
1085
|
+
</attribute>
|
|
1086
|
+
</optional>
|
|
1087
|
+
<optional>
|
|
1088
|
+
<attribute name="readonly">
|
|
1089
|
+
<data type="boolean"/>
|
|
1090
|
+
</attribute>
|
|
1091
|
+
</optional>
|
|
1092
|
+
<optional>
|
|
1093
|
+
<attribute name="maxlength">
|
|
1094
|
+
<data type="int"/>
|
|
1095
|
+
</attribute>
|
|
1096
|
+
</optional>
|
|
1097
|
+
<optional>
|
|
1098
|
+
<attribute name="minlength">
|
|
1099
|
+
<data type="int"/>
|
|
1100
|
+
</attribute>
|
|
1101
|
+
</optional>
|
|
1102
|
+
<optional>
|
|
1103
|
+
<attribute name="name"/>
|
|
1104
|
+
</optional>
|
|
1105
|
+
<optional>
|
|
1106
|
+
<attribute name="value"/>
|
|
1107
|
+
</optional>
|
|
1108
|
+
<optional>
|
|
1109
|
+
<attribute name="id">
|
|
1110
|
+
<data type="ID"/>
|
|
1111
|
+
</attribute>
|
|
1112
|
+
</optional>
|
|
1113
|
+
</element>
|
|
1114
|
+
</define>
|
|
1115
|
+
<define name="formlabel">
|
|
1116
|
+
<element name="label">
|
|
1117
|
+
<attribute name="for">
|
|
1118
|
+
<data type="IDREF"/>
|
|
1119
|
+
</attribute>
|
|
1120
|
+
<zeroOrMore>
|
|
1121
|
+
<ref name="PureTextElement"/>
|
|
1122
|
+
</zeroOrMore>
|
|
1123
|
+
</element>
|
|
1124
|
+
</define>
|
|
1125
|
+
<define name="select">
|
|
1126
|
+
<element name="select">
|
|
1127
|
+
<optional>
|
|
1128
|
+
<attribute name="name"/>
|
|
1129
|
+
</optional>
|
|
1130
|
+
<optional>
|
|
1131
|
+
<attribute name="value"/>
|
|
1132
|
+
</optional>
|
|
1133
|
+
<optional>
|
|
1134
|
+
<attribute name="id">
|
|
1135
|
+
<data type="ID"/>
|
|
1136
|
+
</attribute>
|
|
1137
|
+
</optional>
|
|
1138
|
+
<optional>
|
|
1139
|
+
<attribute name="disabled">
|
|
1140
|
+
<data type="boolean"/>
|
|
1141
|
+
</attribute>
|
|
1142
|
+
</optional>
|
|
1143
|
+
<optional>
|
|
1144
|
+
<attribute name="multiple">
|
|
1145
|
+
<data type="boolean"/>
|
|
1146
|
+
</attribute>
|
|
1147
|
+
</optional>
|
|
1148
|
+
<optional>
|
|
1149
|
+
<attribute name="size">
|
|
1150
|
+
<data type="int"/>
|
|
1151
|
+
</attribute>
|
|
1152
|
+
</optional>
|
|
1153
|
+
<oneOrMore>
|
|
1154
|
+
<ref name="option"/>
|
|
1155
|
+
</oneOrMore>
|
|
1156
|
+
</element>
|
|
1157
|
+
</define>
|
|
1158
|
+
<define name="option">
|
|
1159
|
+
<element name="option">
|
|
1160
|
+
<optional>
|
|
1161
|
+
<attribute name="disabled">
|
|
1162
|
+
<data type="boolean"/>
|
|
1163
|
+
</attribute>
|
|
1164
|
+
</optional>
|
|
1165
|
+
<optional>
|
|
1166
|
+
<attribute name="value"/>
|
|
1167
|
+
</optional>
|
|
1168
|
+
<zeroOrMore>
|
|
1169
|
+
<ref name="PureTextElement"/>
|
|
1170
|
+
</zeroOrMore>
|
|
1171
|
+
</element>
|
|
1172
|
+
</define>
|
|
1173
|
+
<define name="textarea">
|
|
1174
|
+
<element name="textarea">
|
|
1175
|
+
<optional>
|
|
1176
|
+
<attribute name="name"/>
|
|
1177
|
+
</optional>
|
|
1178
|
+
<optional>
|
|
1179
|
+
<attribute name="value"/>
|
|
1180
|
+
</optional>
|
|
1181
|
+
<optional>
|
|
1182
|
+
<attribute name="id">
|
|
1183
|
+
<data type="ID"/>
|
|
1184
|
+
</attribute>
|
|
1185
|
+
</optional>
|
|
1186
|
+
<optional>
|
|
1187
|
+
<attribute name="rows">
|
|
1188
|
+
<data type="int"/>
|
|
1189
|
+
</attribute>
|
|
1190
|
+
</optional>
|
|
1191
|
+
<optional>
|
|
1192
|
+
<attribute name="cols">
|
|
1193
|
+
<data type="int"/>
|
|
1194
|
+
</attribute>
|
|
1195
|
+
</optional>
|
|
1196
|
+
</element>
|
|
1197
|
+
</define>
|
|
817
1198
|
<define name="bibliography">
|
|
818
1199
|
<element name="bibliography">
|
|
819
1200
|
<oneOrMore>
|
|
@@ -886,13 +1267,17 @@
|
|
|
886
1267
|
</define>
|
|
887
1268
|
<define name="IsoWorkgroup">
|
|
888
1269
|
<optional>
|
|
889
|
-
<attribute name="number"
|
|
890
|
-
<data type="int"/>
|
|
891
|
-
</attribute>
|
|
1270
|
+
<attribute name="number"/>
|
|
892
1271
|
</optional>
|
|
893
1272
|
<optional>
|
|
894
1273
|
<attribute name="type"/>
|
|
895
1274
|
</optional>
|
|
1275
|
+
<optional>
|
|
1276
|
+
<attribute name="identifier"/>
|
|
1277
|
+
</optional>
|
|
1278
|
+
<optional>
|
|
1279
|
+
<attribute name="prefix"/>
|
|
1280
|
+
</optional>
|
|
896
1281
|
<text/>
|
|
897
1282
|
</define>
|
|
898
1283
|
<define name="ics">
|
|
@@ -917,6 +1302,9 @@
|
|
|
917
1302
|
</choice>
|
|
918
1303
|
</attribute>
|
|
919
1304
|
<ref name="bibdata"/>
|
|
1305
|
+
<optional>
|
|
1306
|
+
<ref name="misccontainer"/>
|
|
1307
|
+
</optional>
|
|
920
1308
|
<optional>
|
|
921
1309
|
<ref name="boilerplate"/>
|
|
922
1310
|
</optional>
|
|
@@ -927,11 +1315,21 @@
|
|
|
927
1315
|
<zeroOrMore>
|
|
928
1316
|
<ref name="annex"/>
|
|
929
1317
|
</zeroOrMore>
|
|
1318
|
+
<optional>
|
|
1319
|
+
<ref name="bibliography"/>
|
|
1320
|
+
</optional>
|
|
930
1321
|
<zeroOrMore>
|
|
931
|
-
<ref name="
|
|
1322
|
+
<ref name="indexsect"/>
|
|
932
1323
|
</zeroOrMore>
|
|
933
1324
|
</element>
|
|
934
1325
|
</define>
|
|
1326
|
+
<define name="misccontainer">
|
|
1327
|
+
<element name="misc-container">
|
|
1328
|
+
<oneOrMore>
|
|
1329
|
+
<ref name="AnyElement"/>
|
|
1330
|
+
</oneOrMore>
|
|
1331
|
+
</element>
|
|
1332
|
+
</define>
|
|
935
1333
|
<define name="preface">
|
|
936
1334
|
<element name="preface">
|
|
937
1335
|
<oneOrMore>
|
|
@@ -955,6 +1353,11 @@
|
|
|
955
1353
|
<ref name="Content-Section"/>
|
|
956
1354
|
</element>
|
|
957
1355
|
</define>
|
|
1356
|
+
<define name="indexsect">
|
|
1357
|
+
<element name="indexsect">
|
|
1358
|
+
<ref name="Content-Section"/>
|
|
1359
|
+
</element>
|
|
1360
|
+
</define>
|
|
958
1361
|
<define name="boilerplate">
|
|
959
1362
|
<element name="boilerplate">
|
|
960
1363
|
<optional>
|
|
@@ -1136,26 +1539,26 @@
|
|
|
1136
1539
|
<optional>
|
|
1137
1540
|
<ref name="section-title"/>
|
|
1138
1541
|
</optional>
|
|
1139
|
-
<
|
|
1542
|
+
<choice>
|
|
1140
1543
|
<choice>
|
|
1141
1544
|
<group>
|
|
1142
|
-
<
|
|
1545
|
+
<oneOrMore>
|
|
1143
1546
|
<ref name="BasicBlock"/>
|
|
1144
|
-
</
|
|
1547
|
+
</oneOrMore>
|
|
1145
1548
|
<zeroOrMore>
|
|
1146
1549
|
<ref name="note"/>
|
|
1147
1550
|
</zeroOrMore>
|
|
1148
1551
|
</group>
|
|
1149
1552
|
<ref name="amend"/>
|
|
1150
1553
|
</choice>
|
|
1151
|
-
<
|
|
1554
|
+
<oneOrMore>
|
|
1152
1555
|
<choice>
|
|
1153
1556
|
<ref name="clause-subsection"/>
|
|
1154
1557
|
<ref name="terms"/>
|
|
1155
1558
|
<ref name="definitions"/>
|
|
1156
1559
|
</choice>
|
|
1157
|
-
</
|
|
1158
|
-
</
|
|
1560
|
+
</oneOrMore>
|
|
1561
|
+
</choice>
|
|
1159
1562
|
</define>
|
|
1160
1563
|
<define name="Annex-Section">
|
|
1161
1564
|
<optional>
|
|
@@ -1635,4 +2038,87 @@
|
|
|
1635
2038
|
<text/>
|
|
1636
2039
|
</element>
|
|
1637
2040
|
</define>
|
|
2041
|
+
<define name="imagemap">
|
|
2042
|
+
<element name="imagemap">
|
|
2043
|
+
<ref name="figure"/>
|
|
2044
|
+
<zeroOrMore>
|
|
2045
|
+
<element name="area">
|
|
2046
|
+
<attribute name="type">
|
|
2047
|
+
<choice>
|
|
2048
|
+
<value>rect</value>
|
|
2049
|
+
<value>circle</value>
|
|
2050
|
+
<value>ellipse</value>
|
|
2051
|
+
<value>poly</value>
|
|
2052
|
+
</choice>
|
|
2053
|
+
</attribute>
|
|
2054
|
+
<choice>
|
|
2055
|
+
<ref name="xref"/>
|
|
2056
|
+
<ref name="hyperlink"/>
|
|
2057
|
+
<ref name="eref"/>
|
|
2058
|
+
</choice>
|
|
2059
|
+
<oneOrMore>
|
|
2060
|
+
<element name="coords">
|
|
2061
|
+
<attribute name="x">
|
|
2062
|
+
<data type="float"/>
|
|
2063
|
+
</attribute>
|
|
2064
|
+
<attribute name="y">
|
|
2065
|
+
<data type="float"/>
|
|
2066
|
+
</attribute>
|
|
2067
|
+
</element>
|
|
2068
|
+
</oneOrMore>
|
|
2069
|
+
<optional>
|
|
2070
|
+
<element name="radius">
|
|
2071
|
+
<attribute name="x">
|
|
2072
|
+
<data type="float"/>
|
|
2073
|
+
</attribute>
|
|
2074
|
+
<optional>
|
|
2075
|
+
<attribute name="y">
|
|
2076
|
+
<data type="float"/>
|
|
2077
|
+
</attribute>
|
|
2078
|
+
</optional>
|
|
2079
|
+
</element>
|
|
2080
|
+
</optional>
|
|
2081
|
+
</element>
|
|
2082
|
+
</zeroOrMore>
|
|
2083
|
+
</element>
|
|
2084
|
+
</define>
|
|
2085
|
+
<define name="svgmap">
|
|
2086
|
+
<element name="svgmap">
|
|
2087
|
+
<ref name="figure"/>
|
|
2088
|
+
<zeroOrMore>
|
|
2089
|
+
<element name="target">
|
|
2090
|
+
<attribute name="href">
|
|
2091
|
+
<data type="anyURI"/>
|
|
2092
|
+
</attribute>
|
|
2093
|
+
<choice>
|
|
2094
|
+
<ref name="xref"/>
|
|
2095
|
+
<ref name="hyperlink"/>
|
|
2096
|
+
<ref name="eref"/>
|
|
2097
|
+
</choice>
|
|
2098
|
+
</element>
|
|
2099
|
+
</zeroOrMore>
|
|
2100
|
+
</element>
|
|
2101
|
+
</define>
|
|
2102
|
+
<define name="ul_li">
|
|
2103
|
+
<element name="li">
|
|
2104
|
+
<optional>
|
|
2105
|
+
<attribute name="id">
|
|
2106
|
+
<data type="ID"/>
|
|
2107
|
+
</attribute>
|
|
2108
|
+
</optional>
|
|
2109
|
+
<optional>
|
|
2110
|
+
<attribute name="uncheckedcheckbox">
|
|
2111
|
+
<data type="boolean"/>
|
|
2112
|
+
</attribute>
|
|
2113
|
+
</optional>
|
|
2114
|
+
<optional>
|
|
2115
|
+
<attribute name="checkedcheckbox">
|
|
2116
|
+
<data type="boolean"/>
|
|
2117
|
+
</attribute>
|
|
2118
|
+
</optional>
|
|
2119
|
+
<oneOrMore>
|
|
2120
|
+
<ref name="BasicBlock"/>
|
|
2121
|
+
</oneOrMore>
|
|
2122
|
+
</element>
|
|
2123
|
+
</define>
|
|
1638
2124
|
</grammar>
|