metanorma-generic 1.7.3 → 1.10.0
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 +9 -30
- data/.gitignore +2 -0
- data/.rubocop.yml +6 -2
- data/lib/asciidoctor/generic/basicdoc.rng +52 -3
- data/lib/asciidoctor/generic/biblio.rng +4 -6
- data/lib/asciidoctor/generic/converter.rb +2 -1
- data/lib/asciidoctor/generic/front.rb +1 -1
- data/lib/asciidoctor/generic/generic.rng +6 -0
- data/lib/asciidoctor/generic/isodoc.rng +286 -6
- data/lib/isodoc/generic/html_convert.rb +8 -11
- data/lib/isodoc/generic/pdf_convert.rb +2 -2
- data/lib/isodoc/generic/utils.rb +1 -0
- data/lib/isodoc/generic/word_convert.rb +7 -3
- data/lib/metanorma/generic.rb +59 -1
- data/lib/metanorma/generic/fonts_manifest.yaml +5 -0
- data/lib/metanorma/generic/processor.rb +9 -40
- data/lib/metanorma/generic/version.rb +1 -1
- data/metanorma-generic.gemspec +9 -9
- data/metanorma.yml.example +8 -0
- metadata +36 -39
- 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: e906c5c278dab5a013ccf7a41e32a656aa45a4ae0e7b1da08d6a3f25070c8cc3
|
|
4
|
+
data.tar.gz: 7ae4307454635296858e9e810b9dc098db9813b3469e5965e41951cfc25db7bf
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 7ed11333760d2efddc688ac5fc2bb7268dc6c50da91ad673458df533769392b8b5f7364962ac423eb8d88714abddcba0bd385908d94828c0dc6e8160567e332c
|
|
7
|
+
data.tar.gz: 82e6f816697e1b2b5c50e1884de6631efb34b29b658fb54fa10a9fc5f0cff400fb1f08e50c7177e3b81f98a03a88dde44042abb5d26c916eba73e662f6091744
|
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,48 +16,27 @@ jobs:
|
|
|
16
16
|
strategy:
|
|
17
17
|
fail-fast: false
|
|
18
18
|
matrix:
|
|
19
|
-
ruby: [ '2.6', '2.5', '2.4' ]
|
|
19
|
+
ruby: [ '2.7', '2.6', '2.5', '2.4' ]
|
|
20
20
|
os: [ ubuntu-latest, windows-latest, macos-latest ]
|
|
21
21
|
experimental: [ false ]
|
|
22
22
|
include:
|
|
23
|
-
- ruby: '
|
|
23
|
+
- ruby: '3.0'
|
|
24
24
|
os: 'ubuntu-latest'
|
|
25
25
|
experimental: true
|
|
26
|
-
- ruby: '
|
|
26
|
+
- ruby: '3.0'
|
|
27
27
|
os: 'windows-latest'
|
|
28
28
|
experimental: true
|
|
29
|
-
- ruby: '
|
|
29
|
+
- ruby: '3.0'
|
|
30
30
|
os: 'macos-latest'
|
|
31
31
|
experimental: true
|
|
32
32
|
steps:
|
|
33
|
-
- uses: actions/checkout@
|
|
33
|
+
- uses: actions/checkout@v2
|
|
34
|
+
with:
|
|
35
|
+
submodules: true
|
|
34
36
|
|
|
35
37
|
- uses: ruby/setup-ruby@v1
|
|
36
38
|
with:
|
|
37
39
|
ruby-version: ${{ matrix.ruby }}
|
|
38
|
-
|
|
39
|
-
- uses: actions/cache@v1
|
|
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
|
|
40
|
+
bundler-cache: true
|
|
48
41
|
|
|
49
42
|
- run: bundle exec rake
|
|
50
|
-
|
|
51
|
-
notify:
|
|
52
|
-
name: Trigger notify workflow
|
|
53
|
-
needs: rake
|
|
54
|
-
runs-on: ubuntu-latest
|
|
55
|
-
steps:
|
|
56
|
-
- name: Trigger notify workflow
|
|
57
|
-
uses: Sibz/github-status-action@v1
|
|
58
|
-
with:
|
|
59
|
-
authToken: ${{ secrets.GITHUB_TOKEN }}
|
|
60
|
-
context: 'tests-passed-successfully'
|
|
61
|
-
description: 'Tests passed successfully'
|
|
62
|
-
state: 'success'
|
|
63
|
-
sha: ${{ github.event.pull_request.head.sha || github.sha }}
|
data/.gitignore
CHANGED
data/.rubocop.yml
CHANGED
|
@@ -1,10 +1,14 @@
|
|
|
1
1
|
# This project follows the Ribose OSS style guide.
|
|
2
2
|
# https://github.com/riboseinc/oss-guides
|
|
3
3
|
# All project-specific additions and overrides should be specified in this file.
|
|
4
|
-
|
|
5
4
|
inherit_from:
|
|
6
5
|
- https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
|
|
6
|
+
|
|
7
|
+
# local repo-specific modifications
|
|
8
|
+
|
|
7
9
|
AllCops:
|
|
8
|
-
|
|
10
|
+
DisplayCopNames: false
|
|
11
|
+
StyleGuideCopsOnly: false
|
|
12
|
+
TargetRubyVersion: 2.4
|
|
9
13
|
Rails:
|
|
10
14
|
Enabled: true
|
|
@@ -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>
|
|
@@ -1106,7 +1104,7 @@
|
|
|
1106
1104
|
<value>complementOf</value>
|
|
1107
1105
|
<value>obsoletes</value>
|
|
1108
1106
|
<value>obsoletedBy</value>
|
|
1109
|
-
<value>
|
|
1107
|
+
<value>cites</value>
|
|
1110
1108
|
<value>isCitedIn</value>
|
|
1111
1109
|
</choice>
|
|
1112
1110
|
</define>
|
|
@@ -21,6 +21,7 @@ module Asciidoctor
|
|
|
21
21
|
|
|
22
22
|
def baselocation(loc)
|
|
23
23
|
return nil if loc.nil?
|
|
24
|
+
return loc
|
|
24
25
|
File.expand_path(File.join(File.dirname(
|
|
25
26
|
self.class::_file || __FILE__), "..", "..", "..", loc))
|
|
26
27
|
end
|
|
@@ -149,7 +150,7 @@ module Asciidoctor
|
|
|
149
150
|
def boilerplate_isodoc(xmldoc)
|
|
150
151
|
conv = super
|
|
151
152
|
Metanorma::Generic::Configuration::CONFIG_ATTRS.each do |a|
|
|
152
|
-
conv.
|
|
153
|
+
conv.meta.set(a, configuration.send(a))
|
|
153
154
|
end
|
|
154
155
|
conv
|
|
155
156
|
end
|
|
@@ -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
|
|
@@ -70,6 +70,9 @@
|
|
|
70
70
|
<zeroOrMore>
|
|
71
71
|
<ref name="termdocsource"/>
|
|
72
72
|
</zeroOrMore>
|
|
73
|
+
<optional>
|
|
74
|
+
<ref name="misccontainer"/>
|
|
75
|
+
</optional>
|
|
73
76
|
<optional>
|
|
74
77
|
<ref name="boilerplate"/>
|
|
75
78
|
</optional>
|
|
@@ -81,6 +84,9 @@
|
|
|
81
84
|
<ref name="annex"/>
|
|
82
85
|
</zeroOrMore>
|
|
83
86
|
<ref name="bibliography"/>
|
|
87
|
+
<zeroOrMore>
|
|
88
|
+
<ref name="indexsect"/>
|
|
89
|
+
</zeroOrMore>
|
|
84
90
|
</element>
|
|
85
91
|
</define>
|
|
86
92
|
</grammar>
|
|
@@ -55,6 +55,13 @@
|
|
|
55
55
|
<param name="pattern">\i\c*|\c+#\c+</param>
|
|
56
56
|
</data>
|
|
57
57
|
</attribute>
|
|
58
|
+
<optional>
|
|
59
|
+
<attribute name="to">
|
|
60
|
+
<data type="string">
|
|
61
|
+
<param name="pattern">\i\c*|\c+#\c+</param>
|
|
62
|
+
</data>
|
|
63
|
+
</attribute>
|
|
64
|
+
</optional>
|
|
58
65
|
<optional>
|
|
59
66
|
<attribute name="type">
|
|
60
67
|
<ref name="ReferenceFormat"/>
|
|
@@ -79,6 +86,35 @@
|
|
|
79
86
|
<text/>
|
|
80
87
|
</element>
|
|
81
88
|
</define>
|
|
89
|
+
<define name="erefType">
|
|
90
|
+
<optional>
|
|
91
|
+
<attribute name="normative">
|
|
92
|
+
<data type="boolean"/>
|
|
93
|
+
</attribute>
|
|
94
|
+
</optional>
|
|
95
|
+
<attribute name="citeas"/>
|
|
96
|
+
<attribute name="type">
|
|
97
|
+
<ref name="ReferenceFormat"/>
|
|
98
|
+
</attribute>
|
|
99
|
+
<optional>
|
|
100
|
+
<attribute name="alt"/>
|
|
101
|
+
</optional>
|
|
102
|
+
<optional>
|
|
103
|
+
<attribute name="case">
|
|
104
|
+
<choice>
|
|
105
|
+
<value>capital</value>
|
|
106
|
+
<value>lowercase</value>
|
|
107
|
+
</choice>
|
|
108
|
+
</attribute>
|
|
109
|
+
</optional>
|
|
110
|
+
<optional>
|
|
111
|
+
<attribute name="droploc">
|
|
112
|
+
<data type="boolean"/>
|
|
113
|
+
</attribute>
|
|
114
|
+
</optional>
|
|
115
|
+
<ref name="CitationType"/>
|
|
116
|
+
<text/>
|
|
117
|
+
</define>
|
|
82
118
|
<define name="ul">
|
|
83
119
|
<element name="ul">
|
|
84
120
|
<attribute name="id">
|
|
@@ -95,7 +131,7 @@
|
|
|
95
131
|
</attribute>
|
|
96
132
|
</optional>
|
|
97
133
|
<oneOrMore>
|
|
98
|
-
<ref name="
|
|
134
|
+
<ref name="ul_li"/>
|
|
99
135
|
</oneOrMore>
|
|
100
136
|
<zeroOrMore>
|
|
101
137
|
<ref name="note"/>
|
|
@@ -246,6 +282,12 @@
|
|
|
246
282
|
<data type="boolean"/>
|
|
247
283
|
</attribute>
|
|
248
284
|
</optional>
|
|
285
|
+
<optional>
|
|
286
|
+
<attribute name="width"/>
|
|
287
|
+
</optional>
|
|
288
|
+
<optional>
|
|
289
|
+
<ref name="colgroup"/>
|
|
290
|
+
</optional>
|
|
249
291
|
<optional>
|
|
250
292
|
<ref name="tname"/>
|
|
251
293
|
</optional>
|
|
@@ -762,10 +804,125 @@
|
|
|
762
804
|
<ref name="paragraph"/>
|
|
763
805
|
</element>
|
|
764
806
|
</define>
|
|
807
|
+
<define name="em">
|
|
808
|
+
<element name="em">
|
|
809
|
+
<zeroOrMore>
|
|
810
|
+
<choice>
|
|
811
|
+
<ref name="PureTextElement"/>
|
|
812
|
+
<ref name="stem"/>
|
|
813
|
+
<ref name="index"/>
|
|
814
|
+
</choice>
|
|
815
|
+
</zeroOrMore>
|
|
816
|
+
</element>
|
|
817
|
+
</define>
|
|
818
|
+
<define name="strong">
|
|
819
|
+
<element name="strong">
|
|
820
|
+
<zeroOrMore>
|
|
821
|
+
<choice>
|
|
822
|
+
<ref name="PureTextElement"/>
|
|
823
|
+
<ref name="stem"/>
|
|
824
|
+
<ref name="index"/>
|
|
825
|
+
</choice>
|
|
826
|
+
</zeroOrMore>
|
|
827
|
+
</element>
|
|
828
|
+
</define>
|
|
829
|
+
<define name="tt">
|
|
830
|
+
<element name="tt">
|
|
831
|
+
<zeroOrMore>
|
|
832
|
+
<choice>
|
|
833
|
+
<ref name="PureTextElement"/>
|
|
834
|
+
<ref name="index"/>
|
|
835
|
+
</choice>
|
|
836
|
+
</zeroOrMore>
|
|
837
|
+
</element>
|
|
838
|
+
</define>
|
|
839
|
+
<define name="keyword">
|
|
840
|
+
<element name="keyword">
|
|
841
|
+
<zeroOrMore>
|
|
842
|
+
<choice>
|
|
843
|
+
<ref name="PureTextElement"/>
|
|
844
|
+
<ref name="index"/>
|
|
845
|
+
</choice>
|
|
846
|
+
</zeroOrMore>
|
|
847
|
+
</element>
|
|
848
|
+
</define>
|
|
849
|
+
<define name="strike">
|
|
850
|
+
<element name="strike">
|
|
851
|
+
<zeroOrMore>
|
|
852
|
+
<choice>
|
|
853
|
+
<ref name="PureTextElement"/>
|
|
854
|
+
<ref name="index"/>
|
|
855
|
+
</choice>
|
|
856
|
+
</zeroOrMore>
|
|
857
|
+
</element>
|
|
858
|
+
</define>
|
|
859
|
+
<define name="underline">
|
|
860
|
+
<element name="underline">
|
|
861
|
+
<zeroOrMore>
|
|
862
|
+
<choice>
|
|
863
|
+
<ref name="PureTextElement"/>
|
|
864
|
+
<ref name="index"/>
|
|
865
|
+
</choice>
|
|
866
|
+
</zeroOrMore>
|
|
867
|
+
</element>
|
|
868
|
+
</define>
|
|
869
|
+
<define name="smallcap">
|
|
870
|
+
<element name="smallcap">
|
|
871
|
+
<zeroOrMore>
|
|
872
|
+
<choice>
|
|
873
|
+
<ref name="PureTextElement"/>
|
|
874
|
+
<ref name="index"/>
|
|
875
|
+
</choice>
|
|
876
|
+
</zeroOrMore>
|
|
877
|
+
</element>
|
|
878
|
+
</define>
|
|
765
879
|
</include>
|
|
766
880
|
<!-- end overrides -->
|
|
881
|
+
<define name="colgroup">
|
|
882
|
+
<element name="colgroup">
|
|
883
|
+
<oneOrMore>
|
|
884
|
+
<ref name="col"/>
|
|
885
|
+
</oneOrMore>
|
|
886
|
+
</element>
|
|
887
|
+
</define>
|
|
888
|
+
<define name="col">
|
|
889
|
+
<element name="col">
|
|
890
|
+
<attribute name="width"/>
|
|
891
|
+
</element>
|
|
892
|
+
</define>
|
|
893
|
+
<define name="BibItemType" combine="choice">
|
|
894
|
+
<value>internal</value>
|
|
895
|
+
</define>
|
|
767
896
|
<define name="TextElement" combine="choice">
|
|
768
|
-
<
|
|
897
|
+
<choice>
|
|
898
|
+
<ref name="concept"/>
|
|
899
|
+
<ref name="add"/>
|
|
900
|
+
<ref name="del"/>
|
|
901
|
+
</choice>
|
|
902
|
+
</define>
|
|
903
|
+
<define name="add">
|
|
904
|
+
<element name="add">
|
|
905
|
+
<choice>
|
|
906
|
+
<ref name="PureTextElement"/>
|
|
907
|
+
<ref name="eref"/>
|
|
908
|
+
<ref name="stem"/>
|
|
909
|
+
<ref name="keyword"/>
|
|
910
|
+
<ref name="xref"/>
|
|
911
|
+
<ref name="hyperlink"/>
|
|
912
|
+
</choice>
|
|
913
|
+
</element>
|
|
914
|
+
</define>
|
|
915
|
+
<define name="del">
|
|
916
|
+
<element name="del">
|
|
917
|
+
<choice>
|
|
918
|
+
<ref name="PureTextElement"/>
|
|
919
|
+
<ref name="eref"/>
|
|
920
|
+
<ref name="stem"/>
|
|
921
|
+
<ref name="keyword"/>
|
|
922
|
+
<ref name="xref"/>
|
|
923
|
+
<ref name="hyperlink"/>
|
|
924
|
+
</choice>
|
|
925
|
+
</element>
|
|
769
926
|
</define>
|
|
770
927
|
<define name="concept">
|
|
771
928
|
<element name="concept">
|
|
@@ -784,6 +941,8 @@
|
|
|
784
941
|
<ref name="requirement"/>
|
|
785
942
|
<ref name="recommendation"/>
|
|
786
943
|
<ref name="permission"/>
|
|
944
|
+
<ref name="imagemap"/>
|
|
945
|
+
<ref name="svgmap"/>
|
|
787
946
|
</choice>
|
|
788
947
|
</define>
|
|
789
948
|
<define name="bibliography">
|
|
@@ -814,6 +973,9 @@
|
|
|
814
973
|
<data type="boolean"/>
|
|
815
974
|
</attribute>
|
|
816
975
|
</optional>
|
|
976
|
+
<optional>
|
|
977
|
+
<attribute name="number"/>
|
|
978
|
+
</optional>
|
|
817
979
|
<optional>
|
|
818
980
|
<attribute name="obligation">
|
|
819
981
|
<choice>
|
|
@@ -869,9 +1031,11 @@
|
|
|
869
1031
|
<element name="code">
|
|
870
1032
|
<text/>
|
|
871
1033
|
</element>
|
|
872
|
-
<
|
|
873
|
-
<text
|
|
874
|
-
|
|
1034
|
+
<optional>
|
|
1035
|
+
<element name="text">
|
|
1036
|
+
<text/>
|
|
1037
|
+
</element>
|
|
1038
|
+
</optional>
|
|
875
1039
|
</element>
|
|
876
1040
|
</define>
|
|
877
1041
|
<define name="standard-document">
|
|
@@ -884,6 +1048,9 @@
|
|
|
884
1048
|
</choice>
|
|
885
1049
|
</attribute>
|
|
886
1050
|
<ref name="bibdata"/>
|
|
1051
|
+
<optional>
|
|
1052
|
+
<ref name="misccontainer"/>
|
|
1053
|
+
</optional>
|
|
887
1054
|
<optional>
|
|
888
1055
|
<ref name="boilerplate"/>
|
|
889
1056
|
</optional>
|
|
@@ -894,11 +1061,21 @@
|
|
|
894
1061
|
<zeroOrMore>
|
|
895
1062
|
<ref name="annex"/>
|
|
896
1063
|
</zeroOrMore>
|
|
1064
|
+
<optional>
|
|
1065
|
+
<ref name="bibliography"/>
|
|
1066
|
+
</optional>
|
|
897
1067
|
<zeroOrMore>
|
|
898
|
-
<ref name="
|
|
1068
|
+
<ref name="indexsect"/>
|
|
899
1069
|
</zeroOrMore>
|
|
900
1070
|
</element>
|
|
901
1071
|
</define>
|
|
1072
|
+
<define name="misccontainer">
|
|
1073
|
+
<element name="misc-container">
|
|
1074
|
+
<oneOrMore>
|
|
1075
|
+
<ref name="AnyElement"/>
|
|
1076
|
+
</oneOrMore>
|
|
1077
|
+
</element>
|
|
1078
|
+
</define>
|
|
902
1079
|
<define name="preface">
|
|
903
1080
|
<element name="preface">
|
|
904
1081
|
<oneOrMore>
|
|
@@ -922,6 +1099,11 @@
|
|
|
922
1099
|
<ref name="Content-Section"/>
|
|
923
1100
|
</element>
|
|
924
1101
|
</define>
|
|
1102
|
+
<define name="indexsect">
|
|
1103
|
+
<element name="indexsect">
|
|
1104
|
+
<ref name="Content-Section"/>
|
|
1105
|
+
</element>
|
|
1106
|
+
</define>
|
|
925
1107
|
<define name="boilerplate">
|
|
926
1108
|
<element name="boilerplate">
|
|
927
1109
|
<optional>
|
|
@@ -1041,6 +1223,9 @@
|
|
|
1041
1223
|
</choice>
|
|
1042
1224
|
</attribute>
|
|
1043
1225
|
</optional>
|
|
1226
|
+
<optional>
|
|
1227
|
+
<attribute name="number"/>
|
|
1228
|
+
</optional>
|
|
1044
1229
|
<optional>
|
|
1045
1230
|
<attribute name="type"/>
|
|
1046
1231
|
</optional>
|
|
@@ -1094,6 +1279,9 @@
|
|
|
1094
1279
|
<optional>
|
|
1095
1280
|
<attribute name="type"/>
|
|
1096
1281
|
</optional>
|
|
1282
|
+
<optional>
|
|
1283
|
+
<attribute name="number"/>
|
|
1284
|
+
</optional>
|
|
1097
1285
|
<optional>
|
|
1098
1286
|
<ref name="section-title"/>
|
|
1099
1287
|
</optional>
|
|
@@ -1196,6 +1384,9 @@
|
|
|
1196
1384
|
<optional>
|
|
1197
1385
|
<attribute name="type"/>
|
|
1198
1386
|
</optional>
|
|
1387
|
+
<optional>
|
|
1388
|
+
<attribute name="number"/>
|
|
1389
|
+
</optional>
|
|
1199
1390
|
<optional>
|
|
1200
1391
|
<attribute name="obligation">
|
|
1201
1392
|
<choice>
|
|
@@ -1524,6 +1715,7 @@
|
|
|
1524
1715
|
<value>add</value>
|
|
1525
1716
|
<value>modify</value>
|
|
1526
1717
|
<value>delete</value>
|
|
1718
|
+
<value>replace</value>
|
|
1527
1719
|
</choice>
|
|
1528
1720
|
</attribute>
|
|
1529
1721
|
<optional>
|
|
@@ -1554,6 +1746,11 @@
|
|
|
1554
1746
|
</optional>
|
|
1555
1747
|
<optional>
|
|
1556
1748
|
<element name="newcontent">
|
|
1749
|
+
<optional>
|
|
1750
|
+
<attribute name="id">
|
|
1751
|
+
<data type="ID"/>
|
|
1752
|
+
</attribute>
|
|
1753
|
+
</optional>
|
|
1557
1754
|
<zeroOrMore>
|
|
1558
1755
|
<ref name="BasicBlock"/>
|
|
1559
1756
|
</zeroOrMore>
|
|
@@ -1587,4 +1784,87 @@
|
|
|
1587
1784
|
<text/>
|
|
1588
1785
|
</element>
|
|
1589
1786
|
</define>
|
|
1787
|
+
<define name="imagemap">
|
|
1788
|
+
<element name="imagemap">
|
|
1789
|
+
<ref name="figure"/>
|
|
1790
|
+
<zeroOrMore>
|
|
1791
|
+
<element name="area">
|
|
1792
|
+
<attribute name="type">
|
|
1793
|
+
<choice>
|
|
1794
|
+
<value>rect</value>
|
|
1795
|
+
<value>circle</value>
|
|
1796
|
+
<value>ellipse</value>
|
|
1797
|
+
<value>poly</value>
|
|
1798
|
+
</choice>
|
|
1799
|
+
</attribute>
|
|
1800
|
+
<choice>
|
|
1801
|
+
<ref name="xref"/>
|
|
1802
|
+
<ref name="hyperlink"/>
|
|
1803
|
+
<ref name="eref"/>
|
|
1804
|
+
</choice>
|
|
1805
|
+
<oneOrMore>
|
|
1806
|
+
<element name="coords">
|
|
1807
|
+
<attribute name="x">
|
|
1808
|
+
<data type="float"/>
|
|
1809
|
+
</attribute>
|
|
1810
|
+
<attribute name="y">
|
|
1811
|
+
<data type="float"/>
|
|
1812
|
+
</attribute>
|
|
1813
|
+
</element>
|
|
1814
|
+
</oneOrMore>
|
|
1815
|
+
<optional>
|
|
1816
|
+
<element name="radius">
|
|
1817
|
+
<attribute name="x">
|
|
1818
|
+
<data type="float"/>
|
|
1819
|
+
</attribute>
|
|
1820
|
+
<optional>
|
|
1821
|
+
<attribute name="y">
|
|
1822
|
+
<data type="float"/>
|
|
1823
|
+
</attribute>
|
|
1824
|
+
</optional>
|
|
1825
|
+
</element>
|
|
1826
|
+
</optional>
|
|
1827
|
+
</element>
|
|
1828
|
+
</zeroOrMore>
|
|
1829
|
+
</element>
|
|
1830
|
+
</define>
|
|
1831
|
+
<define name="svgmap">
|
|
1832
|
+
<element name="svgmap">
|
|
1833
|
+
<ref name="figure"/>
|
|
1834
|
+
<zeroOrMore>
|
|
1835
|
+
<element name="target">
|
|
1836
|
+
<attribute name="href">
|
|
1837
|
+
<data type="anyURI"/>
|
|
1838
|
+
</attribute>
|
|
1839
|
+
<choice>
|
|
1840
|
+
<ref name="xref"/>
|
|
1841
|
+
<ref name="hyperlink"/>
|
|
1842
|
+
<ref name="eref"/>
|
|
1843
|
+
</choice>
|
|
1844
|
+
</element>
|
|
1845
|
+
</zeroOrMore>
|
|
1846
|
+
</element>
|
|
1847
|
+
</define>
|
|
1848
|
+
<define name="ul_li">
|
|
1849
|
+
<element name="li">
|
|
1850
|
+
<optional>
|
|
1851
|
+
<attribute name="id">
|
|
1852
|
+
<data type="ID"/>
|
|
1853
|
+
</attribute>
|
|
1854
|
+
</optional>
|
|
1855
|
+
<optional>
|
|
1856
|
+
<attribute name="uncheckedcheckbox">
|
|
1857
|
+
<data type="boolean"/>
|
|
1858
|
+
</attribute>
|
|
1859
|
+
</optional>
|
|
1860
|
+
<optional>
|
|
1861
|
+
<attribute name="checkedcheckbox">
|
|
1862
|
+
<data type="boolean"/>
|
|
1863
|
+
</attribute>
|
|
1864
|
+
</optional>
|
|
1865
|
+
<oneOrMore>
|
|
1866
|
+
<ref name="BasicBlock"/>
|
|
1867
|
+
</oneOrMore>
|
|
1868
|
+
</element>
|
|
1869
|
+
</define>
|
|
1590
1870
|
</grammar>
|