relaton-iec 1.9.0 → 1.11.0

Sign up to get free protection for your applications and to get access to all the features.
data/grammars/isodoc.rng CHANGED
@@ -17,7 +17,7 @@
17
17
  these elements; we just want one namespace for any child grammars
18
18
  of this.
19
19
  -->
20
- <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
20
+ <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
21
21
  <include href="reqt.rng"/>
22
22
  <!-- include "biblio.rnc" { } -->
23
23
  <include href="basicdoc.rng">
@@ -32,6 +32,68 @@
32
32
  <ref name="DocumentType"/>
33
33
  </element>
34
34
  </define>
35
+ <define name="index">
36
+ <element name="index">
37
+ <optional>
38
+ <attribute name="to">
39
+ <data type="IDREF"/>
40
+ </attribute>
41
+ </optional>
42
+ <element name="primary">
43
+ <oneOrMore>
44
+ <choice>
45
+ <ref name="PureTextElement"/>
46
+ <ref name="stem"/>
47
+ </choice>
48
+ </oneOrMore>
49
+ </element>
50
+ <optional>
51
+ <element name="secondary">
52
+ <oneOrMore>
53
+ <choice>
54
+ <ref name="PureTextElement"/>
55
+ <ref name="stem"/>
56
+ </choice>
57
+ </oneOrMore>
58
+ </element>
59
+ </optional>
60
+ <optional>
61
+ <element name="tertiary">
62
+ <oneOrMore>
63
+ <choice>
64
+ <ref name="PureTextElement"/>
65
+ <ref name="stem"/>
66
+ </choice>
67
+ </oneOrMore>
68
+ </element>
69
+ </optional>
70
+ </element>
71
+ </define>
72
+ <define name="bibitem">
73
+ <element name="bibitem">
74
+ <attribute name="id">
75
+ <data type="ID"/>
76
+ </attribute>
77
+ <optional>
78
+ <attribute name="hidden">
79
+ <data type="boolean"/>
80
+ </attribute>
81
+ </optional>
82
+ <ref name="BibliographicItem"/>
83
+ </element>
84
+ </define>
85
+ <define name="section-title">
86
+ <element name="title">
87
+ <zeroOrMore>
88
+ <ref name="TextElement"/>
89
+ </zeroOrMore>
90
+ </element>
91
+ <zeroOrMore>
92
+ <element name="variant-title">
93
+ <ref name="TypedTitleString"/>
94
+ </element>
95
+ </zeroOrMore>
96
+ </define>
35
97
  <define name="hyperlink">
36
98
  <element name="link">
37
99
  <attribute name="target">
@@ -46,11 +108,13 @@
46
108
  <attribute name="alt"/>
47
109
  </optional>
48
110
  <optional>
49
- <attribute name="updatetype">
111
+ <attribute name="update-type">
50
112
  <data type="boolean"/>
51
113
  </attribute>
52
114
  </optional>
53
- <text/>
115
+ <oneOrMore>
116
+ <ref name="PureTextElement"/>
117
+ </oneOrMore>
54
118
  </element>
55
119
  </define>
56
120
  <define name="xref">
@@ -88,7 +152,7 @@
88
152
  <data type="boolean"/>
89
153
  </attribute>
90
154
  </optional>
91
- <text/>
155
+ <ref name="XrefBody"/>
92
156
  </element>
93
157
  </define>
94
158
  <define name="erefType">
@@ -118,7 +182,45 @@
118
182
  </attribute>
119
183
  </optional>
120
184
  <ref name="CitationType"/>
121
- <text/>
185
+ <oneOrMore>
186
+ <ref name="PureTextElement"/>
187
+ </oneOrMore>
188
+ </define>
189
+ <define name="localityStack">
190
+ <element name="localityStack">
191
+ <optional>
192
+ <attribute name="connective">
193
+ <choice>
194
+ <value>and</value>
195
+ <value>or</value>
196
+ <value>from</value>
197
+ <value>to</value>
198
+ <value/>
199
+ </choice>
200
+ </attribute>
201
+ </optional>
202
+ <zeroOrMore>
203
+ <ref name="locality"/>
204
+ </zeroOrMore>
205
+ </element>
206
+ </define>
207
+ <define name="sourceLocalityStack">
208
+ <element name="sourceLocalityStack">
209
+ <optional>
210
+ <attribute name="connective">
211
+ <choice>
212
+ <value>and</value>
213
+ <value>or</value>
214
+ <value>from</value>
215
+ <value>to</value>
216
+ <value/>
217
+ </choice>
218
+ </attribute>
219
+ </optional>
220
+ <zeroOrMore>
221
+ <ref name="sourceLocality"/>
222
+ </zeroOrMore>
223
+ </element>
122
224
  </define>
123
225
  <define name="ul">
124
226
  <element name="ul">
@@ -135,6 +237,14 @@
135
237
  <data type="boolean"/>
136
238
  </attribute>
137
239
  </optional>
