metanorma-generic 1.8.0 → 1.10.1
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/rake.yml +11 -30
- data/.gitignore +2 -0
- data/.hound.yml +3 -1
- data/.rubocop.yml +7 -7
- data/lib/asciidoctor/generic/basicdoc.rng +52 -3
- data/lib/asciidoctor/generic/biblio.rng +5 -6
- data/lib/asciidoctor/generic/converter.rb +1 -1
- data/lib/asciidoctor/generic/front.rb +1 -1
- data/lib/asciidoctor/generic/generic.rng +9 -0
- data/lib/asciidoctor/generic/isodoc.rng +477 -9
- data/lib/isodoc/generic/html_convert.rb +3 -4
- data/lib/isodoc/generic/metadata.rb +26 -21
- data/lib/isodoc/generic/pdf_convert.rb +2 -2
- data/lib/isodoc/generic/word_convert.rb +2 -2
- data/lib/metanorma/generic/processor.rb +9 -25
- data/lib/metanorma/generic/version.rb +1 -1
- data/metanorma-generic.gemspec +10 -10
- metadata +36 -40
- data/.rubocop.ribose.yml +0 -66
- data/.rubocop.tb.yml +0 -650
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 2abd9ea291615c858aa8c77067cebedee925fa9c4644c4a30bfba0f7734e8098
|
|
4
|
+
data.tar.gz: 1125772c1f2479ae3d67786ff3bc20e64fde743f57322eae5c338d6631d0d144
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 82dec664f4a88d80f262810a945718ed15844270df5747a1fe7c31d6e26ce04a6c3963db1047ed1efb665175e820a0b1fb48dab3ee713d135eeec8ad2a969c56
|
|
7
|
+
data.tar.gz: e502ff1bcf7f2550395f8dc6bee4aa3a1d8ce9136a04228121e8b88fdff484ccdff28c87c3e7fb4bf525587c473301a0a5a7ed005f8b7508a33aa4b34a0b7f4a
|
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,35 +16,18 @@ jobs:
|
|
|
16
16
|
strategy:
|
|
17
17
|
fail-fast: false
|
|
18
18
|
matrix:
|
|
19
|
-
ruby: [ '2.6', '2.5', '2.4' ]
|
|
19
|
+
ruby: [ '3.0', '2.7', '2.6', '2.5', '2.4' ]
|
|
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
|
-
- uses: actions/cache@v2
|
|
40
|
-
with:
|
|
41
|
-
path: vendor/bundle
|
|
42
|
-
key: bundle-${{ matrix.os }}-${{ matrix.ruby }}-${{ hashFiles('**/*.gemspec') }}
|
|
43
|
-
restore-keys: bundle-${{ matrix.os }}-${{ matrix.ruby }}
|
|
44
|
-
|
|
45
|
-
- run: bundle config set path 'vendor/bundle'
|
|
46
|
-
|
|
47
|
-
- run: bundle install --jobs 4 --retry 3
|
|
30
|
+
bundler-cache: true
|
|
48
31
|
|
|
49
32
|
- run: bundle exec rake
|
|
50
33
|
|
|
@@ -52,11 +35,9 @@ jobs:
|
|
|
52
35
|
needs: rake
|
|
53
36
|
runs-on: ubuntu-latest
|
|
54
37
|
steps:
|
|
55
|
-
-
|
|
56
|
-
uses: Sibz/github-status-action@v1
|
|
38
|
+
- uses: peter-evans/repository-dispatch@v1
|
|
57
39
|
with:
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
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
|
|
@@ -596,6 +596,7 @@
|
|
|
596
596
|
<ref name="bookmark"/>
|
|
597
597
|
<ref name="image"/>
|
|
598
598
|
<ref name="index"/>
|
|
599
|
+
<ref name="index-xref"/>
|
|
599
600
|
</choice>
|
|
600
601
|
</define>
|
|
601
602
|
<define name="PureTextElement">
|
|
@@ -728,13 +729,61 @@
|
|
|
728
729
|
</define>
|
|
729
730
|
<define name="index">
|
|
730
731
|
<element name="index">
|
|
731
|
-
<attribute name="primary"/>
|
|
732
732
|
<optional>
|
|
733
|
-
<attribute name="
|
|
733
|
+
<attribute name="to">
|
|
734
|
+
<data type="IDREF"/>
|
|
735
|
+
</attribute>
|
|
736
|
+
</optional>
|
|
737
|
+
<element name="primary">
|
|
738
|
+
<oneOrMore>
|
|
739
|
+
<ref name="PureTextElement"/>
|
|
740
|
+
</oneOrMore>
|
|
741
|
+
</element>
|
|
742
|
+
<optional>
|
|
743
|
+
<element name="secondary">
|
|
744
|
+
<oneOrMore>
|
|
745
|
+
<ref name="PureTextElement"/>
|
|
746
|
+
</oneOrMore>
|
|
747
|
+
</element>
|
|
748
|
+
</optional>
|
|
749
|
+
<optional>
|
|
750
|
+
<element name="tertiary">
|
|
751
|
+
<oneOrMore>
|
|
752
|
+
<ref name="PureTextElement"/>
|
|
753
|
+
</oneOrMore>
|
|
754
|
+
</element>
|
|
755
|
+
</optional>
|
|
756
|
+
</element>
|
|
757
|
+
</define>
|
|
758
|
+
<define name="index-xref">
|
|
759
|
+
<element name="index-xref">
|
|
760
|
+
<attribute name="also">
|
|
761
|
+
<data type="boolean"/>
|
|
762
|
+
</attribute>
|
|
763
|
+
<element name="primary">
|
|
764
|
+
<oneOrMore>
|
|
765
|
+
<ref name="PureTextElement"/>
|
|
766
|
+
</oneOrMore>
|
|
767
|
+
</element>
|
|
768
|
+
<optional>
|
|
769
|
+
<element name="secondary">
|
|
770
|
+
<oneOrMore>
|
|
771
|
+
<ref name="PureTextElement"/>
|
|
772
|
+
</oneOrMore>
|
|
773
|
+
</element>
|
|
734
774
|
</optional>
|
|
735
775
|
<optional>
|
|
736
|
-
<
|
|
776
|
+
<element name="tertiary">
|
|
777
|
+
<oneOrMore>
|
|
778
|
+
<ref name="PureTextElement"/>
|
|
779
|
+
</oneOrMore>
|
|
780
|
+
</element>
|
|
737
781
|
</optional>
|
|
782
|
+
<element name="target">
|
|
783
|
+
<oneOrMore>
|
|
784
|
+
<ref name="PureTextElement"/>
|
|
785
|
+
</oneOrMore>
|
|
786
|
+
</element>
|
|
738
787
|
</element>
|
|
739
788
|
</define>
|
|
740
789
|
<!-- bare ID element, used for referencing arbitrary spans of text -->
|
|
@@ -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>
|
|
@@ -74,7 +74,7 @@ module Asciidoctor
|
|
|
74
74
|
hash.each do |k, v|
|
|
75
75
|
next if EXT_STRUCT.include?(k) || !v&.is_a?(Hash) && !node.attr(k)
|
|
76
76
|
if v&.is_a?(Hash) && v["_list"]
|
|
77
|
-
csv_split(node.attr(k)).each do |val|
|
|
77
|
+
csv_split(node.attr(k), ",").each do |val|
|
|
78
78
|
metadata_ext_hash1(k, val, ext, v, node)
|
|
79
79
|
end
|
|
80
80
|
else
|
|
@@ -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>
|
|
@@ -45,6 +45,11 @@
|
|
|
45
45
|
<optional>
|
|
46
46
|
<attribute name="alt"/>
|
|
47
47
|
</optional>
|
|
48
|
+
<optional>
|
|
49
|
+
<attribute name="updatetype">
|
|
50
|
+
<data type="boolean"/>
|
|
51
|
+
</attribute>
|
|
52
|
+
</optional>
|
|
48
53
|
<text/>
|
|
49
54
|
</element>
|
|
50
55
|
</define>
|
|
@@ -55,6 +60,13 @@
|
|
|
55
60
|
<param name="pattern">\i\c*|\c+#\c+</param>
|
|
56
61
|
</data>
|
|
57
62
|
</attribute>
|
|
63
|
+
<optional>
|
|
64
|
+
<attribute name="to">
|
|
65
|
+
<data type="string">
|
|
66
|
+
<param name="pattern">\i\c*|\c+#\c+</param>
|
|
67
|
+
</data>
|
|
68
|
+
</attribute>
|
|
69
|
+
</optional>
|
|
58
70
|
<optional>
|
|
59
71
|
<attribute name="type">
|
|
60
72
|
<ref name="ReferenceFormat"/>
|
|
@@ -79,6 +91,35 @@
|
|
|
79
91
|
<text/>
|
|
80
92
|
</element>
|
|
81
93
|
</define>
|
|
94
|
+
<define name="erefType">
|
|
95
|
+
<optional>
|
|
96
|
+
<attribute name="normative">
|
|
97
|
+
<data type="boolean"/>
|
|
98
|
+
</attribute>
|
|
99
|
+
</optional>
|
|
100
|
+
<attribute name="citeas"/>
|
|
101
|
+
<attribute name="type">
|
|
102
|
+
<ref name="ReferenceFormat"/>
|
|
103
|
+
</attribute>
|
|
104
|
+
<optional>
|
|
105
|
+
<attribute name="alt"/>
|
|
106
|
+
</optional>
|
|
107
|
+
<optional>
|
|
108
|
+
<attribute name="case">
|
|
109
|
+
<choice>
|
|
110
|
+
<value>capital</value>
|
|
111
|
+
<value>lowercase</value>
|
|
112
|
+
</choice>
|
|
113
|
+
</attribute>
|
|
114
|
+
</optional>
|
|
115
|
+
<optional>
|
|
116
|
+
<attribute name="droploc">
|
|
117
|
+
<data type="boolean"/>
|
|
118
|
+
</attribute>
|
|
119
|
+
</optional>
|
|
120
|
+
<ref name="CitationType"/>
|
|
121
|
+
<text/>
|
|
122
|
+
</define>
|
|
82
123
|
<define name="ul">
|
|
83
124
|
<element name="ul">
|
|
84
125
|
<attribute name="id">
|
|
@@ -95,7 +136,7 @@
|
|
|
95
136
|
</attribute>
|
|
96
137
|
</optional>
|
|
97
138
|
<oneOrMore>
|
|
98
|
-
<ref name="
|
|
139
|
+
<ref name="ul_li"/>
|
|
99
140
|
</oneOrMore>
|
|
100
141
|
<zeroOrMore>
|
|
101
142
|
<ref name="note"/>
|
|
@@ -246,6 +287,12 @@
|
|
|
246
287
|
<data type="boolean"/>
|
|
247
288
|
</attribute>
|
|
248
289
|
</optional>
|
|
290
|
+
<optional>
|
|
291
|
+
<attribute name="width"/>
|
|
292
|
+
</optional>
|
|
293
|
+
<optional>
|
|
294
|
+
<ref name="colgroup"/>
|
|
295
|
+
</optional>
|
|
249
296
|
<optional>
|
|
250
297
|
<ref name="tname"/>
|
|
251
298
|
</optional>
|
|
@@ -501,6 +548,9 @@
|
|
|
501
548
|
</define>
|
|
502
549
|
<define name="BibDataExtensionType">
|
|
503
550
|
<ref name="doctype"/>
|
|
551
|
+
<optional>
|
|
552
|
+
<ref name="docsubtype"/>
|
|
553
|
+
</optional>
|
|
504
554
|
<optional>
|
|
505
555
|
<ref name="editorialgroup"/>
|
|
506
556
|
</optional>
|
|
@@ -762,10 +812,145 @@
|
|
|
762
812
|
<ref name="paragraph"/>
|
|
763
813
|
</element>
|
|
764
814
|
</define>
|
|
815
|
+
<define name="em">
|
|
816
|
+
<element name="em">
|
|
817
|
+
<zeroOrMore>
|
|
818
|
+
<choice>
|
|
819
|
+
<ref name="PureTextElement"/>
|
|
820
|
+
<ref name="stem"/>
|
|
821
|
+
<ref name="index"/>
|
|
822
|
+
</choice>
|
|
823
|
+
</zeroOrMore>
|
|
824
|
+
</element>
|
|
825
|
+
</define>
|
|
826
|
+
<define name="strong">
|
|
827
|
+
<element name="strong">
|
|
828
|
+
<zeroOrMore>
|
|
829
|
+
<choice>
|
|
830
|
+
<ref name="PureTextElement"/>
|
|
831
|
+
<ref name="stem"/>
|
|
832
|
+
<ref name="index"/>
|
|
833
|
+
</choice>
|
|
834
|
+
</zeroOrMore>
|
|
835
|
+
</element>
|
|
836
|
+
</define>
|
|
837
|
+
<define name="tt">
|
|
838
|
+
<element name="tt">
|
|
839
|
+
<zeroOrMore>
|
|
840
|
+
<choice>
|
|
841
|
+
<ref name="PureTextElement"/>
|
|
842
|
+
<ref name="index"/>
|
|
843
|
+
</choice>
|
|
844
|
+
</zeroOrMore>
|
|
845
|
+
</element>
|
|
846
|
+
</define>
|
|
847
|
+
<define name="keyword">
|
|
848
|
+
<element name="keyword">
|
|
849
|
+
<zeroOrMore>
|
|
850
|
+
<choice>
|
|
851
|
+
<ref name="PureTextElement"/>
|
|
852
|
+
<ref name="index"/>
|
|
853
|
+
</choice>
|
|
854
|
+
</zeroOrMore>
|
|
855
|
+
</element>
|
|
856
|
+
</define>
|
|
857
|
+
<define name="strike">
|
|
858
|
+
<element name="strike">
|
|
859
|
+
<zeroOrMore>
|
|
860
|
+
<choice>
|
|
861
|
+
<ref name="PureTextElement"/>
|
|
862
|
+
<ref name="index"/>
|
|
863
|
+
</choice>
|
|
864
|
+
</zeroOrMore>
|
|
865
|
+
</element>
|
|
866
|
+
</define>
|
|
867
|
+
<define name="underline">
|
|
868
|
+
<element name="underline">
|
|
869
|
+
<zeroOrMore>
|
|
870
|
+
<choice>
|
|
871
|
+
<ref name="PureTextElement"/>
|
|
872
|
+
<ref name="index"/>
|
|
873
|
+
</choice>
|
|
874
|
+
</zeroOrMore>
|
|
875
|
+
</element>
|
|
876
|
+
</define>
|
|
877
|
+
<define name="smallcap">
|
|
878
|
+
<element name="smallcap">
|
|
879
|
+
<zeroOrMore>
|
|
880
|
+
<choice>
|
|
881
|
+
<ref name="PureTextElement"/>
|
|
882
|
+
<ref name="index"/>
|
|
883
|
+
</choice>
|
|
884
|
+
</zeroOrMore>
|
|
885
|
+
</element>
|
|
886
|
+
</define>
|
|
887
|
+
<define name="pagebreak">
|
|
888
|
+
<element name="pagebreak">
|
|
889
|
+
<optional>
|
|
890
|
+
<attribute name="orientation">
|
|
891
|
+
<choice>
|
|
892
|
+
<value>landscape</value>
|
|
893
|
+
<value>portrait</value>
|
|
894
|
+
</choice>
|
|
895
|
+
</attribute>
|
|
896
|
+
</optional>
|
|
897
|
+
</element>
|
|
898
|
+
</define>
|
|
765
899
|
</include>
|
|
766
900
|
<!-- end overrides -->
|
|
901
|
+
<define name="docsubtype">
|
|
902
|
+
<element name="docsubtype">
|
|
903
|
+
<ref name="DocumentSubtype"/>
|
|
904
|
+
</element>
|
|
905
|
+
</define>
|
|
906
|
+
<define name="DocumentSubtype">
|
|
907
|
+
<text/>
|
|
908
|
+
</define>
|
|
909
|
+
<define name="colgroup">
|
|
910
|
+
<element name="colgroup">
|
|
911
|
+
<oneOrMore>
|
|
912
|
+
<ref name="col"/>
|
|
913
|
+
</oneOrMore>
|
|
914
|
+
</element>
|
|
915
|
+
</define>
|
|
916
|
+
<define name="col">
|
|
917
|
+
<element name="col">
|
|
918
|
+
<attribute name="width"/>
|
|
919
|
+
</element>
|
|
920
|
+
</define>
|
|
921
|
+
<define name="BibItemType" combine="choice">
|
|
922
|
+
<value>internal</value>
|
|
923
|
+
</define>
|
|
767
924
|
<define name="TextElement" combine="choice">
|
|
768
|
-
<
|
|
925
|
+
<choice>
|
|
926
|
+
<ref name="concept"/>
|
|
927
|
+
<ref name="add"/>
|
|
928
|
+
<ref name="del"/>
|
|
929
|
+
</choice>
|
|
930
|
+
</define>
|
|
931
|
+
<define name="add">
|
|
932
|
+
<element name="add">
|
|
933
|
+
<choice>
|
|
934
|
+
<ref name="PureTextElement"/>
|
|
935
|
+
<ref name="eref"/>
|
|
936
|
+
<ref name="stem"/>
|
|
937
|
+
<ref name="keyword"/>
|
|
938
|
+
<ref name="xref"/>
|
|
939
|
+
<ref name="hyperlink"/>
|
|
940
|
+
</choice>
|
|
941
|
+
</element>
|
|
942
|
+
</define>
|
|
943
|
+
<define name="del">
|
|
944
|
+
<element name="del">
|
|
945
|
+
<choice>
|
|
946
|
+
<ref name="PureTextElement"/>
|
|
947
|
+
<ref name="eref"/>
|
|
948
|
+
<ref name="stem"/>
|
|
949
|
+
<ref name="keyword"/>
|
|
950
|
+
<ref name="xref"/>
|
|
951
|
+
<ref name="hyperlink"/>
|
|
952
|
+
</choice>
|
|
953
|
+
</element>
|
|
769
954
|
</define>
|
|
770
955
|
<define name="concept">
|
|
771
956
|
<element name="concept">
|
|
@@ -784,8 +969,172 @@
|
|
|
784
969
|
<ref name="requirement"/>
|
|
785
970
|
<ref name="recommendation"/>
|
|
786
971
|
<ref name="permission"/>
|
|
972
|
+
<ref name="imagemap"/>
|
|
973
|
+
<ref name="svgmap"/>
|
|
974
|
+
<ref name="inputform"/>
|
|
975
|
+
</choice>
|
|
976
|
+
</define>
|
|
977
|
+
<define name="inputform">
|
|
978
|
+
<element name="form">
|
|
979
|
+
<attribute name="id">
|
|
980
|
+
<data type="ID"/>
|
|
981
|
+
</attribute>
|
|
982
|
+
<attribute name="name"/>
|
|
983
|
+
<attribute name="action"/>
|
|
984
|
+
<zeroOrMore>
|
|
985
|
+
<choice>
|
|
986
|
+
<ref name="TextElement"/>
|
|
987
|
+
<ref name="FormInput"/>
|
|
988
|
+
</choice>
|
|
989
|
+
</zeroOrMore>
|
|
990
|
+
</element>
|
|
991
|
+
</define>
|
|
992
|
+
<define name="FormInput">
|
|
993
|
+
<choice>
|
|
994
|
+
<ref name="input"/>
|
|
995
|
+
<ref name="formlabel"/>
|
|
996
|
+
<ref name="select"/>
|
|
997
|
+
<ref name="textarea"/>
|
|
998
|
+
</choice>
|
|
999
|
+
</define>
|
|
1000
|
+
<define name="InputType">
|
|
1001
|
+
<choice>
|
|
1002
|
+
<value>button</value>
|
|
1003
|
+
<value>checkbox</value>
|
|
1004
|
+
<value>date</value>
|
|
1005
|
+
<value>file</value>
|
|
1006
|
+
<value>password</value>
|
|
1007
|
+
<value>radio</value>
|
|
1008
|
+
<value>submit</value>
|
|
1009
|
+
<value>text</value>
|
|
787
1010
|
</choice>
|
|
788
1011
|
</define>
|
|
1012
|
+
<define name="input">
|
|
1013
|
+
<element name="input">
|
|
1014
|
+
<attribute name="type">
|
|
1015
|
+
<ref name="InputType"/>
|
|
1016
|
+
</attribute>
|
|
1017
|
+
<optional>
|
|
1018
|
+
<attribute name="checked">
|
|
1019
|
+
<data type="boolean"/>
|
|
1020
|
+
</attribute>
|
|
1021
|
+
</optional>
|
|
1022
|
+
<optional>
|
|
1023
|
+
<attribute name="disabled">
|
|
1024
|
+
<data type="boolean"/>
|
|
1025
|
+
</attribute>
|
|
1026
|
+
</optional>
|
|
1027
|
+
<optional>
|
|
1028
|
+
<attribute name="readonly">
|
|
1029
|
+
<data type="boolean"/>
|
|
1030
|
+
</attribute>
|
|
1031
|
+
</optional>
|
|
1032
|
+
<optional>
|
|
1033
|
+
<attribute name="maxlength">
|
|
1034
|
+
<data type="int"/>
|
|
1035
|
+
</attribute>
|
|
1036
|
+
</optional>
|
|
1037
|
+
<optional>
|
|
1038
|
+
<attribute name="minlength">
|
|
1039
|
+
<data type="int"/>
|
|
1040
|
+
</attribute>
|
|
1041
|
+
</optional>
|
|
1042
|
+
<optional>
|
|
1043
|
+
<attribute name="name"/>
|
|
1044
|
+
</optional>
|
|
1045
|
+
<optional>
|
|
1046
|
+
<attribute name="value"/>
|
|
1047
|
+
</optional>
|
|
1048
|
+
<optional>
|
|
1049
|
+
<attribute name="id">
|
|
1050
|
+
<data type="ID"/>
|
|
1051
|
+
</attribute>
|
|
1052
|
+
</optional>
|
|
1053
|
+
</element>
|
|
1054
|
+
</define>
|
|
1055
|
+
<define name="formlabel">
|
|
1056
|
+
<element name="label">
|
|
1057
|
+
<attribute name="for">
|
|
1058
|
+
<data type="IDREF"/>
|
|
1059
|
+
</attribute>
|
|
1060
|
+
<zeroOrMore>
|
|
1061
|
+
<ref name="PureTextElement"/>
|
|
1062
|
+
</zeroOrMore>
|
|
1063
|
+
</element>
|
|
1064
|
+
</define>
|
|
1065
|
+
<define name="select">
|
|
1066
|
+
<element name="select">
|
|
1067
|
+
<optional>
|
|
1068
|
+
<attribute name="name"/>
|
|
1069
|
+
</optional>
|
|
1070
|
+
<optional>
|
|
1071
|
+
<attribute name="value"/>
|
|
1072
|
+
</optional>
|
|
1073
|
+
<optional>
|
|
1074
|
+
<attribute name="id">
|
|
1075
|
+
<data type="ID"/>
|
|
1076
|
+
</attribute>
|
|
1077
|
+
</optional>
|
|
1078
|
+
<optional>
|
|
1079
|
+
<attribute name="disabled">
|
|
1080
|
+
<data type="boolean"/>
|
|
1081
|
+
</attribute>
|
|
1082
|
+
</optional>
|
|
1083
|
+
<optional>
|
|
1084
|
+
<attribute name="multiple">
|
|
1085
|
+
<data type="boolean"/>
|
|
1086
|
+
</attribute>
|
|
1087
|
+
</optional>
|
|
1088
|
+
<optional>
|
|
1089
|
+
<attribute name="size">
|
|
1090
|
+
<data type="int"/>
|
|
1091
|
+
</attribute>
|
|
1092
|
+
</optional>
|
|
1093
|
+
<oneOrMore>
|
|
1094
|
+
<ref name="option"/>
|
|
1095
|
+
</oneOrMore>
|
|
1096
|
+
</element>
|
|
1097
|
+
</define>
|
|
1098
|
+
<define name="option">
|
|
1099
|
+
<element name="option">
|
|
1100
|
+
<optional>
|
|
1101
|
+
<attribute name="disabled">
|
|
1102
|
+
<data type="boolean"/>
|
|
1103
|
+
</attribute>
|
|
1104
|
+
</optional>
|
|
1105
|
+
<optional>
|
|
1106
|
+
<attribute name="value"/>
|
|
1107
|
+
</optional>
|
|
1108
|
+
<zeroOrMore>
|
|
1109
|
+
<ref name="PureTextElement"/>
|
|
1110
|
+
</zeroOrMore>
|
|
1111
|
+
</element>
|
|
1112
|
+
</define>
|
|
1113
|
+
<define name="textarea">
|
|
1114
|
+
<element name="textarea">
|
|
1115
|
+
<optional>
|
|
1116
|
+
<attribute name="name"/>
|
|
1117
|
+
</optional>
|
|
1118
|
+
<optional>
|
|
1119
|
+
<attribute name="value"/>
|
|
1120
|
+
</optional>
|
|
1121
|
+
<optional>
|
|
1122
|
+
<attribute name="id">
|
|
1123
|
+
<data type="ID"/>
|
|
1124
|
+
</attribute>
|
|
1125
|
+
</optional>
|
|
1126
|
+
<optional>
|
|
1127
|
+
<attribute name="rows">
|
|
1128
|
+
<data type="int"/>
|
|
1129
|
+
</attribute>
|
|
1130
|
+
</optional>
|
|
1131
|
+
<optional>
|
|
1132
|
+
<attribute name="cols">
|
|
1133
|
+
<data type="int"/>
|
|
1134
|
+
</attribute>
|
|
1135
|
+
</optional>
|
|
1136
|
+
</element>
|
|
1137
|
+
</define>
|
|
789
1138
|
<define name="bibliography">
|
|
790
1139
|
<element name="bibliography">
|
|
791
1140
|
<oneOrMore>
|
|
@@ -814,6 +1163,9 @@
|
|
|
814
1163
|
<data type="boolean"/>
|
|
815
1164
|
</attribute>
|
|
816
1165
|
</optional>
|
|
1166
|
+
<optional>
|
|
1167
|
+
<attribute name="number"/>
|
|
1168
|
+
</optional>
|
|
817
1169
|
<optional>
|
|
818
1170
|
<attribute name="obligation">
|
|
819
1171
|
<choice>
|
|
@@ -855,9 +1207,7 @@
|
|
|
855
1207
|
</define>
|
|
856
1208
|
<define name="IsoWorkgroup">
|
|
857
1209
|
<optional>
|
|
858
|
-
<attribute name="number"
|
|
859
|
-
<data type="int"/>
|
|
860
|
-
</attribute>
|
|
1210
|
+
<attribute name="number"/>
|
|
861
1211
|
</optional>
|
|
862
1212
|
<optional>
|
|
863
1213
|
<attribute name="type"/>
|
|
@@ -869,9 +1219,11 @@
|
|
|
869
1219
|
<element name="code">
|
|
870
1220
|
<text/>
|
|
871
1221
|
</element>
|
|
872
|
-
<
|
|
873
|
-
<text
|
|
874
|
-
|
|
1222
|
+
<optional>
|
|
1223
|
+
<element name="text">
|
|
1224
|
+
<text/>
|
|
1225
|
+
</element>
|
|
1226
|
+
</optional>
|
|
875
1227
|
</element>
|
|
876
1228
|
</define>
|
|
877
1229
|
<define name="standard-document">
|
|
@@ -884,6 +1236,9 @@
|
|
|
884
1236
|
</choice>
|
|
885
1237
|
</attribute>
|
|
886
1238
|
<ref name="bibdata"/>
|
|
1239
|
+
<optional>
|
|
1240
|
+
<ref name="misccontainer"/>
|
|
1241
|
+
</optional>
|
|
887
1242
|
<optional>
|
|
888
1243
|
<ref name="boilerplate"/>
|
|
889
1244
|
</optional>
|
|
@@ -894,11 +1249,21 @@
|
|
|
894
1249
|
<zeroOrMore>
|
|
895
1250
|
<ref name="annex"/>
|
|
896
1251
|
</zeroOrMore>
|
|
1252
|
+
<optional>
|
|
1253
|
+
<ref name="bibliography"/>
|
|
1254
|
+
</optional>
|
|
897
1255
|
<zeroOrMore>
|
|
898
|
-
<ref name="
|
|
1256
|
+
<ref name="indexsect"/>
|
|
899
1257
|
</zeroOrMore>
|
|
900
1258
|
</element>
|
|
901
1259
|
</define>
|
|
1260
|
+
<define name="misccontainer">
|
|
1261
|
+
<element name="misc-container">
|
|
1262
|
+
<oneOrMore>
|
|
1263
|
+
<ref name="AnyElement"/>
|
|
1264
|
+
</oneOrMore>
|
|
1265
|
+
</element>
|
|
1266
|
+
</define>
|
|
902
1267
|
<define name="preface">
|
|
903
1268
|
<element name="preface">
|
|
904
1269
|
<oneOrMore>
|
|
@@ -922,6 +1287,11 @@
|
|
|
922
1287
|
<ref name="Content-Section"/>
|
|
923
1288
|
</element>
|
|
924
1289
|
</define>
|
|
1290
|
+
<define name="indexsect">
|
|
1291
|
+
<element name="indexsect">
|
|
1292
|
+
<ref name="Content-Section"/>
|
|
1293
|
+
</element>
|
|
1294
|
+
</define>
|
|
925
1295
|
<define name="boilerplate">
|
|
926
1296
|
<element name="boilerplate">
|
|
927
1297
|
<optional>
|
|
@@ -1041,6 +1411,9 @@
|
|
|
1041
1411
|
</choice>
|
|
1042
1412
|
</attribute>
|
|
1043
1413
|
</optional>
|
|
1414
|
+
<optional>
|
|
1415
|
+
<attribute name="number"/>
|
|
1416
|
+
</optional>
|
|
1044
1417
|
<optional>
|
|
1045
1418
|
<attribute name="type"/>
|
|
1046
1419
|
</optional>
|
|
@@ -1094,6 +1467,9 @@
|
|
|
1094
1467
|
<optional>
|
|
1095
1468
|
<attribute name="type"/>
|
|
1096
1469
|
</optional>
|
|
1470
|
+
<optional>
|
|
1471
|
+
<attribute name="number"/>
|
|
1472
|
+
</optional>
|
|
1097
1473
|
<optional>
|
|
1098
1474
|
<ref name="section-title"/>
|
|
1099
1475
|
</optional>
|
|
@@ -1196,6 +1572,9 @@
|
|
|
1196
1572
|
<optional>
|
|
1197
1573
|
<attribute name="type"/>
|
|
1198
1574
|
</optional>
|
|
1575
|
+
<optional>
|
|
1576
|
+
<attribute name="number"/>
|
|
1577
|
+
</optional>
|
|
1199
1578
|
<optional>
|
|
1200
1579
|
<attribute name="obligation">
|
|
1201
1580
|
<choice>
|
|
@@ -1524,6 +1903,7 @@
|
|
|
1524
1903
|
<value>add</value>
|
|
1525
1904
|
<value>modify</value>
|
|
1526
1905
|
<value>delete</value>
|
|
1906
|
+
<value>replace</value>
|
|
1527
1907
|
</choice>
|
|
1528
1908
|
</attribute>
|
|
1529
1909
|
<optional>
|
|
@@ -1554,6 +1934,11 @@
|
|
|
1554
1934
|
</optional>
|
|
1555
1935
|
<optional>
|
|
1556
1936
|
<element name="newcontent">
|
|
1937
|
+
<optional>
|
|
1938
|
+
<attribute name="id">
|
|
1939
|
+
<data type="ID"/>
|
|
1940
|
+
</attribute>
|
|
1941
|
+
</optional>
|
|
1557
1942
|
<zeroOrMore>
|
|
1558
1943
|
<ref name="BasicBlock"/>
|
|
1559
1944
|
</zeroOrMore>
|
|
@@ -1587,4 +1972,87 @@
|
|
|
1587
1972
|
<text/>
|
|
1588
1973
|
</element>
|
|
1589
1974
|
</define>
|
|
1975
|
+
<define name="imagemap">
|
|
1976
|
+
<element name="imagemap">
|
|
1977
|
+
<ref name="figure"/>
|
|
1978
|
+
<zeroOrMore>
|
|
1979
|
+
<element name="area">
|
|
1980
|
+
<attribute name="type">
|
|
1981
|
+
<choice>
|
|
1982
|
+
<value>rect</value>
|
|
1983
|
+
<value>circle</value>
|
|
1984
|
+
<value>ellipse</value>
|
|
1985
|
+
<value>poly</value>
|
|
1986
|
+
</choice>
|
|
1987
|
+
</attribute>
|
|
1988
|
+
<choice>
|
|
1989
|
+
<ref name="xref"/>
|
|
1990
|
+
<ref name="hyperlink"/>
|
|
1991
|
+
<ref name="eref"/>
|
|
1992
|
+
</choice>
|
|
1993
|
+
<oneOrMore>
|
|
1994
|
+
<element name="coords">
|
|
1995
|
+
<attribute name="x">
|
|
1996
|
+
<data type="float"/>
|
|
1997
|
+
</attribute>
|
|
1998
|
+
<attribute name="y">
|
|
1999
|
+
<data type="float"/>
|
|
2000
|
+
</attribute>
|
|
2001
|
+
</element>
|
|
2002
|
+
</oneOrMore>
|
|
2003
|
+
<optional>
|
|
2004
|
+
<element name="radius">
|
|
2005
|
+
<attribute name="x">
|
|
2006
|
+
<data type="float"/>
|
|
2007
|
+
</attribute>
|
|
2008
|
+
<optional>
|
|
2009
|
+
<attribute name="y">
|
|
2010
|
+
<data type="float"/>
|
|
2011
|
+
</attribute>
|
|
2012
|
+
</optional>
|
|
2013
|
+
</element>
|
|
2014
|
+
</optional>
|
|
2015
|
+
</element>
|
|
2016
|
+
</zeroOrMore>
|
|
2017
|
+
</element>
|
|
2018
|
+
</define>
|
|
2019
|
+
<define name="svgmap">
|
|
2020
|
+
<element name="svgmap">
|
|
2021
|
+
<ref name="figure"/>
|
|
2022
|
+
<zeroOrMore>
|
|
2023
|
+
<element name="target">
|
|
2024
|
+
<attribute name="href">
|
|
2025
|
+
<data type="anyURI"/>
|
|
2026
|
+
</attribute>
|
|
2027
|
+
<choice>
|
|
2028
|
+
<ref name="xref"/>
|
|
2029
|
+
<ref name="hyperlink"/>
|
|
2030
|
+
<ref name="eref"/>
|
|
2031
|
+
</choice>
|
|
2032
|
+
</element>
|
|
2033
|
+
</zeroOrMore>
|
|
2034
|
+
</element>
|
|
2035
|
+
</define>
|
|
2036
|
+
<define name="ul_li">
|
|
2037
|
+
<element name="li">
|
|
2038
|
+
<optional>
|
|
2039
|
+
<attribute name="id">
|
|
2040
|
+
<data type="ID"/>
|
|
2041
|
+
</attribute>
|
|
2042
|
+
</optional>
|
|
2043
|
+
<optional>
|
|
2044
|
+
<attribute name="uncheckedcheckbox">
|
|
2045
|
+
<data type="boolean"/>
|
|
2046
|
+
</attribute>
|
|
2047
|
+
</optional>
|
|
2048
|
+
<optional>
|
|
2049
|
+
<attribute name="checkedcheckbox">
|
|
2050
|
+
<data type="boolean"/>
|
|
2051
|
+
</attribute>
|
|
2052
|
+
</optional>
|
|
2053
|
+
<oneOrMore>
|
|
2054
|
+
<ref name="BasicBlock"/>
|
|
2055
|
+
</oneOrMore>
|
|
2056
|
+
</element>
|
|
2057
|
+
</define>
|
|
1590
2058
|
</grammar>
|