relaton-bipm 1.6.1 → 1.8.1

Sign up to get free protection for your applications and to get access to all the features.
data/grammars/biblio.rng CHANGED
@@ -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-isodoc+xml</value>
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
- <choice>
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>cited</value>
1107
+ <value>cites</value>
1110
1108
  <value>isCitedIn</value>
1111
1109
  </choice>
1112
1110
  </define>
data/grammars/bipm.rng CHANGED
@@ -42,9 +42,163 @@
42
42
  <data type="boolean"/>
43
43
  </attribute>
44
44
  </optional>
45
+ <optional>
46
+ <attribute name="nosee">
47
+ <data type="boolean"/>
48
+ </attribute>
49
+ </optional>
50
+ <optional>
51
+ <attribute name="nopage">
52
+ <data type="boolean"/>
53
+ </attribute>
54
+ </optional>
45
55
  <text/>
46
56
  </element>
47
57
  </define>
58
+ <define name="Clause-Section">
59
+ <optional>
60
+ <attribute name="id">
61
+ <data type="ID"/>
62
+ </attribute>
63
+ </optional>
64
+ <optional>
65
+ <attribute name="language"/>
66
+ </optional>
67
+ <optional>
68
+ <attribute name="script"/>
69
+ </optional>
70
+ <optional>
71
+ <attribute name="inline-header">
72
+ <data type="boolean"/>
73
+ </attribute>
74
+ </optional>
75
+ <optional>
76
+ <attribute name="obligation">
77
+ <choice>
78
+ <value>normative</value>
79
+ <value>informative</value>
80
+ </choice>
81
+ </attribute>
82
+ </optional>
83
+ <optional>
84
+ <attribute name="type"/>
85
+ </optional>
86
+ <optional>
87
+ <attribute name="unnumbered">
88
+ <data type="boolean"/>
89
+ </attribute>
90
+ </optional>
91
+ <optional>
92
+ <ref name="section-title"/>
93
+ </optional>
94
+ <group>
95
+ <choice>
96
+ <group>
97
+ <zeroOrMore>
98
+ <ref name="BasicBlock"/>
99
+ </zeroOrMore>
100
+ <zeroOrMore>
101
+ <ref name="note"/>
102
+ </zeroOrMore>
103
+ </group>
104
+ <ref name="amend"/>
105
+ </choice>
106
+ <zeroOrMore>
107
+ <choice>
108
+ <ref name="clause-subsection"/>
109
+ <ref name="terms"/>
110
+ <ref name="definitions"/>
111
+ </choice>
112
+ </zeroOrMore>
113
+ </group>
114
+ </define>
115
+ <define name="Annex-Section">
116
+ <optional>
117
+ <attribute name="id">
118
+ <data type="ID"/>
119
+ </attribute>
120
+ </optional>
121
+ <optional>
122
+ <attribute name="language"/>
123
+ </optional>
124
+ <optional>
125
+ <attribute name="script"/>
126
+ </optional>
127
+ <optional>
128
+ <attribute name="inline-header">
129
+ <data type="boolean"/>
130
+ </attribute>
131
+ </optional>
132
+ <optional>
133
+ <attribute name="obligation">
134
+ <choice>
135
+ <value>normative</value>
136
+ <value>informative</value>
137
+ </choice>
138
+ </attribute>
139
+ </optional>
140
+ <optional>
141
+ <attribute name="unnumbered">
142
+ <data type="boolean"/>
143
+ </attribute>
144
+ </optional>
145
+ <optional>
146
+ <ref name="section-title"/>
147
+ </optional>
148
+ <group>
149
+ <group>
150
+ <zeroOrMore>
151
+ <ref name="BasicBlock"/>
152
+ </zeroOrMore>
153
+ <zeroOrMore>
154
+ <ref name="note"/>
155
+ </zeroOrMore>
156
+ </group>
157
+ <zeroOrMore>
158
+ <choice>
159
+ <ref name="annex-subsection"/>
160
+ <ref name="terms"/>
161
+ <ref name="definitions"/>
162
+ <ref name="references"/>
163
+ </choice>
164
+ </zeroOrMore>
165
+ </group>
166
+ </define>
167
+ <define name="ol">
168
+ <element name="ol">
169
+ <attribute name="id">
170
+ <data type="ID"/>
171
+ </attribute>
172
+ <optional>
173
+ <attribute name="keep-with-next">
174
+ <data type="boolean"/>
175
+ </attribute>
176
+ </optional>
177
+ <optional>
178
+ <attribute name="keep-lines-together">
179
+ <data type="boolean"/>
180
+ </attribute>
181
+ </optional>
182
+ <attribute name="type">
183
+ <choice>
184
+ <value>roman</value>
185
+ <value>alphabet</value>
186
+ <value>arabic</value>
187
+ <value>roman_upper</value>
188
+ <value>alphabet_upper</value>
189
+ </choice>
190
+ </attribute>
191
+ <optional>
192
+ <attribute name="start"/>
193
+ </optional>
194
+ <oneOrMore>
195
+ <ref name="li"/>
196
+ </oneOrMore>
197
+ <zeroOrMore>
198
+ <ref name="note"/>
199
+ </zeroOrMore>
200
+ </element>
201
+ </define>
48
202
  <define name="DocumentType">