240
+ <optional>
241
+ <attribute name="tag"/>
242
+ </optional>
243
+ <optional>
244
+ <attribute name="multilingual-rendering">
245
+ <ref name="MultilingualRenderingType"/>
246
+ </attribute>
247
+ </optional>
138
248
  <oneOrMore>
139
249
  <ref name="ul_li"/>
140
250
  </oneOrMore>
@@ -158,15 +268,25 @@
158
268
  <data type="boolean"/>
159
269
  </attribute>
160
270
  </optional>
161
- <attribute name="type">
162
- <choice>
163
- <value>roman</value>
164
- <value>alphabet</value>
165
- <value>arabic</value>
166
- <value>roman_upper</value>
167
- <value>alphabet_upper</value>
168
- </choice>
169
- </attribute>
271
+ <optional>
272
+ <attribute name="tag"/>
273
+ </optional>
274
+ <optional>
275
+ <attribute name="multilingual-rendering">
276
+ <ref name="MultilingualRenderingType"/>
277
+ </attribute>
278
+ </optional>
279
+ <optional>
280
+ <attribute name="type">
281
+ <choice>
282
+ <value>roman</value>
283
+ <value>alphabet</value>
284
+ <value>arabic</value>
285
+ <value>roman_upper</value>
286
+ <value>alphabet_upper</value>
287
+ </choice>
288
+ </attribute>
289
+ </optional>
170
290
  <oneOrMore>
171
291
  <ref name="li"/>
172
292
  </oneOrMore>
@@ -195,6 +315,14 @@
195
315
  <data type="boolean"/>
196
316
  </attribute>
197
317
  </optional>
318
+ <optional>
319
+ <attribute name="tag"/>
320
+ </optional>
321
+ <optional>
322
+ <attribute name="multilingual-rendering">
323
+ <ref name="MultilingualRenderingType"/>
324
+ </attribute>
325
+ </optional>
198
326
  <oneOrMore>
199
327
  <ref name="dt"/>
200
328
  <ref name="dd"/>
@@ -242,6 +370,14 @@
242
370
  <data type="boolean"/>
243
371
  </attribute>
244
372
  </optional>
373
+ <optional>
374
+ <attribute name="tag"/>
375
+ </optional>
376
+ <optional>
377
+ <attribute name="multilingual-rendering">
378
+ <ref name="MultilingualRenderingType"/>
379
+ </attribute>
380
+ </optional>
245
381
  <optional>
246
382
  <ref name="tname"/>
247
383
  </optional>
@@ -302,6 +438,14 @@
302
438
  <optional>
303
439
  <attribute name="width"/>
304
440
  </optional>
441
+ <optional>
442
+ <attribute name="tag"/>
443
+ </optional>
444
+ <optional>
445
+ <attribute name="multilingual-rendering">
446
+ <ref name="MultilingualRenderingType"/>
447
+ </attribute>
448
+ </optional>
305
449
  <optional>
306
450
  <ref name="colgroup"/>
307
451
  </optional>
@@ -352,6 +496,14 @@
352
496
  <optional>
353
497
  <attribute name="class"/>
354
498
  </optional>
499
+ <optional>
500
+ <attribute name="tag"/>
501
+ </optional>
502
+ <optional>
503
+ <attribute name="multilingual-rendering">
504
+ <ref name="MultilingualRenderingType"/>
505
+ </attribute>
506
+ </optional>
355
507
  <optional>
356
508
  <ref name="source"/>
357
509
  </optional>
@@ -410,6 +562,14 @@
410
562
  <optional>
411
563
  <attribute name="lang"/>
412
564
  </optional>
565
+ <optional>
566
+ <attribute name="tag"/>
567
+ </optional>
568
+ <optional>
569
+ <attribute name="multilingual-rendering">
570
+ <ref name="MultilingualRenderingType"/>
571
+ </attribute>
572
+ </optional>
413
573
  <optional>
414
574
  <ref name="tname"/>
415
575
  </optional>
@@ -458,6 +618,14 @@
458
618
  <data type="boolean"/>
459
619
  </attribute>
460
620
  </optional>
621
+ <optional>
622
+ <attribute name="tag"/>
623
+ </optional>
624
+ <optional>
625
+ <attribute name="multilingual-rendering">
626
+ <ref name="MultilingualRenderingType"/>
627
+ </attribute>
628
+ </optional>
461
629
  <ref name="stem"/>
462
630
  <optional>
463
631
  <ref name="dl"/>
@@ -486,6 +654,14 @@
486
654
  <data type="boolean"/>
487
655
  </attribute>
488
656
  </optional>
657
+ <optional>
658
+ <attribute name="tag"/>
659
+ </optional>
660
+ <optional>
661
+ <attribute name="multilingual-rendering">
662
+ <ref name="MultilingualRenderingType"/>
663
+ </attribute>
664
+ </optional>
489
665
  <zeroOrMore>
490
666
  <ref name="TextElement"/>
491
667
  </zeroOrMore>
@@ -513,6 +689,14 @@
513
689
  <data type="boolean"/>
