relaton-gb 1.6.pre1 → 1.8.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 +46 -0
- data/README.adoc +1 -5
- data/bin/rspec +29 -0
- data/grammars/basicdoc.rng +165 -20
- data/grammars/biblio.rng +4 -6
- data/grammars/gbstandard.rng +6 -0
- data/grammars/isodoc.rng +474 -49
- data/grammars/isostandard.rng +42 -104
- data/grammars/reqt.rng +31 -2
- data/lib/relaton_gb/gb_bibliographic_item.rb +30 -3
- data/lib/relaton_gb/gb_scrapper.rb +1 -1
- data/lib/relaton_gb/processor.rb +1 -2
- data/lib/relaton_gb/scrapper.rb +7 -6
- data/lib/relaton_gb/sec_scrapper.rb +1 -1
- data/lib/relaton_gb/t_scrapper.rb +1 -1
- data/lib/relaton_gb/version.rb +1 -1
- data/lib/relaton_gb/xml_parser.rb +1 -1
- data/relaton_gb.gemspec +3 -3
- metadata +9 -38
- data/.github/workflows/macos.yml +0 -34
- data/.github/workflows/ubuntu.yml +0 -33
- data/.github/workflows/windows.yml +0 -35
data/grammars/gbstandard.rng
CHANGED
|
@@ -194,6 +194,9 @@
|
|
|
194
194
|
<zeroOrMore>
|
|
195
195
|
<ref name="termdocsource"/>
|
|
196
196
|
</zeroOrMore>
|
|
197
|
+
<optional>
|
|
198
|
+
<ref name="misccontainer"/>
|
|
199
|
+
</optional>
|
|
197
200
|
<optional>
|
|
198
201
|
<ref name="boilerplate"/>
|
|
199
202
|
</optional>
|
|
@@ -205,6 +208,9 @@
|
|
|
205
208
|
<ref name="annex"/>
|
|
206
209
|
</zeroOrMore>
|
|
207
210
|
<ref name="bibliography"/>
|
|
211
|
+
<zeroOrMore>
|
|
212
|
+
<ref name="indexsect"/>
|
|
213
|
+
</zeroOrMore>
|
|
208
214
|
</element>
|
|
209
215
|
</define>
|
|
210
216
|
<define name="gbccs">
|
data/grammars/isodoc.rng
CHANGED
|
@@ -24,6 +24,14 @@
|
|
|
24
24
|
<start>
|
|
25
25
|
<ref name="standard-document"/>
|
|
26
26
|
</start>
|
|
27
|
+
<define name="doctype">
|
|
28
|
+
<element name="doctype">
|
|
29
|
+
<optional>
|
|
30
|
+
<attribute name="abbreviation"/>
|
|
31
|
+
</optional>
|
|
32
|
+
<ref name="DocumentType"/>
|
|
33
|
+
</element>
|
|
34
|
+
</define>
|
|
27
35
|
<define name="hyperlink">
|
|
28
36
|
<element name="link">
|
|
29
37
|
<attribute name="target">
|
|
@@ -47,6 +55,13 @@
|
|
|
47
55
|
<param name="pattern">\i\c*|\c+#\c+</param>
|
|
48
56
|
</data>
|
|
49
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>
|
|
50
65
|
<optional>
|
|
51
66
|
<attribute name="type">
|
|
52
67
|
<ref name="ReferenceFormat"/>
|
|
@@ -71,6 +86,35 @@
|
|
|
71
86
|
<text/>
|
|
72
87
|
</element>
|
|
73
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>
|
|
74
118
|
<define name="ul">
|
|
75
119
|
<element name="ul">
|
|
76
120
|
<attribute name="id">
|
|
@@ -87,7 +131,7 @@
|
|
|
87
131
|
</attribute>
|
|
88
132
|
</optional>
|
|
89
133
|
<oneOrMore>
|
|
90
|
-
<ref name="
|
|
134
|
+
<ref name="ul_li"/>
|
|
91
135
|
</oneOrMore>
|
|
92
136
|
<zeroOrMore>
|
|
93
137
|
<ref name="note"/>
|
|
@@ -141,6 +185,11 @@
|
|
|
141
185
|
<data type="boolean"/>
|
|
142
186
|
</attribute>
|
|
143
187
|
</optional>
|
|
188
|
+
<optional>
|
|
189
|
+
<attribute name="key">
|
|
190
|
+
<data type="boolean"/>
|
|
191
|
+
</attribute>
|
|
192
|
+
</optional>
|
|
144
193
|
<oneOrMore>
|
|
145
194
|
<ref name="dt"/>
|
|
146
195
|
<ref name="dd"/>
|
|
@@ -233,6 +282,12 @@
|
|
|
233
282
|
<data type="boolean"/>
|
|
234
283
|
</attribute>
|
|
235
284
|
</optional>
|
|
285
|
+
<optional>
|
|
286
|
+
<attribute name="width"/>
|
|
287
|
+
</optional>
|
|
288
|
+
<optional>
|
|
289
|
+
<ref name="colgroup"/>
|
|
290
|
+
</optional>
|
|
236
291
|
<optional>
|
|
237
292
|
<ref name="tname"/>
|
|
238
293
|
</optional>
|
|
@@ -749,10 +804,137 @@
|
|
|
749
804
|
<ref name="paragraph"/>
|
|
750
805
|
</element>
|
|
751
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>
|
|
879
|
+
<define name="pagebreak">
|
|
880
|
+
<element name="pagebreak">
|
|
881
|
+
<optional>
|
|
882
|
+
<attribute name="orientation">
|
|
883
|
+
<choice>
|
|
884
|
+
<value>landscape</value>
|
|
885
|
+
<value>portrait</value>
|
|
886
|
+
</choice>
|
|
887
|
+
</attribute>
|
|
888
|
+
</optional>
|
|
889
|
+
</element>
|
|
890
|
+
</define>
|
|
752
891
|
</include>
|
|
753
892
|
<!-- end overrides -->
|
|
893
|
+
<define name="colgroup">
|
|
894
|
+
<element name="colgroup">
|
|
895
|
+
<oneOrMore>
|
|
896
|
+
<ref name="col"/>
|
|
897
|
+
</oneOrMore>
|
|
898
|
+
</element>
|
|
899
|
+
</define>
|
|
900
|
+
<define name="col">
|
|
901
|
+
<element name="col">
|
|
902
|
+
<attribute name="width"/>
|
|
903
|
+
</element>
|
|
904
|
+
</define>
|
|
905
|
+
<define name="BibItemType" combine="choice">
|
|
906
|
+
<value>internal</value>
|
|
907
|
+
</define>
|
|
754
908
|
<define name="TextElement" combine="choice">
|
|
755
|
-
<
|
|
909
|
+
<choice>
|
|
910
|
+
<ref name="concept"/>
|
|
911
|
+
<ref name="add"/>
|
|
912
|
+
<ref name="del"/>
|
|
913
|
+
</choice>
|
|
914
|
+
</define>
|
|
915
|
+
<define name="add">
|
|
916
|
+
<element name="add">
|
|
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>
|
|
926
|
+
</define>
|
|
927
|
+
<define name="del">
|
|
928
|
+
<element name="del">
|
|
929
|
+
<choice>
|
|
930
|
+
<ref name="PureTextElement"/>
|
|
931
|
+
<ref name="eref"/>
|
|
932
|
+
<ref name="stem"/>
|
|
933
|
+
<ref name="keyword"/>
|
|
934
|
+
<ref name="xref"/>
|
|
935
|
+
<ref name="hyperlink"/>
|
|
936
|
+
</choice>
|
|
937
|
+
</element>
|
|
756
938
|
</define>
|
|
757
939
|
<define name="concept">
|
|
758
940
|
<element name="concept">
|
|
@@ -771,8 +953,172 @@
|
|
|
771
953
|
<ref name="requirement"/>
|
|
772
954
|
<ref name="recommendation"/>
|
|
773
955
|
<ref name="permission"/>
|
|
956
|
+
<ref name="imagemap"/>
|
|
957
|
+
<ref name="svgmap"/>
|
|
958
|
+
<ref name="inputform"/>
|
|
959
|
+
</choice>
|
|
960
|
+
</define>
|
|
961
|
+
<define name="inputform">
|
|
962
|
+
<element name="form">
|
|
963
|
+
<attribute name="id">
|
|
964
|
+
<data type="ID"/>
|
|
965
|
+
</attribute>
|
|
966
|
+
<attribute name="name"/>
|
|
967
|
+
<attribute name="action"/>
|
|
968
|
+
<zeroOrMore>
|
|
969
|
+
<choice>
|
|
970
|
+
<ref name="TextElement"/>
|
|
971
|
+
<ref name="FormInput"/>
|
|
972
|
+
</choice>
|
|
973
|
+
</zeroOrMore>
|
|
974
|
+
</element>
|
|
975
|
+
</define>
|
|
976
|
+
<define name="FormInput">
|
|
977
|
+
<choice>
|
|
978
|
+
<ref name="input"/>
|
|
979
|
+
<ref name="formlabel"/>
|
|
980
|
+
<ref name="select"/>
|
|
981
|
+
<ref name="textarea"/>
|
|
982
|
+
</choice>
|
|
983
|
+
</define>
|
|
984
|
+
<define name="InputType">
|
|
985
|
+
<choice>
|
|
986
|
+
<value>button</value>
|
|
987
|
+
<value>checkbox</value>
|
|
988
|
+
<value>date</value>
|
|
989
|
+
<value>file</value>
|
|
990
|
+
<value>password</value>
|
|
991
|
+
<value>radio</value>
|
|
992
|
+
<value>submit</value>
|
|
993
|
+
<value>text</value>
|
|
774
994
|
</choice>
|
|
775
995
|
</define>
|
|
996
|
+
<define name="input">
|
|
997
|
+
<element name="input">
|
|
998
|
+
<attribute name="type">
|
|
999
|
+
<ref name="InputType"/>
|
|
1000
|
+
</attribute>
|
|
1001
|
+
<optional>
|
|
1002
|
+
<attribute name="checked">
|
|
1003
|
+
<data type="boolean"/>
|
|
1004
|
+
</attribute>
|
|
1005
|
+
</optional>
|
|
1006
|
+
<optional>
|
|
1007
|
+
<attribute name="disabled">
|
|
1008
|
+
<data type="boolean"/>
|
|
1009
|
+
</attribute>
|
|
1010
|
+
</optional>
|
|
1011
|
+
<optional>
|
|
1012
|
+
<attribute name="readonly">
|
|
1013
|
+
<data type="boolean"/>
|
|
1014
|
+
</attribute>
|
|
1015
|
+
</optional>
|
|
1016
|
+
<optional>
|
|
1017
|
+
<attribute name="maxlength">
|
|
1018
|
+
<data type="int"/>
|
|
1019
|
+
</attribute>
|
|
1020
|
+
</optional>
|
|
1021
|
+
<optional>
|
|
1022
|
+
<attribute name="minlength">
|
|
1023
|
+
<data type="int"/>
|
|
1024
|
+
</attribute>
|
|
1025
|
+
</optional>
|
|
1026
|
+
<optional>
|
|
1027
|
+
<attribute name="name"/>
|
|
1028
|
+
</optional>
|
|
1029
|
+
<optional>
|
|
1030
|
+
<attribute name="value"/>
|
|
1031
|
+
</optional>
|
|
1032
|
+
<optional>
|
|
1033
|
+
<attribute name="id">
|
|
1034
|
+
<data type="ID"/>
|
|
1035
|
+
</attribute>
|
|
1036
|
+
</optional>
|
|
1037
|
+
</element>
|
|
1038
|
+
</define>
|
|
1039
|
+
<define name="formlabel">
|
|
1040
|
+
<element name="label">
|
|
1041
|
+
<attribute name="for">
|
|
1042
|
+
<data type="IDREF"/>
|
|
1043
|
+
</attribute>
|
|
1044
|
+
<zeroOrMore>
|
|
1045
|
+
<ref name="PureTextElement"/>
|
|
1046
|
+
</zeroOrMore>
|
|
1047
|
+
</element>
|
|
1048
|
+
</define>
|
|
1049
|
+
<define name="select">
|
|
1050
|
+
<element name="select">
|
|
1051
|
+
<optional>
|
|
1052
|
+
<attribute name="name"/>
|
|
1053
|
+
</optional>
|
|
1054
|
+
<optional>
|
|
1055
|
+
<attribute name="value"/>
|
|
1056
|
+
</optional>
|
|
1057
|
+
<optional>
|
|
1058
|
+
<attribute name="id">
|
|
1059
|
+
<data type="ID"/>
|
|
1060
|
+
</attribute>
|
|
1061
|
+
</optional>
|
|
1062
|
+
<optional>
|
|
1063
|
+
<attribute name="disabled">
|
|
1064
|
+
<data type="boolean"/>
|
|
1065
|
+
</attribute>
|
|
1066
|
+
</optional>
|
|
1067
|
+
<optional>
|
|
1068
|
+
<attribute name="multiple">
|
|
1069
|
+
<data type="boolean"/>
|
|
1070
|
+
</attribute>
|
|
1071
|
+
</optional>
|
|
1072
|
+
<optional>
|
|
1073
|
+
<attribute name="size">
|
|
1074
|
+
<data type="int"/>
|
|
1075
|
+
</attribute>
|
|
1076
|
+
</optional>
|
|
1077
|
+
<oneOrMore>
|
|
1078
|
+
<ref name="option"/>
|
|
1079
|
+
</oneOrMore>
|
|
1080
|
+
</element>
|
|
1081
|
+
</define>
|
|
1082
|
+
<define name="option">
|
|
1083
|
+
<element name="option">
|
|
1084
|
+
<optional>
|
|
1085
|
+
<attribute name="disabled">
|
|
1086
|
+
<data type="boolean"/>
|
|
1087
|
+
</attribute>
|
|
1088
|
+
</optional>
|
|
1089
|
+
<optional>
|
|
1090
|
+
<attribute name="value"/>
|
|
1091
|
+
</optional>
|
|
1092
|
+
<zeroOrMore>
|
|
1093
|
+
<ref name="PureTextElement"/>
|
|
1094
|
+
</zeroOrMore>
|
|
1095
|
+
</element>
|
|
1096
|
+
</define>
|
|
1097
|
+
<define name="textarea">
|
|
1098
|
+
<element name="textarea">
|
|
1099
|
+
<optional>
|
|
1100
|
+
<attribute name="name"/>
|
|
1101
|
+
</optional>
|
|
1102
|
+
<optional>
|
|
1103
|
+
<attribute name="value"/>
|
|
1104
|
+
</optional>
|
|
1105
|
+
<optional>
|
|
1106
|
+
<attribute name="id">
|
|
1107
|
+
<data type="ID"/>
|
|
1108
|
+
</attribute>
|
|
1109
|
+
</optional>
|
|
1110
|
+
<optional>
|
|
1111
|
+
<attribute name="rows">
|
|
1112
|
+
<data type="int"/>
|
|
1113
|
+
</attribute>
|
|
1114
|
+
</optional>
|
|
1115
|
+
<optional>
|
|
1116
|
+
<attribute name="cols">
|
|
1117
|
+
<data type="int"/>
|
|
1118
|
+
</attribute>
|
|
1119
|
+
</optional>
|
|
1120
|
+
</element>
|
|
1121
|
+
</define>
|
|
776
1122
|
<define name="bibliography">
|
|
777
1123
|
<element name="bibliography">
|
|
778
1124
|
<oneOrMore>
|
|
@@ -801,6 +1147,9 @@
|
|
|
801
1147
|
<data type="boolean"/>
|
|
802
1148
|
</attribute>
|
|
803
1149
|
</optional>
|
|
1150
|
+
<optional>
|
|
1151
|
+
<attribute name="number"/>
|
|
1152
|
+
</optional>
|
|
804
1153
|
<optional>
|
|
805
1154
|
<attribute name="obligation">
|
|
806
1155
|
<choice>
|
|
@@ -856,9 +1205,11 @@
|
|
|
856
1205
|
<element name="code">
|
|
857
1206
|
<text/>
|
|
858
1207
|
</element>
|
|
859
|
-
<
|
|
860
|
-
<text
|
|
861
|
-
|
|
1208
|
+
<optional>
|
|
1209
|
+
<element name="text">
|
|
1210
|
+
<text/>
|
|
1211
|
+
</element>
|
|
1212
|
+
</optional>
|
|
862
1213
|
</element>
|
|
863
1214
|
</define>
|
|
864
1215
|
<define name="standard-document">
|
|
@@ -871,6 +1222,9 @@
|
|
|
871
1222
|
</choice>
|
|
872
1223
|
</attribute>
|
|
873
1224
|
<ref name="bibdata"/>
|
|
1225
|
+
<optional>
|
|
1226
|
+
<ref name="misccontainer"/>
|
|
1227
|
+
</optional>
|
|
874
1228
|
<optional>
|
|
875
1229
|
<ref name="boilerplate"/>
|
|
876
1230
|
</optional>
|
|
@@ -881,11 +1235,21 @@
|
|
|
881
1235
|
<zeroOrMore>
|
|
882
1236
|
<ref name="annex"/>
|
|
883
1237
|
</zeroOrMore>
|
|
1238
|
+
<optional>
|
|
1239
|
+
<ref name="bibliography"/>
|
|
1240
|
+
</optional>
|
|
884
1241
|
<zeroOrMore>
|
|
885
|
-
<ref name="
|
|
1242
|
+
<ref name="indexsect"/>
|
|
886
1243
|
</zeroOrMore>
|
|
887
1244
|
</element>
|
|
888
1245
|
</define>
|
|
1246
|
+
<define name="misccontainer">
|
|
1247
|
+
<element name="misc-container">
|
|
1248
|
+
<oneOrMore>
|
|
1249
|
+
<ref name="AnyElement"/>
|
|
1250
|
+
</oneOrMore>
|
|
1251
|
+
</element>
|
|
1252
|
+
</define>
|
|
889
1253
|
<define name="preface">
|
|
890
1254
|
<element name="preface">
|
|
891
1255
|
<oneOrMore>
|
|
@@ -909,6 +1273,11 @@
|
|
|
909
1273
|
<ref name="Content-Section"/>
|
|
910
1274
|
</element>
|
|
911
1275
|
</define>
|
|
1276
|
+
<define name="indexsect">
|
|
1277
|
+
<element name="indexsect">
|
|
1278
|
+
<ref name="Content-Section"/>
|
|
1279
|
+
</element>
|
|
1280
|
+
</define>
|
|
912
1281
|
<define name="boilerplate">
|
|
913
1282
|
<element name="boilerplate">
|
|
914
1283
|
<optional>
|
|
@@ -1028,6 +1397,9 @@
|
|
|
1028
1397
|
</choice>
|
|
1029
1398
|
</attribute>
|
|
1030
1399
|
</optional>
|
|
1400
|
+
<optional>
|
|
1401
|
+
<attribute name="number"/>
|
|
1402
|
+
</optional>
|
|
1031
1403
|
<optional>
|
|
1032
1404
|
<attribute name="type"/>
|
|
1033
1405
|
</optional>
|
|
@@ -1081,6 +1453,9 @@
|
|
|
1081
1453
|
<optional>
|
|
1082
1454
|
<attribute name="type"/>
|
|
1083
1455
|
</optional>
|
|
1456
|
+
<optional>
|
|
1457
|
+
<attribute name="number"/>
|
|
1458
|
+
</optional>
|
|
1084
1459
|
<optional>
|
|
1085
1460
|
<ref name="section-title"/>
|
|
1086
1461
|
</optional>
|
|
@@ -1164,49 +1539,7 @@
|
|
|
1164
1539
|
</define>
|
|
1165
1540
|
<define name="annex">
|
|
1166
1541
|
<element name="annex">
|
|
1167
|
-
<
|
|
1168
|
-
<attribute name="id">
|
|
1169
|
-
<data type="ID"/>
|
|
1170
|
-
</attribute>
|
|
1171
|
-
</optional>
|
|
1172
|
-
<optional>
|
|
1173
|
-
<attribute name="language"/>
|
|
1174
|
-
</optional>
|
|
1175
|
-
<optional>
|
|
1176
|
-
<attribute name="script"/>
|
|
1177
|
-
</optional>
|
|
1178
|
-
<optional>
|
|
1179
|
-
<attribute name="inline-header">
|
|
1180
|
-
<data type="boolean"/>
|
|
1181
|
-
</attribute>
|
|
1182
|
-
</optional>
|
|
1183
|
-
<attribute name="obligation">
|
|
1184
|
-
<choice>
|
|
1185
|
-
<value>normative</value>
|
|
1186
|
-
<value>informative</value>
|
|
1187
|
-
</choice>
|
|
1188
|
-
</attribute>
|
|
1189
|
-
<optional>
|
|
1190
|
-
<ref name="section-title"/>
|
|
1191
|
-
</optional>
|
|
1192
|
-
<group>
|
|
1193
|
-
<group>
|
|
1194
|
-
<zeroOrMore>
|
|
1195
|
-
<ref name="BasicBlock"/>
|
|
1196
|
-
</zeroOrMore>
|
|
1197
|
-
<zeroOrMore>
|
|
1198
|
-
<ref name="note"/>
|
|
1199
|
-
</zeroOrMore>
|
|
1200
|
-
</group>
|
|
1201
|
-
<zeroOrMore>
|
|
1202
|
-
<choice>
|
|
1203
|
-
<ref name="annex-subsection"/>
|
|
1204
|
-
<ref name="terms"/>
|
|
1205
|
-
<ref name="definitions"/>
|
|
1206
|
-
<ref name="references"/>
|
|
1207
|
-
</choice>
|
|
1208
|
-
</zeroOrMore>
|
|
1209
|
-
</group>
|
|
1542
|
+
<ref name="Annex-Section"/>
|
|
1210
1543
|
</element>
|
|
1211
1544
|
</define>
|
|
1212
1545
|
<define name="terms">
|
|
@@ -1225,6 +1558,9 @@
|
|
|
1225
1558
|
<optional>
|
|
1226
1559
|
<attribute name="type"/>
|
|
1227
1560
|
</optional>
|
|
1561
|
+
<optional>
|
|
1562
|
+
<attribute name="number"/>
|
|
1563
|
+
</optional>
|
|
1228
1564
|
<optional>
|
|
1229
1565
|
<attribute name="obligation">
|
|
1230
1566
|
<choice>
|
|
@@ -1553,6 +1889,7 @@
|
|
|
1553
1889
|
<value>add</value>
|
|
1554
1890
|
<value>modify</value>
|
|
1555
1891
|
<value>delete</value>
|
|
1892
|
+
<value>replace</value>
|
|
1556
1893
|
</choice>
|
|
1557
1894
|
</attribute>
|
|
1558
1895
|
<optional>
|
|
@@ -1583,6 +1920,11 @@
|
|
|
1583
1920
|
</optional>
|
|
1584
1921
|
<optional>
|
|
1585
1922
|
<element name="newcontent">
|
|
1923
|
+
<optional>
|
|
1924
|
+
<attribute name="id">
|
|
1925
|
+
<data type="ID"/>
|
|
1926
|
+
</attribute>
|
|
1927
|
+
</optional>
|
|
1586
1928
|
<zeroOrMore>
|
|
1587
1929
|
<ref name="BasicBlock"/>
|
|
1588
1930
|
</zeroOrMore>
|
|
@@ -1616,4 +1958,87 @@
|
|
|
1616
1958
|
<text/>
|
|
1617
1959
|
</element>
|
|
1618
1960
|
</define>
|
|
1961
|
+
<define name="imagemap">
|
|
1962
|
+
<element name="imagemap">
|
|
1963
|
+
<ref name="figure"/>
|
|
1964
|
+
<zeroOrMore>
|
|
1965
|
+
<element name="area">
|
|
1966
|
+
<attribute name="type">
|
|
1967
|
+
<choice>
|
|
1968
|
+
<value>rect</value>
|
|
1969
|
+
<value>circle</value>
|
|
1970
|
+
<value>ellipse</value>
|
|
1971
|
+
<value>poly</value>
|
|
1972
|
+
</choice>
|
|
1973
|
+
</attribute>
|
|
1974
|
+
<choice>
|
|
1975
|
+
<ref name="xref"/>
|
|
1976
|
+
<ref name="hyperlink"/>
|
|
1977
|
+
<ref name="eref"/>
|
|
1978
|
+
</choice>
|
|
1979
|
+
<oneOrMore>
|
|
1980
|
+
<element name="coords">
|
|
1981
|
+
<attribute name="x">
|
|
1982
|
+
<data type="float"/>
|
|
1983
|
+
</attribute>
|
|
1984
|
+
<attribute name="y">
|
|
1985
|
+
<data type="float"/>
|
|
1986
|
+
</attribute>
|
|
1987
|
+
</element>
|
|
1988
|
+
</oneOrMore>
|
|
1989
|
+
<optional>
|
|
1990
|
+
<element name="radius">
|
|
1991
|
+
<attribute name="x">
|
|
1992
|
+
<data type="float"/>
|
|
1993
|
+
</attribute>
|
|
1994
|
+
<optional>
|
|
1995
|
+
<attribute name="y">
|
|
1996
|
+
<data type="float"/>
|
|
1997
|
+
</attribute>
|
|
1998
|
+
</optional>
|
|
1999
|
+
</element>
|
|
2000
|
+
</optional>
|
|
2001
|
+
</element>
|
|
2002
|
+
</zeroOrMore>
|
|
2003
|
+
</element>
|
|
2004
|
+
</define>
|
|
2005
|
+
<define name="svgmap">
|
|
2006
|
+
<element name="svgmap">
|
|
2007
|
+
<ref name="figure"/>
|
|
2008
|
+
<zeroOrMore>
|
|
2009
|
+
<element name="target">
|
|
2010
|
+
<attribute name="href">
|
|
2011
|
+
<data type="anyURI"/>
|
|
2012
|
+
</attribute>
|
|
2013
|
+
<choice>
|
|
2014
|
+
<ref name="xref"/>
|
|
2015
|
+
<ref name="hyperlink"/>
|
|
2016
|
+
<ref name="eref"/>
|
|
2017
|
+
</choice>
|
|
2018
|
+
</element>
|
|
2019
|
+
</zeroOrMore>
|
|
2020
|
+
</element>
|
|
2021
|
+
</define>
|
|
2022
|
+
<define name="ul_li">
|
|
2023
|
+
<element name="li">
|
|
2024
|
+
<optional>
|
|
2025
|
+
<attribute name="id">
|
|
2026
|
+
<data type="ID"/>
|
|
2027
|
+
</attribute>
|
|
2028
|
+
</optional>
|
|
2029
|
+
<optional>
|
|
2030
|
+
<attribute name="uncheckedcheckbox">
|
|
2031
|
+
<data type="boolean"/>
|
|
2032
|
+
</attribute>
|
|
2033
|
+
</optional>
|
|
2034
|
+
<optional>
|
|
2035
|
+
<attribute name="checkedcheckbox">
|
|
2036
|
+
<data type="boolean"/>
|
|
2037
|
+
</attribute>
|
|
2038
|
+
</optional>
|
|
2039
|
+
<oneOrMore>
|
|
2040
|
+
<ref name="BasicBlock"/>
|
|
2041
|
+
</oneOrMore>
|
|
2042
|
+
</element>
|
|
2043
|
+
</define>
|
|
1619
2044
|
</grammar>
|