49
203
  <choice>
50
204
  <value>brochure</value>
@@ -65,9 +219,9 @@
65
219
  <oneOrMore>
66
220
  <ref name="committee"/>
67
221
  </oneOrMore>
68
- <oneOrMore>
222
+ <zeroOrMore>
69
223
  <ref name="workgroup"/>
70
- </oneOrMore>
224
+ </zeroOrMore>
71
225
  </element>
72
226
  </define>
73
227
  <define name="structuredidentifier">
@@ -98,6 +252,9 @@
98
252
  <optional>
99
253
  <ref name="si-aspect"/>
100
254
  </optional>
255
+ <optional>
256
+ <ref name="meeting-note"/>
257
+ </optional>
101
258
  <ref name="structuredidentifier"/>
102
259
  </define>
103
260
  </include>
@@ -132,30 +289,41 @@
132
289
  </define>
133
290
  <define name="committee">
134
291
  <element name="committee">
135
- <choice>
136
- <value>CGPM</value>
137
- <value>CIPM</value>
138
- <value>BIPM</value>
139
- <value>CCAUV</value>
140
- <value>CCEM</value>
141
- <value>CCL</value>
142
- <value>CCM</value>
143
- <value>CCPR</value>
144
- <value>CCQM</value>
145
- <value>CCRI</value>
146
- <value>CCT</value>
147
- <value>CCTF</value>
148
- <value>CCU</value>
149
- <value>CCL-CCTF</value>
150
- <value>JCGM</value>
151
- <value>JCRB</value>
152
- <value>JCTLM</value>
153
- <value>INetQI</value>
154
- </choice>
292
+ <attribute name="acronym">
293
+ <choice>
294
+ <value>CGPM</value>
295
+ <value>CIPM</value>
296
+ <value>BIPM</value>
297
+ <value>CCAUV</value>
298
+ <value>CCEM</value>
299
+ <value>CCL</value>
300
+ <value>CCM</value>
301
+ <value>CCPR</value>
302
+ <value>CCQM</value>
303
+ <value>CCRI</value>
304
+ <value>CCT</value>
305
+ <value>CCTF</value>
306
+ <value>CCU</value>
307
+ <value>CCL-CCTF</value>
308
+ <value>JCGM</value>
309
+ <value>JCRB</value>
310
+ <value>JCTLM</value>
311
+ <value>INetQI</value>
312
+ </choice>
313
+ </attribute>
314
+ <ref name="LocalizedString"/>
155
315
  </element>
156
316
  </define>
157
317
  <define name="workgroup">
158
318
  <element name="workgroup">
319
+ <optional>
320
+ <attribute name="acronym"/>
321
+ </optional>
322
+ <text/>
323
+ </element>
324
+ </define>
325
+ <define name="meeting-note">
326
+ <element name="meeting-note">
159
327
  <text/>
160
328
  </element>
161
329
  </define>
@@ -172,17 +340,27 @@
172
340
  <zeroOrMore>
173
341
  <ref name="termdocsource"/>
174
342
  </zeroOrMore>
343
+ <optional>
344
+ <ref name="misccontainer"/>
345
+ </optional>
175
346
  <optional>
176
347
  <ref name="boilerplate"/>
177
348
  </optional>
178
- <ref name="preface"/>
349
+ <optional>
350
+ <ref name="preface"/>
351
+ </optional>
179
352
  <oneOrMore>
180
353
  <ref name="sections"/>
181
354
  </oneOrMore>
182
355
  <zeroOrMore>
183
356
  <ref name="annex"/>
184
357
  </zeroOrMore>
185
- <ref name="bibliography"/>
358
+ <optional>
359
+ <ref name="bibliography"/>
360
+ </optional>
361
+ <zeroOrMore>
362
+ <ref name="indexsect"/>
363
+ </zeroOrMore>
186
364
  </element>
187
365
  </define>
188
366
  </grammar>
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="li"/>
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
- <ref name="concept"/>
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
- <element name="text">
860
- <text/>
861
- </element>
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="references"/>
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
- <optional>
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>