514
690
  </attribute>
515
691
  </optional>
692
+ <optional>
693
+ <attribute name="tag"/>
694
+ </optional>
695
+ <optional>
696
+ <attribute name="multilingual-rendering">
697
+ <ref name="MultilingualRenderingType"/>
698
+ </attribute>
699
+ </optional>
516
700
  <zeroOrMore>
517
701
  <choice>
518
702
  <ref name="TextElement"/>
@@ -544,6 +728,14 @@
544
728
  <data type="boolean"/>
545
729
  </attribute>
546
730
  </optional>
731
+ <optional>
732
+ <attribute name="tag"/>
733
+ </optional>
734
+ <optional>
735
+ <attribute name="multilingual-rendering">
736
+ <ref name="MultilingualRenderingType"/>
737
+ </attribute>
738
+ </optional>
547
739
  <optional>
548
740
  <ref name="quote-source"/>
549
741
  </optional>
@@ -582,6 +774,7 @@
582
774
  <ref name="terms"/>
583
775
  <ref name="term-clause"/>
584
776
  <ref name="definitions"/>
777
+ <ref name="floating-title"/>
585
778
  </choice>
586
779
  </oneOrMore>
587
780
  </element>
@@ -610,9 +803,6 @@
610
803
  <zeroOrMore>
611
804
  <ref name="BasicBlock"/>
612
805
  </zeroOrMore>
613
- <zeroOrMore>
614
- <ref name="note"/>
615
- </zeroOrMore>
616
806
  <zeroOrMore>
617
807
  <ref name="bibitem"/>
618
808
  <zeroOrMore>
@@ -653,6 +843,14 @@
653
843
  <optional>
654
844
  <attribute name="type"/>
655
845
  </optional>
846
+ <optional>
847
+ <attribute name="tag"/>
848
+ </optional>
849
+ <optional>
850
+ <attribute name="multilingual-rendering">
851
+ <ref name="MultilingualRenderingType"/>
852
+ </attribute>
853
+ </optional>
656
854
  <oneOrMore>
657
855
  <choice>
658
856
  <ref name="paragraph"/>
@@ -689,14 +887,9 @@
689
887
  <optional>
690
888
  <ref name="section-title"/>
691
889
  </optional>
692
- <group>
693
- <oneOrMore>
694
- <ref name="BasicBlock"/>
695
- </oneOrMore>
696
- <zeroOrMore>
697
- <ref name="note"/>
698
- </zeroOrMore>
699
- </group>
890
+ <oneOrMore>
891
+ <ref name="BasicBlock"/>
892
+ </oneOrMore>
700
893
  </define>
701
894
  <define name="li">
702
895
  <element name="li">
@@ -831,6 +1024,9 @@
831
1024
  <ref name="PureTextElement"/>
832
1025
  <ref name="stem"/>
833
1026
  <ref name="index"/>
1027
+ <ref name="eref"/>
1028
+ <ref name="xref"/>
1029
+ <ref name="hyperlink"/>
834
1030
  </choice>
835
1031
  </zeroOrMore>
836
1032
  </element>
@@ -842,6 +1038,9 @@
842
1038
  <ref name="PureTextElement"/>
843
1039
  <ref name="stem"/>
844
1040
  <ref name="index"/>
1041
+ <ref name="eref"/>
1042
+ <ref name="xref"/>
1043
+ <ref name="hyperlink"/>
845
1044
  </choice>
846
1045
  </zeroOrMore>
847
1046
  </element>
@@ -852,6 +1051,9 @@
852
1051
  <choice>
853
1052
  <ref name="PureTextElement"/>
854
1053
  <ref name="index"/>
1054
+ <ref name="eref"/>
1055
+ <ref name="xref"/>
1056
+ <ref name="hyperlink"/>
855
1057
  </choice>
856
1058
  </zeroOrMore>
857
1059
  </element>
@@ -896,6 +1098,26 @@
896
1098
  </zeroOrMore>
897
1099
  </element>
898
1100
  </define>
1101
+ <define name="sub">
1102
+ <element name="sub">
1103
+ <zeroOrMore>
1104
+ <choice>
1105
+ <ref name="PureTextElement"/>
1106
+ <ref name="stem"/>
1107
+ </choice>
1108
+ </zeroOrMore>
1109
+ </element>
1110
+ </define>
1111
+ <define name="sup">
1112
+ <element name="sup">
1113
+ <zeroOrMore>
1114
+ <choice>
1115
+ <ref name="PureTextElement"/>
1116
+ <ref name="stem"/>
1117
+ </choice>
1118
+ </zeroOrMore>
1119
+ </element>
1120
+ </define>
899
1121
  <define name="pagebreak">
900
1122
  <element name="pagebreak">
901
1123
  <optional>
@@ -910,6 +1132,24 @@
910
1132
  </define>
911
1133
  </include>
912
1134
  <!-- end overrides -->
