relaton-ogc 1.7.2 → 1.9.1
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 +1 -11
- data/.rubocop.yml +1 -1
- data/bin/rspec +29 -0
- data/grammars/basicdoc.rng +165 -20
- data/grammars/biblio.rng +5 -6
- data/grammars/isodoc.rng +532 -16
- data/grammars/ogc.rng +33 -13
- data/grammars/reqt.rng +31 -2
- data/lib/relaton_ogc/editorial_group.rb +1 -1
- data/lib/relaton_ogc/hash_converter.rb +1 -1
- data/lib/relaton_ogc/ogc_bibliographic_item.rb +17 -21
- data/lib/relaton_ogc/scrapper.rb +2 -2
- data/lib/relaton_ogc/version.rb +1 -1
- data/lib/relaton_ogc/xml_parser.rb +9 -9
- data/relaton_ogc.gemspec +4 -5
- metadata +11 -10
data/grammars/isodoc.rng
CHANGED
|
@@ -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"/>
|
|
@@ -163,6 +204,18 @@
|
|
|
163
204
|
</zeroOrMore>
|
|
164
205
|
</element>
|
|
165
206
|
</define>
|
|
207
|
+
<define name="dt">
|
|
208
|
+
<element name="dt">
|
|
209
|
+
<optional>
|
|
210
|
+
<attribute name="id">
|
|
211
|
+
<data type="ID"/>
|
|
212
|
+
</attribute>
|
|
213
|
+
</optional>
|
|
214
|
+
<zeroOrMore>
|
|
215
|
+
<ref name="TextElement"/>
|
|
216
|
+
</zeroOrMore>
|
|
217
|
+
</element>
|
|
218
|
+
</define>
|
|
166
219
|
<define name="example">
|
|
167
220
|
<element name="example">
|
|
168
221
|
<attribute name="id">
|
|
@@ -246,6 +299,12 @@
|
|
|
246
299
|
<data type="boolean"/>
|
|
247
300
|
</attribute>
|
|
248
301
|
</optional>
|
|
302
|
+
<optional>
|
|
303
|
+
<attribute name="width"/>
|
|
304
|
+
</optional>
|
|
305
|
+
<optional>
|
|
306
|
+
<ref name="colgroup"/>
|
|
307
|
+
</optional>
|
|
249
308
|
<optional>
|
|
250
309
|
<ref name="tname"/>
|
|
251
310
|
</optional>
|
|
@@ -501,6 +560,9 @@
|
|
|
501
560
|
</define>
|
|
502
561
|
<define name="BibDataExtensionType">
|
|
503
562
|
<ref name="doctype"/>
|
|
563
|
+
<optional>
|
|
564
|
+
<ref name="docsubtype"/>
|
|
565
|
+
</optional>
|
|
504
566
|
<optional>
|
|
505
567
|
<ref name="editorialgroup"/>
|
|
506
568
|
</optional>
|
|
@@ -762,15 +824,177 @@
|
|
|
762
824
|
<ref name="paragraph"/>
|
|
763
825
|
</element>
|
|
764
826
|
</define>
|
|
827
|
+
<define name="em">
|
|
828
|
+
<element name="em">
|
|
829
|
+
<zeroOrMore>
|
|
830
|
+
<choice>
|
|
831
|
+
<ref name="PureTextElement"/>
|
|
832
|
+
<ref name="stem"/>
|
|
833
|
+
<ref name="index"/>
|
|
834
|
+
</choice>
|
|
835
|
+
</zeroOrMore>
|
|
836
|
+
</element>
|
|
837
|
+
</define>
|
|
838
|
+
<define name="strong">
|
|
839
|
+
<element name="strong">
|
|
840
|
+
<zeroOrMore>
|
|
841
|
+
<choice>
|
|
842
|
+
<ref name="PureTextElement"/>
|
|
843
|
+
<ref name="stem"/>
|
|
844
|
+
<ref name="index"/>
|
|
845
|
+
</choice>
|
|
846
|
+
</zeroOrMore>
|
|
847
|
+
</element>
|
|
848
|
+
</define>
|
|
849
|
+
<define name="tt">
|
|
850
|
+
<element name="tt">
|
|
851
|
+
<zeroOrMore>
|
|
852
|
+
<choice>
|
|
853
|
+
<ref name="PureTextElement"/>
|
|
854
|
+
<ref name="index"/>
|
|
855
|
+
</choice>
|
|
856
|
+
</zeroOrMore>
|
|
857
|
+
</element>
|
|
858
|
+
</define>
|
|
859
|
+
<define name="keyword">
|
|
860
|
+
<element name="keyword">
|
|
861
|
+
<zeroOrMore>
|
|
862
|
+
<choice>
|
|
863
|
+
<ref name="PureTextElement"/>
|
|
864
|
+
<ref name="index"/>
|
|
865
|
+
</choice>
|
|
866
|
+
</zeroOrMore>
|
|
867
|
+
</element>
|
|
868
|
+
</define>
|
|
869
|
+
<define name="strike">
|
|
870
|
+
<element name="strike">
|
|
871
|
+
<zeroOrMore>
|
|
872
|
+
<choice>
|
|
873
|
+
<ref name="PureTextElement"/>
|
|
874
|
+
<ref name="index"/>
|
|
875
|
+
</choice>
|
|
876
|
+
</zeroOrMore>
|
|
877
|
+
</element>
|
|
878
|
+
</define>
|
|
879
|
+
<define name="underline">
|
|
880
|
+
<element name="underline">
|
|
881
|
+
<zeroOrMore>
|
|
882
|
+
<choice>
|
|
883
|
+
<ref name="PureTextElement"/>
|
|
884
|
+
<ref name="index"/>
|
|
885
|
+
</choice>
|
|
886
|
+
</zeroOrMore>
|
|
887
|
+
</element>
|
|
888
|
+
</define>
|
|
889
|
+
<define name="smallcap">
|
|
890
|
+
<element name="smallcap">
|
|
891
|
+
<zeroOrMore>
|
|
892
|
+
<choice>
|
|
893
|
+
<ref name="PureTextElement"/>
|
|
894
|
+
<ref name="index"/>
|
|
895
|
+
</choice>
|
|
896
|
+
</zeroOrMore>
|
|
897
|
+
</element>
|
|
898
|
+
</define>
|
|
899
|
+
<define name="pagebreak">
|
|
900
|
+
<element name="pagebreak">
|
|
901
|
+
<optional>
|
|
902
|
+
<attribute name="orientation">
|
|
903
|
+
<choice>
|
|
904
|
+
<value>landscape</value>
|
|
905
|
+
<value>portrait</value>
|
|
906
|
+
</choice>
|
|
907
|
+
</attribute>
|
|
908
|
+
</optional>
|
|
909
|
+
</element>
|
|
910
|
+
</define>
|
|
765
911
|
</include>
|
|
766
912
|
<!-- end overrides -->
|
|
913
|
+
<define name="docsubtype">
|
|
914
|
+
<element name="subdoctype">
|
|
915
|
+
<ref name="DocumentSubtype"/>
|
|
916
|
+
</element>
|
|
917
|
+
</define>
|
|
918
|
+
<define name="DocumentSubtype">
|
|
919
|
+
<text/>
|
|
920
|
+
</define>
|
|
921
|
+
<define name="colgroup">
|
|
922
|
+
<element name="colgroup">
|
|
923
|
+
<oneOrMore>
|
|
924
|
+
<ref name="col"/>
|
|
925
|
+
</oneOrMore>
|
|
926
|
+
</element>
|
|
927
|
+
</define>
|
|
928
|
+
<define name="col">
|
|
929
|
+
<element name="col">
|
|
930
|
+
<attribute name="width"/>
|
|
931
|
+
</element>
|
|
932
|
+
</define>
|
|
933
|
+
<define name="BibItemType" combine="choice">
|
|
934
|
+
<value>internal</value>
|
|
935
|
+
</define>
|
|
767
936
|
<define name="TextElement" combine="choice">
|
|
768
|
-
<
|
|
937
|
+
<choice>
|
|
938
|
+
<ref name="concept"/>
|
|
939
|
+
<ref name="add"/>
|
|
940
|
+
<ref name="del"/>
|
|
941
|
+
</choice>
|
|
942
|
+
</define>
|
|
943
|
+
<define name="add">
|
|
944
|
+
<element name="add">
|
|
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>
|
|
954
|
+
</define>
|
|
955
|
+
<define name="del">
|
|
956
|
+
<element name="del">
|
|
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>
|
|
769
966
|
</define>
|
|
770
967
|
<define name="concept">
|
|
771
968
|
<element name="concept">
|
|
772
969
|
<optional>
|
|
773
|
-
<attribute name="
|
|
970
|
+
<attribute name="ital">
|
|
971
|
+
<data type="boolean"/>
|
|
972
|
+
</attribute>
|
|
973
|
+
</optional>
|
|
974
|
+
<optional>
|
|
975
|
+
<attribute name="ref">
|
|
976
|
+
<data type="boolean"/>
|
|
977
|
+
</attribute>
|
|
978
|
+
</optional>
|
|
979
|
+
<optional>
|
|
980
|
+
<element name="refterm">
|
|
981
|
+
<zeroOrMore>
|
|
982
|
+
<choice>
|
|
983
|
+
<ref name="PureTextElement"/>
|
|
984
|
+
<ref name="stem"/>
|
|
985
|
+
</choice>
|
|
986
|
+
</zeroOrMore>
|
|
987
|
+
</element>
|
|
988
|
+
</optional>
|
|
989
|
+
<optional>
|
|
990
|
+
<element name="renderterm">
|
|
991
|
+
<zeroOrMore>
|
|
992
|
+
<choice>
|
|
993
|
+
<ref name="PureTextElement"/>
|
|
994
|
+
<ref name="stem"/>
|
|
995
|
+
</choice>
|
|
996
|
+
</zeroOrMore>
|
|
997
|
+
</element>
|
|
774
998
|
</optional>
|
|
775
999
|
<choice>
|
|
776
1000
|
<ref name="eref"/>
|
|
@@ -784,8 +1008,175 @@
|
|
|
784
1008
|
<ref name="requirement"/>
|
|
785
1009
|
<ref name="recommendation"/>
|
|
786
1010
|
<ref name="permission"/>
|
|
1011
|
+
<ref name="imagemap"/>
|
|
1012
|
+
<ref name="svgmap"/>
|
|
1013
|
+
<ref name="inputform"/>
|
|
1014
|
+
</choice>
|
|
1015
|
+
</define>
|
|
1016
|
+
<define name="inputform">
|
|
1017
|
+
<element name="form">
|
|
1018
|
+
<attribute name="id">
|
|
1019
|
+
<data type="ID"/>
|
|
1020
|
+
</attribute>
|
|
1021
|
+
<attribute name="name"/>
|
|
1022
|
+
<attribute name="action"/>
|
|
1023
|
+
<optional>
|
|
1024
|
+
<attribute name="class"/>
|
|
1025
|
+
</optional>
|
|
1026
|
+
<zeroOrMore>
|
|
1027
|
+
<choice>
|
|
1028
|
+
<ref name="TextElement"/>
|
|
1029
|
+
<ref name="FormInput"/>
|
|
1030
|
+
</choice>
|
|
1031
|
+
</zeroOrMore>
|
|
1032
|
+
</element>
|
|
1033
|
+
</define>
|
|
1034
|
+
<define name="FormInput">
|
|
1035
|
+
<choice>
|
|
1036
|
+
<ref name="input"/>
|
|
1037
|
+
<ref name="formlabel"/>
|
|
1038
|
+
<ref name="select"/>
|
|
1039
|
+
<ref name="textarea"/>
|
|
787
1040
|
</choice>
|
|
788
1041
|
</define>
|
|
1042
|
+
<define name="InputType">
|
|
1043
|
+
<choice>
|
|
1044
|
+
<value>button</value>
|
|
1045
|
+
<value>checkbox</value>
|
|
1046
|
+
<value>date</value>
|
|
1047
|
+
<value>file</value>
|
|
1048
|
+
<value>password</value>
|
|
1049
|
+
<value>radio</value>
|
|
1050
|
+
<value>submit</value>
|
|
1051
|
+
<value>text</value>
|
|
1052
|
+
</choice>
|
|
1053
|
+
</define>
|
|
1054
|
+
<define name="input">
|
|
1055
|
+
<element name="input">
|
|
1056
|
+
<attribute name="type">
|
|
1057
|
+
<ref name="InputType"/>
|
|
1058
|
+
</attribute>
|
|
1059
|
+
<optional>
|
|
1060
|
+
<attribute name="checked">
|
|
1061
|
+
<data type="boolean"/>
|
|
1062
|
+
</attribute>
|
|
1063
|
+
</optional>
|
|
1064
|
+
<optional>
|
|
1065
|
+
<attribute name="disabled">
|
|
1066
|
+
<data type="boolean"/>
|
|
1067
|
+
</attribute>
|
|
1068
|
+
</optional>
|
|
1069
|
+
<optional>
|
|
1070
|
+
<attribute name="readonly">
|
|
1071
|
+
<data type="boolean"/>
|
|
1072
|
+
</attribute>
|
|
1073
|
+
</optional>
|
|
1074
|
+
<optional>
|
|
1075
|
+
<attribute name="maxlength">
|
|
1076
|
+
<data type="int"/>
|
|
1077
|
+
</attribute>
|
|
1078
|
+
</optional>
|
|
1079
|
+
<optional>
|
|
1080
|
+
<attribute name="minlength">
|
|
1081
|
+
<data type="int"/>
|
|
1082
|
+
</attribute>
|
|
1083
|
+
</optional>
|
|
1084
|
+
<optional>
|
|
1085
|
+
<attribute name="name"/>
|
|
1086
|
+
</optional>
|
|
1087
|
+
<optional>
|
|
1088
|
+
<attribute name="value"/>
|
|
1089
|
+
</optional>
|
|
1090
|
+
<optional>
|
|
1091
|
+
<attribute name="id">
|
|
1092
|
+
<data type="ID"/>
|
|
1093
|
+
</attribute>
|
|
1094
|
+
</optional>
|
|
1095
|
+
</element>
|
|
1096
|
+
</define>
|
|
1097
|
+
<define name="formlabel">
|
|
1098
|
+
<element name="label">
|
|
1099
|
+
<attribute name="for">
|
|
1100
|
+
<data type="IDREF"/>
|
|
1101
|
+
</attribute>
|
|
1102
|
+
<zeroOrMore>
|
|
1103
|
+
<ref name="PureTextElement"/>
|
|
1104
|
+
</zeroOrMore>
|
|
1105
|
+
</element>
|
|
1106
|
+
</define>
|
|
1107
|
+
<define name="select">
|
|
1108
|
+
<element name="select">
|
|
1109
|
+
<optional>
|
|
1110
|
+
<attribute name="name"/>
|
|
1111
|
+
</optional>
|
|
1112
|
+
<optional>
|
|
1113
|
+
<attribute name="value"/>
|
|
1114
|
+
</optional>
|
|
1115
|
+
<optional>
|
|
1116
|
+
<attribute name="id">
|
|
1117
|
+
<data type="ID"/>
|
|
1118
|
+
</attribute>
|
|
1119
|
+
</optional>
|
|
1120
|
+
<optional>
|
|
1121
|
+
<attribute name="disabled">
|
|
1122
|
+
<data type="boolean"/>
|
|
1123
|
+
</attribute>
|
|
1124
|
+
</optional>
|
|
1125
|
+
<optional>
|
|
1126
|
+
<attribute name="multiple">
|
|
1127
|
+
<data type="boolean"/>
|
|
1128
|
+
</attribute>
|
|
1129
|
+
</optional>
|
|
1130
|
+
<optional>
|
|
1131
|
+
<attribute name="size">
|
|
1132
|
+
<data type="int"/>
|
|
1133
|
+
</attribute>
|
|
1134
|
+
</optional>
|
|
1135
|
+
<oneOrMore>
|
|
1136
|
+
<ref name="option"/>
|
|
1137
|
+
</oneOrMore>
|
|
1138
|
+
</element>
|
|
1139
|
+
</define>
|
|
1140
|
+
<define name="option">
|
|
1141
|
+
<element name="option">
|
|
1142
|
+
<optional>
|
|
1143
|
+
<attribute name="disabled">
|
|
1144
|
+
<data type="boolean"/>
|
|
1145
|
+
</attribute>
|
|
1146
|
+
</optional>
|
|
1147
|
+
<optional>
|
|
1148
|
+
<attribute name="value"/>
|
|
1149
|
+
</optional>
|
|
1150
|
+
<zeroOrMore>
|
|
1151
|
+
<ref name="PureTextElement"/>
|
|
1152
|
+
</zeroOrMore>
|
|
1153
|
+
</element>
|
|
1154
|
+
</define>
|
|
1155
|
+
<define name="textarea">
|
|
1156
|
+
<element name="textarea">
|
|
1157
|
+
<optional>
|
|
1158
|
+
<attribute name="name"/>
|
|
1159
|
+
</optional>
|
|
1160
|
+
<optional>
|
|
1161
|
+
<attribute name="value"/>
|
|
1162
|
+
</optional>
|
|
1163
|
+
<optional>
|
|
1164
|
+
<attribute name="id">
|
|
1165
|
+
<data type="ID"/>
|
|
1166
|
+
</attribute>
|
|
1167
|
+
</optional>
|
|
1168
|
+
<optional>
|
|
1169
|
+
<attribute name="rows">
|
|
1170
|
+
<data type="int"/>
|
|
1171
|
+
</attribute>
|
|
1172
|
+
</optional>
|
|
1173
|
+
<optional>
|
|
1174
|
+
<attribute name="cols">
|
|
1175
|
+
<data type="int"/>
|
|
1176
|
+
</attribute>
|
|
1177
|
+
</optional>
|
|
1178
|
+
</element>
|
|
1179
|
+
</define>
|
|
789
1180
|
<define name="bibliography">
|
|
790
1181
|
<element name="bibliography">
|
|
791
1182
|
<oneOrMore>
|
|
@@ -814,6 +1205,9 @@
|
|
|
814
1205
|
<data type="boolean"/>
|
|
815
1206
|
</attribute>
|
|
816
1207
|
</optional>
|
|
1208
|
+
<optional>
|
|
1209
|
+
<attribute name="number"/>
|
|
1210
|
+
</optional>
|
|
817
1211
|
<optional>
|
|
818
1212
|
<attribute name="obligation">
|
|
819
1213
|
<choice>
|
|
@@ -855,13 +1249,17 @@
|
|
|
855
1249
|
</define>
|
|
856
1250
|
<define name="IsoWorkgroup">
|
|
857
1251
|
<optional>
|
|
858
|
-
<attribute name="number"
|
|
859
|
-
<data type="int"/>
|
|
860
|
-
</attribute>
|
|
1252
|
+
<attribute name="number"/>
|
|
861
1253
|
</optional>
|
|
862
1254
|
<optional>
|
|
863
1255
|
<attribute name="type"/>
|
|
864
1256
|
</optional>
|
|
1257
|
+
<optional>
|
|
1258
|
+
<attribute name="identifier"/>
|
|
1259
|
+
</optional>
|
|
1260
|
+
<optional>
|
|
1261
|
+
<attribute name="prefix"/>
|
|
1262
|
+
</optional>
|
|
865
1263
|
<text/>
|
|
866
1264
|
</define>
|
|
867
1265
|
<define name="ics">
|
|
@@ -869,9 +1267,11 @@
|
|
|
869
1267
|
<element name="code">
|
|
870
1268
|
<text/>
|
|
871
1269
|
</element>
|
|
872
|
-
<
|
|
873
|
-
<text
|
|
874
|
-
|
|
1270
|
+
<optional>
|
|
1271
|
+
<element name="text">
|
|
1272
|
+
<text/>
|
|
1273
|
+
</element>
|
|
1274
|
+
</optional>
|
|
875
1275
|
</element>
|
|
876
1276
|
</define>
|
|
877
1277
|
<define name="standard-document">
|
|
@@ -884,6 +1284,9 @@
|
|
|
884
1284
|
</choice>
|
|
885
1285
|
</attribute>
|
|
886
1286
|
<ref name="bibdata"/>
|
|
1287
|
+
<optional>
|
|
1288
|
+
<ref name="misccontainer"/>
|
|
1289
|
+
</optional>
|
|
887
1290
|
<optional>
|
|
888
1291
|
<ref name="boilerplate"/>
|
|
889
1292
|
</optional>
|
|
@@ -894,11 +1297,21 @@
|
|
|
894
1297
|
<zeroOrMore>
|
|
895
1298
|
<ref name="annex"/>
|
|
896
1299
|
</zeroOrMore>
|
|
1300
|
+
<optional>
|
|
1301
|
+
<ref name="bibliography"/>
|
|
1302
|
+
</optional>
|
|
897
1303
|
<zeroOrMore>
|
|
898
|
-
<ref name="
|
|
1304
|
+
<ref name="indexsect"/>
|
|
899
1305
|
</zeroOrMore>
|
|
900
1306
|
</element>
|
|
901
1307
|
</define>
|
|
1308
|
+
<define name="misccontainer">
|
|
1309
|
+
<element name="misc-container">
|
|
1310
|
+
<oneOrMore>
|
|
1311
|
+
<ref name="AnyElement"/>
|
|
1312
|
+
</oneOrMore>
|
|
1313
|
+
</element>
|
|
1314
|
+
</define>
|
|
902
1315
|
<define name="preface">
|
|
903
1316
|
<element name="preface">
|
|
904
1317
|
<oneOrMore>
|
|
@@ -922,6 +1335,11 @@
|
|
|
922
1335
|
<ref name="Content-Section"/>
|
|
923
1336
|
</element>
|
|
924
1337
|
</define>
|
|
1338
|
+
<define name="indexsect">
|
|
1339
|
+
<element name="indexsect">
|
|
1340
|
+
<ref name="Content-Section"/>
|
|
1341
|
+
</element>
|
|
1342
|
+
</define>
|
|
925
1343
|
<define name="boilerplate">
|
|
926
1344
|
<element name="boilerplate">
|
|
927
1345
|
<optional>
|
|
@@ -1041,6 +1459,9 @@
|
|
|
1041
1459
|
</choice>
|
|
1042
1460
|
</attribute>
|
|
1043
1461
|
</optional>
|
|
1462
|
+
<optional>
|
|
1463
|
+
<attribute name="number"/>
|
|
1464
|
+
</optional>
|
|
1044
1465
|
<optional>
|
|
1045
1466
|
<attribute name="type"/>
|
|
1046
1467
|
</optional>
|
|
@@ -1094,29 +1515,32 @@
|
|
|
1094
1515
|
<optional>
|
|
1095
1516
|
<attribute name="type"/>
|
|
1096
1517
|
</optional>
|
|
1518
|
+
<optional>
|
|
1519
|
+
<attribute name="number"/>
|
|
1520
|
+
</optional>
|
|
1097
1521
|
<optional>
|
|
1098
1522
|
<ref name="section-title"/>
|
|
1099
1523
|
</optional>
|
|
1100
|
-
<
|
|
1524
|
+
<choice>
|
|
1101
1525
|
<choice>
|
|
1102
1526
|
<group>
|
|
1103
|
-
<
|
|
1527
|
+
<oneOrMore>
|
|
1104
1528
|
<ref name="BasicBlock"/>
|
|
1105
|
-
</
|
|
1529
|
+
</oneOrMore>
|
|
1106
1530
|
<zeroOrMore>
|
|
1107
1531
|
<ref name="note"/>
|
|
1108
1532
|
</zeroOrMore>
|
|
1109
1533
|
</group>
|
|
1110
1534
|
<ref name="amend"/>
|
|
1111
1535
|
</choice>
|
|
1112
|
-
<
|
|
1536
|
+
<oneOrMore>
|
|
1113
1537
|
<choice>
|
|
1114
1538
|
<ref name="clause-subsection"/>
|
|
1115
1539
|
<ref name="terms"/>
|
|
1116
1540
|
<ref name="definitions"/>
|
|
1117
1541
|
</choice>
|
|
1118
|
-
</
|
|
1119
|
-
</
|
|
1542
|
+
</oneOrMore>
|
|
1543
|
+
</choice>
|
|
1120
1544
|
</define>
|
|
1121
1545
|
<define name="Annex-Section">
|
|
1122
1546
|
<optional>
|
|
@@ -1196,6 +1620,9 @@
|
|
|
1196
1620
|
<optional>
|
|
1197
1621
|
<attribute name="type"/>
|
|
1198
1622
|
</optional>
|
|
1623
|
+
<optional>
|
|
1624
|
+
<attribute name="number"/>
|
|
1625
|
+
</optional>
|
|
1199
1626
|
<optional>
|
|
1200
1627
|
<attribute name="obligation">
|
|
1201
1628
|
<choice>
|
|
@@ -1524,6 +1951,7 @@
|
|
|
1524
1951
|
<value>add</value>
|
|
1525
1952
|
<value>modify</value>
|
|
1526
1953
|
<value>delete</value>
|
|
1954
|
+
<value>replace</value>
|
|
1527
1955
|
</choice>
|
|
1528
1956
|
</attribute>
|
|
1529
1957
|
<optional>
|
|
@@ -1554,6 +1982,11 @@
|
|
|
1554
1982
|
</optional>
|
|
1555
1983
|
<optional>
|
|
1556
1984
|
<element name="newcontent">
|
|
1985
|
+
<optional>
|
|
1986
|
+
<attribute name="id">
|
|
1987
|
+
<data type="ID"/>
|
|
1988
|
+
</attribute>
|
|
1989
|
+
</optional>
|
|
1557
1990
|
<zeroOrMore>
|
|
1558
1991
|
<ref name="BasicBlock"/>
|
|
1559
1992
|
</zeroOrMore>
|
|
@@ -1587,4 +2020,87 @@
|
|
|
1587
2020
|
<text/>
|
|
1588
2021
|
</element>
|
|
1589
2022
|
</define>
|
|
2023
|
+
<define name="imagemap">
|
|
2024
|
+
<element name="imagemap">
|
|
2025
|
+
<ref name="figure"/>
|
|
2026
|
+
<zeroOrMore>
|
|
2027
|
+
<element name="area">
|
|
2028
|
+
<attribute name="type">
|
|
2029
|
+
<choice>
|
|
2030
|
+
<value>rect</value>
|
|
2031
|
+
<value>circle</value>
|
|
2032
|
+
<value>ellipse</value>
|
|
2033
|
+
<value>poly</value>
|
|
2034
|
+
</choice>
|
|
2035
|
+
</attribute>
|
|
2036
|
+
<choice>
|
|
2037
|
+
<ref name="xref"/>
|
|
2038
|
+
<ref name="hyperlink"/>
|
|
2039
|
+
<ref name="eref"/>
|
|
2040
|
+
</choice>
|
|
2041
|
+
<oneOrMore>
|
|
2042
|
+
<element name="coords">
|
|
2043
|
+
<attribute name="x">
|
|
2044
|
+
<data type="float"/>
|
|
2045
|
+
</attribute>
|
|
2046
|
+
<attribute name="y">
|
|
2047
|
+
<data type="float"/>
|
|
2048
|
+
</attribute>
|
|
2049
|
+
</element>
|
|
2050
|
+
</oneOrMore>
|
|
2051
|
+
<optional>
|
|
2052
|
+
<element name="radius">
|
|
2053
|
+
<attribute name="x">
|
|
2054
|
+
<data type="float"/>
|
|
2055
|
+
</attribute>
|
|
2056
|
+
<optional>
|
|
2057
|
+
<attribute name="y">
|
|
2058
|
+
<data type="float"/>
|
|
2059
|
+
</attribute>
|
|
2060
|
+
</optional>
|
|
2061
|
+
</element>
|
|
2062
|
+
</optional>
|
|
2063
|
+
</element>
|
|
2064
|
+
</zeroOrMore>
|
|
2065
|
+
</element>
|
|
2066
|
+
</define>
|
|
2067
|
+
<define name="svgmap">
|
|
2068
|
+
<element name="svgmap">
|
|
2069
|
+
<ref name="figure"/>
|
|
2070
|
+
<zeroOrMore>
|
|
2071
|
+
<element name="target">
|
|
2072
|
+
<attribute name="href">
|
|
2073
|
+
<data type="anyURI"/>
|
|
2074
|
+
</attribute>
|
|
2075
|
+
<choice>
|
|
2076
|
+
<ref name="xref"/>
|
|
2077
|
+
<ref name="hyperlink"/>
|
|
2078
|
+
<ref name="eref"/>
|
|
2079
|
+
</choice>
|
|
2080
|
+
</element>
|
|
2081
|
+
</zeroOrMore>
|
|
2082
|
+
</element>
|
|
2083
|
+
</define>
|
|
2084
|
+
<define name="ul_li">
|
|
2085
|
+
<element name="li">
|
|
2086
|
+
<optional>
|
|
2087
|
+
<attribute name="id">
|
|
2088
|
+
<data type="ID"/>
|
|
2089
|
+
</attribute>
|
|
2090
|
+
</optional>
|
|
2091
|
+
<optional>
|
|
2092
|
+
<attribute name="uncheckedcheckbox">
|
|
2093
|
+
<data type="boolean"/>
|
|
2094
|
+
</attribute>
|
|
2095
|
+
</optional>
|
|
2096
|
+
<optional>
|
|
2097
|
+
<attribute name="checkedcheckbox">
|
|
2098
|
+
<data type="boolean"/>
|
|
2099
|
+
</attribute>
|
|
2100
|
+
</optional>
|
|
2101
|
+
<oneOrMore>
|
|
2102
|
+
<ref name="BasicBlock"/>
|
|
2103
|
+
</oneOrMore>
|
|
2104
|
+
</element>
|
|
2105
|
+
</define>
|
|
1590
2106
|
</grammar>
|