1135
+ <define name="image" combine="choice">
1136
+ <element name="svg">
1137
+ <oneOrMore>
1138
+ <choice>
1139
+ <text/>
1140
+ <ref name="AnyElement"/>
1141
+ </choice>
1142
+ </oneOrMore>
1143
+ </element>
1144
+ </define>
1145
+ <define name="MultilingualRenderingType">
1146
+ <choice>
1147
+ <value>common</value>
1148
+ <value>all-columns</value>
1149
+ <value>parallel</value>
1150
+ <value>tag</value>
1151
+ </choice>
1152
+ </define>
913
1153
  <define name="docsubtype">
914
1154
  <element name="subdoctype">
915
1155
  <ref name="DocumentSubtype"/>
@@ -976,6 +1216,16 @@
976
1216
  <data type="boolean"/>
977
1217
  </attribute>
978
1218
  </optional>
1219
+ <optional>
1220
+ <attribute name="linkmention">
1221
+ <data type="boolean"/>
1222
+ </attribute>
1223
+ </optional>
1224
+ <optional>
1225
+ <attribute name="linkref">
1226
+ <data type="boolean"/>
1227
+ </attribute>
1228
+ </optional>
979
1229
  <optional>
980
1230
  <element name="refterm">
981
1231
  <zeroOrMore>
@@ -1011,8 +1261,23 @@
1011
1261
  <ref name="imagemap"/>
1012
1262
  <ref name="svgmap"/>
1013
1263
  <ref name="inputform"/>
1264
+ <ref name="toc"/>
1265
+ <ref name="passthrough"/>
1014
1266
  </choice>
1015
1267
  </define>
1268
+ <define name="toc">
1269
+ <element name="toc">
1270
+ <ref name="ul"/>
1271
+ </element>
1272
+ </define>
1273
+ <define name="passthrough">
1274
+ <element name="passthrough">
1275
+ <optional>
1276
+ <attribute name="formats"/>
1277
+ </optional>
1278
+ <text/>
1279
+ </element>
1280
+ </define>
1016
1281
  <define name="inputform">
1017
1282
  <element name="form">
1018
1283
  <attribute name="id">
@@ -1023,6 +1288,14 @@
1023
1288
  <optional>
1024
1289
  <attribute name="class"/>
1025
1290
  </optional>
1291
+ <optional>
1292
+ <attribute name="tag"/>
1293
+ </optional>
1294
+ <optional>
1295
+ <attribute name="multilingual-rendering">
1296
+ <ref name="MultilingualRenderingType"/>
1297
+ </attribute>
1298
+ </optional>
1026
1299
  <zeroOrMore>
1027
1300
  <choice>
1028
1301
  <ref name="TextElement"/>
@@ -1222,9 +1495,6 @@
1222
1495
  <zeroOrMore>
1223
1496
  <ref name="BasicBlock"/>
1224
1497
  </zeroOrMore>
1225
- <zeroOrMore>
1226
- <ref name="note"/>
1227
- </zeroOrMore>
1228
1498
  <choice>
1229
1499
  <oneOrMore>
1230
1500
  <ref name="reference-clause"/>
@@ -1407,9 +1677,6 @@
1407
1677
  <zeroOrMore>
1408
1678
  <ref name="BasicBlock"/>
1409
1679
  </zeroOrMore>
1410
- <zeroOrMore>
1411
- <ref name="note"/>
1412
- </zeroOrMore>
1413
1680
  <ref name="dl"/>
1414
1681
  </oneOrMore>
1415
1682
  </element>
@@ -1469,14 +1736,9 @@
1469
1736
  <ref name="section-title"/>
1470
1737
  </optional>
1471
1738
  <group>
1472
- <group>
1473
- <zeroOrMore>
1474
- <ref name="BasicBlock"/>
1475
- </zeroOrMore>
1476
- <zeroOrMore>
1477
- <ref name="note"/>
1478
- </zeroOrMore>
1479
- </group>
1739
+ <zeroOrMore>
1740
+ <ref name="BasicBlock"/>
1741
+ </zeroOrMore>
1480
1742
  <zeroOrMore>
1481
1743
  <ref name="content-subsection"/>
1482
1744
  </zeroOrMore>
@@ -1523,14 +1785,9 @@
1523
1785
  </optional>
1524
1786
  <choice>
1525
1787
  <choice>
1526
- <group>
1527
- <oneOrMore>
1528
- <ref name="BasicBlock"/>
1529
- </oneOrMore>
1530
- <zeroOrMore>
1531
- <ref name="note"/>
1532
- </zeroOrMore>
1533
- </group>
1788
+ <oneOrMore>
1789
+ <ref name="BasicBlock"/>
1790
+ </oneOrMore>
1534
1791
  <ref name="amend"/>
1535
1792
  </choice>
1536
1793
  <oneOrMore>
@@ -1538,6 +1795,7 @@
1538
1795
  <ref name="clause-subsection"/>
1539
1796
  <ref name="terms"/>
1540
1797
  <ref name="definitions"/>
1798
+ <ref name="floating-title"/>
1541
1799
  </choice>
1542
1800
  </oneOrMore>
1543
1801
  </choice>
@@ -1571,20 +1829,16 @@
1571
1829
  <ref name="section-title"/>
1572
1830
  </optional>
1573
1831
  <group>
1574
- <group>
1575
- <zeroOrMore>
1576
- <ref name="BasicBlock"/>
1577
- </zeroOrMore>
1578
- <zeroOrMore>
1579
- <ref name="note"/>
1580
- </zeroOrMore>
1581
- </group>
1832
+ <zeroOrMore>
1833
+ <ref name="BasicBlock"/>
1834
+ </zeroOrMore>
1582
1835
  <zeroOrMore>
1583
1836
  <choice>
1584
1837
  <ref name="annex-subsection"/>
1585
1838
  <ref name="terms"/>
1586
1839
  <ref name="definitions"/>
1587
1840
  <ref name="references"/>
1841
+ <ref name="floating-title"/>
1588
1842
  </choice>
1589
1843
  </zeroOrMore>
1590
1844
  </group>
@@ -1637,9 +1891,6 @@
1637
1891
  <zeroOrMore>
1638
1892
  <ref name="BasicBlock"/>
1639
1893
  </zeroOrMore>
1640
- <zeroOrMore>
1641
- <ref name="note"/>
1642
- </zeroOrMore>
1643
1894
  <choice>
1644
1895
  <oneOrMore>
1645
1896
  <ref name="term"/>
@@ -1662,6 +1913,20 @@
1662
1913
  <data type="ID"/>
1663
1914
  </attribute>
1664
1915
  </optional>
1916
+ <optional>
1917
+ <attribute name="language"/>
1918
+ </optional>
1919
+ <optional>
1920
+ <attribute name="script"/>
1921
+ </optional>
1922
+ <optional>
1923
+ <attribute name="tag"/>
1924
+ </optional>
1925
+ <optional>
1926
+ <attribute name="multilingual-rendering">
1927
+ <ref name="MultilingualRenderingType"/>
1928
+ </attribute>
1929
+ </optional>
1665
1930
  <oneOrMore>
1666
1931
  <ref name="preferred"/>
1667
1932
  </oneOrMore>
@@ -1669,18 +1934,20 @@
1669
1934
  <ref name="admitted"/>
1670
1935
  </zeroOrMore>
1671
1936
  <zeroOrMore>
1672
- <ref name="related"/>
1937
+ <ref name="deprecates"/>
1673
1938
  </zeroOrMore>
1674
1939
  <zeroOrMore>
1675
- <ref name="deprecates"/>
1940
+ <ref name="related"/>
1676
1941
  </zeroOrMore>
1677
1942
  <optional>
1678
1943
  <ref name="termdomain"/>
1679
1944
  </optional>
1680
- <zeroOrMore>
1681
- <ref name="termgrammar"/>
1682
- </zeroOrMore>
1683
- <ref name="definition"/>
1945
+ <optional>
1946
+ <ref name="termsubject"/>
1947
+ </optional>
1948
+ <oneOrMore>
1949
+ <ref name="termdefinition"/>
1950
+ </oneOrMore>
1684
1951
  <zeroOrMore>
1685
1952
  <ref name="termnote"/>
1686
1953
  </zeroOrMore>
@@ -1694,41 +1961,236 @@
1694
1961
  </define>
1695
1962
  <define name="preferred">
1696
1963
  <element name="preferred">
1697
- <oneOrMore>
1698
- <ref name="TextElement"/>
1699
- </oneOrMore>
1964
+ <ref name="Designation"/>
1700
1965
  </element>
1701
1966
  </define>
1702
1967
  <define name="admitted">
1703
1968
  <element name="admitted">
1704
- <oneOrMore>
1705
- <ref name="TextElement"/>
1706
- </oneOrMore>
1969
+ <ref name="Designation"/>
1707
1970
  </element>
1708
1971
  </define>
1709
1972
  <define name="related">
1710
1973
  <element name="related">
1974
+ <attribute name="type">
1975
+ <ref name="RelatedTermType"/>
1976
+ </attribute>
1977
+ <element name="preferred">
1978
+ <ref name="Designation"/>
1979
+ </element>
1980
+ <choice>
1981
+ <ref name="eref"/>
1982
+ <ref name="xref"/>
1983
+ <ref name="termref"/>
1984
+ </choice>
1985
+ </element>
1986
+ </define>
1987
+ <define name="RelatedTermType">
1988
+ <choice>
1989
+ <value>deprecates</value>
1990
+ <value>supersedes</value>
1991
+ <value>narrower</value>
1992
+ <value>broader</value>
1993
+ <value>equivalent</value>
1994
+ <value>compare</value>
1995
+ <value>contrast</value>
1996
+ <value>see</value>
1997
+ </choice>
1998
+ </define>
1999
+ <define name="deprecates">
2000
+ <element name="deprecates">
2001
+ <ref name="Designation"/>
2002
+ </element>
2003
+ </define>
2004
+ <define name="Designation">
2005
+ <optional>
2006
+ <attribute name="absent">
2007
+ <data type="boolean"/>
2008
+ </attribute>
2009
+ </optional>
2010
+ <optional>
2011
+ <attribute name="geographic-area"/>
2012
+ </optional>
2013
+ <choice>
2014
+ <ref name="expression_designation"/>
2015
+ <ref name="letter_symbol_designation"/>
2016
+ <ref name="graphical_symbol_designation"/>
2017
+ </choice>
2018
+ <optional>
2019
+ <ref name="fieldofapplication"/>
2020
+ </optional>
2021
+ <optional>
2022
+ <ref name="usageinfo"/>
2023
+ </optional>
2024
+ <zeroOrMore>
2025
+ <ref name="termsource"/>
2026
+ </zeroOrMore>
2027
+ </define>
2028
+ <define name="fieldofapplication">
2029
+ <element name="field-of-application">
2030
+ <oneOrMore>
2031
+ <ref name="PureTextElement"/>
2032
+ </oneOrMore>
2033
+ </element>
2034
+ </define>
2035
+ <define name="usageinfo">
2036
+ <element name="usage-info">
2037
+ <oneOrMore>
2038
+ <ref name="PureTextElement"/>
2039
+ </oneOrMore>
2040
+ </element>
2041
+ </define>
2042
+ <define name="letter_symbol_designation">
2043
+ <element name="letter-symbol">
1711
2044
  <optional>
1712
- <attribute name="type">
2045
+ <attribute name="isInternational">
2046
+ <data type="boolean"/>
2047
+ </attribute>
2048
+ </optional>
2049
+ <element name="name">
2050
+ <oneOrMore>
1713
2051
  <choice>
1714
- <value>compare</value>
1715
- <value>contrast</value>
1716
- <value>see</value>
2052
+ <ref name="PureTextElement"/>
2053
+ <ref name="stem"/>
1717
2054
  </choice>
2055
+ </oneOrMore>
2056
+ </element>
2057
+ </element>
2058
+ </define>
2059
+ <define name="graphical_symbol_designation">
2060
+ <element name="graphical-symbol">
2061
+ <optional>
2062
+ <attribute name="isInternational">
2063
+ <data type="boolean"/>
1718
2064
  </attribute>
1719
2065
  </optional>
1720
- <oneOrMore>
1721
- <ref name="TextElement"/>
1722
- </oneOrMore>
2066
+ <ref name="figure"/>
1723
2067
  </element>
1724
2068
  </define>
1725
- <define name="deprecates">
1726
- <element name="deprecates">
1727
- <oneOrMore>
1728
- <ref name="TextElement"/>
1729
- </oneOrMore>
2069
+ <define name="expression_designation">
2070
+ <element name="expression">
2071
+ <optional>
2072
+ <attribute name="language">
2073
+ <a:documentation>ISO-639</a:documentation>
2074
+ </attribute>
2075
+ </optional>
2076
+ <optional>
2077
+ <attribute name="script">
2078
+ <a:documentation>ISO-15924</a:documentation>
2079
+ </attribute>
2080
+ </optional>
2081
+ <optional>
2082
+ <attribute name="type">
2083
+ <ref name="ExpressionDesignationType"/>
2084
+ </attribute>
2085
+ </optional>
2086
+ <optional>
2087
+ <attribute name="isInternational">
2088
+ <data type="boolean"/>
2089
+ </attribute>
2090
+ </optional>
2091
+ <element name="name">
2092
+ <zeroOrMore>
2093
+ <choice>
2094
+ <ref name="PureTextElement"/>
2095
+ <ref name="stem"/>
2096
+ <ref name="index"/>
2097
+ </choice>
2098
+ </zeroOrMore>
2099
+ </element>
2100
+ <optional>
2101
+ <element name="abbreviation-type">
2102
+ <ref name="AbbreviationType"/>
2103
+ </element>
2104
+ </optional>
2105
+ <optional>
2106
+ <element name="pronunciation">
2107
+ <ref name="LocalizedString"/>
2108
+ </element>
2109
+ </optional>
2110
+ <optional>
2111
+ <element name="grammar">
2112
+ <ref name="Grammar"/>
2113
+ </element>
2114
+ </optional>
1730
2115
  </element>
1731
2116
  </define>
2117
+ <define name="ExpressionDesignationType">
2118
+ <choice>
2119
+ <value>prefix</value>
2120
+ <value>suffix</value>
2121
+ <value>abbreviation</value>
2122
+ <value>full</value>
2123
+ </choice>
2124
+ </define>
2125
+ <define name="AbbreviationType">
2126
+ <choice>
2127
+ <value>truncation</value>
2128
+ <value>acronym</value>
2129
+ <value>initialism</value>
2130
+ </choice>
2131
+ </define>
2132
+ <define name="Grammar">
2133
+ <zeroOrMore>
2134
+ <element name="gender">
2135
+ <ref name="GrammarGender"/>
2136
+ </element>
2137
+ </zeroOrMore>
2138
+ <zeroOrMore>
2139
+ <element name="number">
2140
+ <ref name="GrammarNumber"/>
2141
+ </element>
2142
+ </zeroOrMore>
2143
+ <optional>
2144
+ <element name="isPreposition">
2145
+ <data type="boolean"/>
2146
+ </element>
2147
+ </optional>
2148
+ <optional>
2149
+ <element name="isParticiple">
2150
+ <data type="boolean"/>
2151
+ </element>
2152
+ </optional>
2153
+ <optional>
2154
+ <element name="isAdjective">
2155
+ <data type="boolean"/>
2156
+ </element>
2157
+ </optional>
2158
+ <optional>
2159
+ <element name="isVerb">
2160
+ <data type="boolean"/>
2161
+ </element>
2162
+ </optional>
2163
+ <optional>
2164
+ <element name="isAdverb">
2165
+ <data type="boolean"/>
2166
+ </element>
2167
+ </optional>
2168
+ <optional>
2169
+ <element name="isNoun">
2170
+ <data type="boolean"/>
2171
+ </element>
2172
+ </optional>
2173
+ <zeroOrMore>
2174
+ <element name="grammar-value">
2175
+ <text/>
2176
+ </element>
2177
+ </zeroOrMore>
2178
+ </define>
2179
+ <define name="GrammarGender">
2180
+ <choice>
2181
+ <value>masculine</value>
2182
+ <value>feminine</value>
2183
+ <value>neuter</value>
2184
+ <value>common</value>
2185
+ </choice>
2186
+ </define>
2187
+ <define name="GrammarNumber">
2188
+ <choice>
2189
+ <value>singular</value>
2190
+ <value>dual</value>
2191
+ <value>plural</value>
2192
+ </choice>
2193
+ </define>
1732
2194
  <define name="termdomain">
1733
2195
  <element name="domain">
1734
2196
  <oneOrMore>
@@ -1736,22 +2198,55 @@
1736
2198
  </oneOrMore>
1737
2199
  </element>
1738
2200
  </define>
1739
- <define name="termgrammar">
1740
- <element name="grammar">
2201
+ <define name="termsubject">
2202
+ <element name="subject">
1741
2203
  <oneOrMore>
1742
2204
  <ref name="TextElement"/>
1743
2205
  </oneOrMore>
1744
2206
  </element>
1745
2207
  </define>
1746
- <define name="definition">
2208
+ <define name="termdefinition">
1747
2209
  <element name="definition">
2210
+ <choice>
2211
+ <ref name="verbaldefinition"/>
2212
+ <ref name="nonverbalrep"/>
2213
+ <group>
2214
+ <ref name="verbaldefinition"/>
2215
+ <ref name="nonverbalrep"/>
2216
+ </group>
2217
+ </choice>
2218
+ </element>
2219
+ </define>
2220
+ <define name="verbaldefinition">
2221
+ <element name="verbal-definition">
1748
2222
  <oneOrMore>
1749
2223
  <choice>
1750
2224
  <ref name="paragraph"/>
2225
+ <ref name="dl"/>
2226
+ <ref name="ol"/>
2227
+ <ref name="ul"/>
2228
+ <ref name="table"/>
2229
+ <ref name="figure"/>
2230
+ <ref name="formula"/>
2231
+ </choice>
2232
+ </oneOrMore>
2233
+ <zeroOrMore>
2234
+ <ref name="termsource"/>
2235
+ </zeroOrMore>
2236
+ </element>
2237
+ </define>
2238
+ <define name="nonverbalrep">
2239
+ <element name="non-verbal-representation">
2240
+ <oneOrMore>
2241
+ <choice>
2242
+ <ref name="table"/>
1751
2243
  <ref name="figure"/>
1752
2244
  <ref name="formula"/>
1753
2245
  </choice>
1754
2246
  </oneOrMore>
2247
+ <zeroOrMore>
2248
+ <ref name="termsource"/>
2249
+ </zeroOrMore>
1755
2250
  </element>
1756
2251
  </define>
1757
2252
  <define name="termnote">
@@ -1780,6 +2275,14 @@
1780
2275
  <data type="boolean"/>
1781
2276
  </attribute>
1782
2277
  </optional>
2278
+ <optional>
2279
+ <attribute name="tag"/>
2280
+ </optional>
2281
+ <optional>
2282
+ <attribute name="multilingual-rendering">
2283
+ <ref name="MultilingualRenderingType"/>
2284
+ </attribute>
2285
+ </optional>
1783
2286
  <oneOrMore>
1784
2287
  <choice>
1785
2288
  <ref name="paragraph"/>
@@ -1796,7 +2299,36 @@
1796
2299
  <attribute name="id">
1797
2300
  <data type="ID"/>
1798
2301
  </attribute>
1799
- <ref name="paragraph"/>
2302
+ <optional>
2303
+ <attribute name="keep-with-next">
2304
+ <data type="boolean"/>
2305
+ </attribute>
2306
+ </optional>
2307
+ <optional>
2308
+ <attribute name="keep-lines-together">
2309
+ <data type="boolean"/>
2310
+ </attribute>
2311
+ </optional>
2312
+ <optional>
2313
+ <attribute name="tag"/>
2314
+ </optional>
2315
+ <optional>
2316
+ <attribute name="multilingual-rendering">
2317
+ <ref name="MultilingualRenderingType"/>
2318
+ </attribute>
2319
+ </optional>
2320
+ <oneOrMore>
2321
+ <choice>
2322
+ <ref name="formula"/>
2323
+ <ref name="ul"/>
2324
+ <ref name="ol"/>
2325
+ <ref name="dl"/>
2326
+ <ref name="quote"/>
2327
+ <ref name="sourcecode"/>
2328
+ <ref name="paragraph"/>
2329
+ <ref name="figure"/>
2330
+ </choice>
2331
+ </oneOrMore>
1800
2332
  </element>
1801
2333
  </define>
1802
2334
  <define name="termsource">
@@ -1807,6 +2339,12 @@
1807
2339
  <value>modified</value>
1808
2340
  </choice>
1809
2341
  </attribute>
2342
+ <attribute name="type">
2343
+ <choice>
2344
+ <value>authoritative</value>
2345
+ <value>lineage</value>
2346
+ </choice>
2347
+ </attribute>
1810
2348
  <ref name="origin"/>
1811
2349
  <optional>
1812
2350
  <ref name="modification"/>
@@ -1922,9 +2460,6 @@
1922
2460
  <zeroOrMore>
1923
2461
  <ref name="BasicBlock"/>
1924
2462
  </zeroOrMore>
1925
- <zeroOrMore>
1926
- <ref name="note"/>
1927
- </zeroOrMore>
1928
2463
  <zeroOrMore>
1929
2464
  <choice>
1930
2465
  <ref name="term-clause"/>
@@ -1963,6 +2498,14 @@
1963
2498
  <optional>
1964
2499
  <attribute name="title"/>
1965
2500
  </optional>
2501
+ <optional>
2502
+ <attribute name="tag"/>
2503
+ </optional>
2504
+ <optional>
2505
+ <attribute name="multilingual-rendering">
2506
+ <ref name="MultilingualRenderingType"/>
2507
+ </attribute>
2508
+ </optional>
1966
2509
  <optional>
1967
2510
  <element name="location">
1968
2511
  <zeroOrMore>
@@ -2022,6 +2565,14 @@
2022
2565
  </define>
2023
2566
  <define name="imagemap">
2024
2567
  <element name="imagemap">
2568
+ <optional>
2569
+ <attribute name="tag"/>
2570
+ </optional>
2571
+ <optional>
2572
+ <attribute name="multilingual-rendering">
2573
+ <ref name="MultilingualRenderingType"/>
2574
+ </attribute>
2575
+ </optional>
2025
2576
  <ref name="figure"/>
2026
2577
  <zeroOrMore>
2027
2578
  <element name="area">
@@ -2066,6 +2617,14 @@
2066
2617
  </define>
2067
2618
  <define name="svgmap">
2068
2619
  <element name="svgmap">
2620
+ <optional>
2621
+ <attribute name="tag"/>
2622
+ </optional>
2623
+ <optional>
2624
+ <attribute name="multilingual-rendering">
2625
+ <ref name="MultilingualRenderingType"/>
2626
+ </attribute>
2627
+ </optional>
2069
2628
  <ref name="figure"/>
2070
2629
  <zeroOrMore>
2071
2630
  <element name="target">
@@ -2103,4 +2662,43 @@
2103
2662
  </oneOrMore>
2104
2663
  </element>
2105
2664
  </define>
2665
+ <define name="floating-title">
2666
+ <element name="floating-title">
2667
+ <attribute name="id">
2668
+ <data type="ID"/>
2669
+ </attribute>
2670
+ <attribute name="depth">
2671
+ <data type="int"/>
2672
+ </attribute>
2673
+ <zeroOrMore>
2674
+ <ref name="TextElement"/>
2675
+ </zeroOrMore>
2676
+ </element>
2677
+ </define>
2678
+ <define name="XrefBody">
2679
+ <zeroOrMore>
2680
+ <ref name="XrefTarget"/>
2681
+ </zeroOrMore>
2682
+ <oneOrMore>
2683
+ <ref name="PureTextElement"/>
2684
+ </oneOrMore>
2685
+ </define>
2686
+ <define name="XrefTarget">
2687
+ <element name="location">
2688
+ <attribute name="target">
2689
+ <data type="string">
2690
+ <param name="pattern">\i\c*|\c+#\c+</param>
2691
+ </data>
2692
+ </attribute>
2693
+ <attribute name="connective">
2694
+ <choice>
2695
+ <value>and</value>
2696
+ <value>or</value>
2697
+ <value>from</value>
2698
+ <value>to</value>
2699
+ <value/>
2700
+ </choice>
2701
+ </attribute>
2702
+ </element>
2703
+ </define>
2106
2704
  </grammar>