relaton-gb 1.9.0 → 1.10.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,9 @@
88
152
  <data type="boolean"/>
89
153
  </attribute>
90
154
  </optional>
91
- <text/>
155
+ <oneOrMore>
156
+ <ref name="PureTextElement"/>
157
+ </oneOrMore>
92
158
  </element>
93
159
  </define>
94
160
  <define name="erefType">
@@ -118,7 +184,9 @@
118
184
  </attribute>
119
185
  </optional>
120
186
  <ref name="CitationType"/>
121
- <text/>
187
+ <oneOrMore>
188
+ <ref name="PureTextElement"/>
189
+ </oneOrMore>
122
190
  </define>
123
191
  <define name="ul">
124
192
  <element name="ul">
@@ -135,6 +203,14 @@
135
203
  <data type="boolean"/>
136
204
  </attribute>
137
205
  </optional>
206
+ <optional>
207
+ <attribute name="tag"/>
208
+ </optional>
209
+ <optional>
210
+ <attribute name="multilingual-rendering">
211
+ <ref name="MultilingualRenderingType"/>
212
+ </attribute>
213
+ </optional>
138
214
  <oneOrMore>
139
215
  <ref name="ul_li"/>
140
216
  </oneOrMore>
@@ -158,15 +234,25 @@
158
234
  <data type="boolean"/>
159
235
  </attribute>
160
236
  </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>
237
+ <optional>
238
+ <attribute name="tag"/>
239
+ </optional>
240
+ <optional>
241
+ <attribute name="multilingual-rendering">
242
+ <ref name="MultilingualRenderingType"/>
243
+ </attribute>
244
+ </optional>
245
+ <optional>
246
+ <attribute name="type">
247
+ <choice>
248
+ <value>roman</value>
249
+ <value>alphabet</value>
250
+ <value>arabic</value>
251
+ <value>roman_upper</value>
252
+ <value>alphabet_upper</value>
253
+ </choice>
254
+ </attribute>
255
+ </optional>
170
256
  <oneOrMore>
171
257
  <ref name="li"/>
172
258
  </oneOrMore>
@@ -195,6 +281,14 @@
195
281
  <data type="boolean"/>
196
282
  </attribute>
197
283
  </optional>
284
+ <optional>
285
+ <attribute name="tag"/>
286
+ </optional>
287
+ <optional>
288
+ <attribute name="multilingual-rendering">
289
+ <ref name="MultilingualRenderingType"/>
290
+ </attribute>
291
+ </optional>
198
292
  <oneOrMore>
199
293
  <ref name="dt"/>
200
294
  <ref name="dd"/>
@@ -242,6 +336,14 @@
242
336
  <data type="boolean"/>
243
337
  </attribute>
244
338
  </optional>
339
+ <optional>
340
+ <attribute name="tag"/>
341
+ </optional>
342
+ <optional>
343
+ <attribute name="multilingual-rendering">
344
+ <ref name="MultilingualRenderingType"/>
345
+ </attribute>
346
+ </optional>
245
347
  <optional>
246
348
  <ref name="tname"/>
247
349
  </optional>
@@ -302,6 +404,14 @@
302
404
  <optional>
303
405
  <attribute name="width"/>
304
406
  </optional>
407
+ <optional>
408
+ <attribute name="tag"/>
409
+ </optional>
410
+ <optional>
411
+ <attribute name="multilingual-rendering">
412
+ <ref name="MultilingualRenderingType"/>
413
+ </attribute>
414
+ </optional>
305
415
  <optional>
306
416
  <ref name="colgroup"/>
307
417
  </optional>
@@ -352,6 +462,14 @@
352
462
  <optional>
353
463
  <attribute name="class"/>
354
464
  </optional>
465
+ <optional>
466
+ <attribute name="tag"/>
467
+ </optional>
468
+ <optional>
469
+ <attribute name="multilingual-rendering">
470
+ <ref name="MultilingualRenderingType"/>
471
+ </attribute>
472
+ </optional>
355
473
  <optional>
356
474
  <ref name="source"/>
357
475
  </optional>
@@ -410,6 +528,14 @@
410
528
  <optional>
411
529
  <attribute name="lang"/>
412
530
  </optional>
531
+ <optional>
532
+ <attribute name="tag"/>
533
+ </optional>
534
+ <optional>
535
+ <attribute name="multilingual-rendering">
536
+ <ref name="MultilingualRenderingType"/>
537
+ </attribute>
538
+ </optional>
413
539
  <optional>
414
540
  <ref name="tname"/>
415
541
  </optional>
@@ -458,6 +584,14 @@
458
584
  <data type="boolean"/>
459
585
  </attribute>
460
586
  </optional>
587
+ <optional>
588
+ <attribute name="tag"/>
589
+ </optional>
590
+ <optional>
591
+ <attribute name="multilingual-rendering">
592
+ <ref name="MultilingualRenderingType"/>
593
+ </attribute>
594
+ </optional>
461
595
  <ref name="stem"/>
462
596
  <optional>
463
597
  <ref name="dl"/>
@@ -486,6 +620,14 @@
486
620
  <data type="boolean"/>
487
621
  </attribute>
488
622
  </optional>
623
+ <optional>
624
+ <attribute name="tag"/>
625
+ </optional>
626
+ <optional>
627
+ <attribute name="multilingual-rendering">
628
+ <ref name="MultilingualRenderingType"/>
629
+ </attribute>
630
+ </optional>
489
631
  <zeroOrMore>
490
632
  <ref name="TextElement"/>
491
633
  </zeroOrMore>
@@ -513,6 +655,14 @@
513
655
  <data type="boolean"/>
514
656
  </attribute>
515
657
  </optional>
658
+ <optional>
659
+ <attribute name="tag"/>
660
+ </optional>
661
+ <optional>
662
+ <attribute name="multilingual-rendering">
663
+ <ref name="MultilingualRenderingType"/>
664
+ </attribute>
665
+ </optional>
516
666
  <zeroOrMore>
517
667
  <choice>
518
668
  <ref name="TextElement"/>
@@ -544,6 +694,14 @@
544
694
  <data type="boolean"/>
545
695
  </attribute>
546
696
  </optional>
697
+ <optional>
698
+ <attribute name="tag"/>
699
+ </optional>
700
+ <optional>
701
+ <attribute name="multilingual-rendering">
702
+ <ref name="MultilingualRenderingType"/>
703
+ </attribute>
704
+ </optional>
547
705
  <optional>
548
706
  <ref name="quote-source"/>
549
707
  </optional>
@@ -582,6 +740,7 @@
582
740
  <ref name="terms"/>
583
741
  <ref name="term-clause"/>
584
742
  <ref name="definitions"/>
743
+ <ref name="floating-title"/>
585
744
  </choice>
586
745
  </oneOrMore>
587
746
  </element>
@@ -610,9 +769,6 @@
610
769
  <zeroOrMore>
611
770
  <ref name="BasicBlock"/>
612
771
  </zeroOrMore>
613
- <zeroOrMore>
614
- <ref name="note"/>
615
- </zeroOrMore>
616
772
  <zeroOrMore>
617
773
  <ref name="bibitem"/>
618
774
  <zeroOrMore>
@@ -653,6 +809,14 @@
653
809
  <optional>
654
810
  <attribute name="type"/>
655
811
  </optional>
812
+ <optional>
813
+ <attribute name="tag"/>
814
+ </optional>
815
+ <optional>
816
+ <attribute name="multilingual-rendering">
817
+ <ref name="MultilingualRenderingType"/>
818
+ </attribute>
819
+ </optional>
656
820
  <oneOrMore>
657
821
  <choice>
658
822
  <ref name="paragraph"/>
@@ -689,14 +853,9 @@
689
853
  <optional>
690
854
  <ref name="section-title"/>
691
855
  </optional>
692
- <group>
693
- <oneOrMore>
694
- <ref name="BasicBlock"/>
695
- </oneOrMore>
696
- <zeroOrMore>
697
- <ref name="note"/>
698
- </zeroOrMore>
699
- </group>
856
+ <oneOrMore>
857
+ <ref name="BasicBlock"/>
858
+ </oneOrMore>
700
859
  </define>
701
860
  <define name="li">
702
861
  <element name="li">
@@ -831,6 +990,9 @@
831
990
  <ref name="PureTextElement"/>
832
991
  <ref name="stem"/>
833
992
  <ref name="index"/>
993
+ <ref name="eref"/>
994
+ <ref name="xref"/>
995
+ <ref name="hyperlink"/>
834
996
  </choice>
835
997
  </zeroOrMore>
836
998
  </element>
@@ -842,6 +1004,9 @@
842
1004
  <ref name="PureTextElement"/>
843
1005
  <ref name="stem"/>
844
1006
  <ref name="index"/>
1007
+ <ref name="eref"/>
1008
+ <ref name="xref"/>
1009
+ <ref name="hyperlink"/>
845
1010
  </choice>
846
1011
  </zeroOrMore>
847
1012
  </element>
@@ -852,6 +1017,9 @@
852
1017
  <choice>
853
1018
  <ref name="PureTextElement"/>
854
1019
  <ref name="index"/>
1020
+ <ref name="eref"/>
1021
+ <ref name="xref"/>
1022
+ <ref name="hyperlink"/>
855
1023
  </choice>
856
1024
  </zeroOrMore>
857
1025
  </element>
@@ -896,6 +1064,26 @@
896
1064
  </zeroOrMore>
897
1065
  </element>
898
1066
  </define>
1067
+ <define name="sub">
1068
+ <element name="sub">
1069
+ <zeroOrMore>
1070
+ <choice>
1071
+ <ref name="PureTextElement"/>
1072
+ <ref name="stem"/>
1073
+ </choice>
1074
+ </zeroOrMore>
1075
+ </element>
1076
+ </define>
1077
+ <define name="sup">
1078
+ <element name="sup">
1079
+ <zeroOrMore>
1080
+ <choice>
1081
+ <ref name="PureTextElement"/>
1082
+ <ref name="stem"/>
1083
+ </choice>
1084
+ </zeroOrMore>
1085
+ </element>
1086
+ </define>
899
1087
  <define name="pagebreak">
900
1088
  <element name="pagebreak">
901
1089
  <optional>
@@ -910,6 +1098,14 @@
910
1098
  </define>
911
1099
  </include>
912
1100
  <!-- end overrides -->
1101
+ <define name="MultilingualRenderingType">
1102
+ <choice>
1103
+ <value>common</value>
1104
+ <value>all-columns</value>
1105
+ <value>parallel</value>
1106
+ <value>tag</value>
1107
+ </choice>
1108
+ </define>
913
1109
  <define name="docsubtype">
914
1110
  <element name="subdoctype">
915
1111
  <ref name="DocumentSubtype"/>
@@ -976,6 +1172,16 @@
976
1172
  <data type="boolean"/>
977
1173
  </attribute>
978
1174
  </optional>
1175
+ <optional>
1176
+ <attribute name="linkmention">
1177
+ <data type="boolean"/>
1178
+ </attribute>
1179
+ </optional>
1180
+ <optional>
1181
+ <attribute name="linkref">
1182
+ <data type="boolean"/>
1183
+ </attribute>
1184
+ </optional>
979
1185
  <optional>
980
1186
  <element name="refterm">
981
1187
  <zeroOrMore>
@@ -1011,8 +1217,23 @@
1011
1217
  <ref name="imagemap"/>
1012
1218
  <ref name="svgmap"/>
1013
1219
  <ref name="inputform"/>
1220
+ <ref name="toc"/>
1221
+ <ref name="passthrough"/>
1014
1222
  </choice>
1015
1223
  </define>
1224
+ <define name="toc">
1225
+ <element name="toc">
1226
+ <ref name="ul"/>
1227
+ </element>
1228
+ </define>
1229
+ <define name="passthrough">
1230
+ <element name="passthrough">
1231
+ <optional>
1232
+ <attribute name="formats"/>
1233
+ </optional>
1234
+ <text/>
1235
+ </element>
1236
+ </define>
1016
1237
  <define name="inputform">
1017
1238
  <element name="form">
1018
1239
  <attribute name="id">
@@ -1023,6 +1244,14 @@
1023
1244
  <optional>
1024
1245
  <attribute name="class"/>
1025
1246
  </optional>
1247
+ <optional>
1248
+ <attribute name="tag"/>
1249
+ </optional>
1250
+ <optional>
1251
+ <attribute name="multilingual-rendering">
1252
+ <ref name="MultilingualRenderingType"/>
1253
+ </attribute>
1254
+ </optional>
1026
1255
  <zeroOrMore>
1027
1256
  <choice>
1028
1257
  <ref name="TextElement"/>
@@ -1222,9 +1451,6 @@
1222
1451
  <zeroOrMore>
1223
1452
  <ref name="BasicBlock"/>
1224
1453
  </zeroOrMore>
1225
- <zeroOrMore>
1226
- <ref name="note"/>
1227
- </zeroOrMore>
1228
1454
  <choice>
1229
1455
  <oneOrMore>
1230
1456
  <ref name="reference-clause"/>
@@ -1407,9 +1633,6 @@
1407
1633
  <zeroOrMore>
1408
1634
  <ref name="BasicBlock"/>
1409
1635
  </zeroOrMore>
1410
- <zeroOrMore>
1411
- <ref name="note"/>
1412
- </zeroOrMore>
1413
1636
  <ref name="dl"/>
1414
1637
  </oneOrMore>
1415
1638
  </element>
@@ -1469,14 +1692,9 @@
1469
1692
  <ref name="section-title"/>
1470
1693
  </optional>
1471
1694
  <group>
1472
- <group>
1473
- <zeroOrMore>
1474
- <ref name="BasicBlock"/>
1475
- </zeroOrMore>
1476
- <zeroOrMore>
1477
- <ref name="note"/>
1478
- </zeroOrMore>
1479
- </group>
1695
+ <zeroOrMore>
1696
+ <ref name="BasicBlock"/>
1697
+ </zeroOrMore>
1480
1698
  <zeroOrMore>
1481
1699
  <ref name="content-subsection"/>
1482
1700
  </zeroOrMore>
@@ -1523,14 +1741,9 @@
1523
1741
  </optional>
1524
1742
  <choice>
1525
1743
  <choice>
1526
- <group>
1527
- <oneOrMore>
1528
- <ref name="BasicBlock"/>
1529
- </oneOrMore>
1530
- <zeroOrMore>
1531
- <ref name="note"/>
1532
- </zeroOrMore>
1533
- </group>
1744
+ <oneOrMore>
1745
+ <ref name="BasicBlock"/>
1746
+ </oneOrMore>
1534
1747
  <ref name="amend"/>
1535
1748
  </choice>
1536
1749
  <oneOrMore>
@@ -1538,6 +1751,7 @@
1538
1751
  <ref name="clause-subsection"/>
1539
1752
  <ref name="terms"/>
1540
1753
  <ref name="definitions"/>
1754
+ <ref name="floating-title"/>
1541
1755
  </choice>
1542
1756
  </oneOrMore>
1543
1757
  </choice>
@@ -1571,20 +1785,16 @@
1571
1785
  <ref name="section-title"/>
1572
1786
  </optional>
1573
1787
  <group>
1574
- <group>
1575
- <zeroOrMore>
1576
- <ref name="BasicBlock"/>
1577
- </zeroOrMore>
1578
- <zeroOrMore>
1579
- <ref name="note"/>
1580
- </zeroOrMore>
1581
- </group>
1788
+ <zeroOrMore>
1789
+ <ref name="BasicBlock"/>
1790
+ </zeroOrMore>
1582
1791
  <zeroOrMore>
1583
1792
  <choice>
1584
1793
  <ref name="annex-subsection"/>
1585
1794
  <ref name="terms"/>
1586
1795
  <ref name="definitions"/>
1587
1796
  <ref name="references"/>
1797
+ <ref name="floating-title"/>
1588
1798
  </choice>
1589
1799
  </zeroOrMore>
1590
1800
  </group>
@@ -1637,9 +1847,6 @@
1637
1847
  <zeroOrMore>
1638
1848
  <ref name="BasicBlock"/>
1639
1849
  </zeroOrMore>
1640
- <zeroOrMore>
1641
- <ref name="note"/>
1642
- </zeroOrMore>
1643
1850
  <choice>
1644
1851
  <oneOrMore>
1645
1852
  <ref name="term"/>
@@ -1662,6 +1869,20 @@
1662
1869
  <data type="ID"/>
1663
1870
  </attribute>
1664
1871
  </optional>
1872
+ <optional>
1873
+ <attribute name="language"/>
1874
+ </optional>
1875
+ <optional>
1876
+ <attribute name="script"/>
1877
+ </optional>
1878
+ <optional>
1879
+ <attribute name="tag"/>
1880
+ </optional>
1881
+ <optional>
1882
+ <attribute name="multilingual-rendering">
1883
+ <ref name="MultilingualRenderingType"/>
1884
+ </attribute>
1885
+ </optional>
1665
1886
  <oneOrMore>
1666
1887
  <ref name="preferred"/>
1667
1888
  </oneOrMore>
@@ -1669,18 +1890,20 @@
1669
1890
  <ref name="admitted"/>
1670
1891
  </zeroOrMore>
1671
1892
  <zeroOrMore>
1672
- <ref name="related"/>
1893
+ <ref name="deprecates"/>
1673
1894
  </zeroOrMore>
1674
1895
  <zeroOrMore>
1675
- <ref name="deprecates"/>
1896
+ <ref name="related"/>
1676
1897
  </zeroOrMore>
1677
1898
  <optional>
1678
1899
  <ref name="termdomain"/>
1679
1900
  </optional>
1680
- <zeroOrMore>
1681
- <ref name="termgrammar"/>
1682
- </zeroOrMore>
1683
- <ref name="definition"/>
1901
+ <optional>
1902
+ <ref name="termsubject"/>
1903
+ </optional>
1904
+ <oneOrMore>
1905
+ <ref name="termdefinition"/>
1906
+ </oneOrMore>
1684
1907
  <zeroOrMore>
1685
1908
  <ref name="termnote"/>
1686
1909
  </zeroOrMore>
@@ -1694,41 +1917,236 @@
1694
1917
  </define>
1695
1918
  <define name="preferred">
1696
1919
  <element name="preferred">
1697
- <oneOrMore>
1698
- <ref name="TextElement"/>
1699
- </oneOrMore>
1920
+ <ref name="Designation"/>
1700
1921
  </element>
1701
1922
  </define>
1702
1923
  <define name="admitted">
1703
1924
  <element name="admitted">
1704
- <oneOrMore>
1705
- <ref name="TextElement"/>
1706
- </oneOrMore>
1925
+ <ref name="Designation"/>
1707
1926
  </element>
1708
1927
  </define>
1709
1928
  <define name="related">
1710
1929
  <element name="related">
1930
+ <attribute name="type">
1931
+ <ref name="RelatedTermType"/>
1932
+ </attribute>
1933
+ <element name="preferred">
1934
+ <ref name="Designation"/>
1935
+ </element>
1936
+ <choice>
1937
+ <ref name="eref"/>
1938
+ <ref name="xref"/>
1939
+ <ref name="termref"/>
1940
+ </choice>
1941
+ </element>
1942
+ </define>
1943
+ <define name="RelatedTermType">
1944
+ <choice>
1945
+ <value>deprecates</value>
1946
+ <value>supersedes</value>
1947
+ <value>narrower</value>
1948
+ <value>broader</value>
1949
+ <value>equivalent</value>
1950
+ <value>compare</value>
1951
+ <value>contrast</value>
1952
+ <value>see</value>
1953
+ </choice>
1954
+ </define>
1955
+ <define name="deprecates">
1956
+ <element name="deprecates">
1957
+ <ref name="Designation"/>
1958
+ </element>
1959
+ </define>
1960
+ <define name="Designation">
1961
+ <optional>
1962
+ <attribute name="absent">
1963
+ <data type="boolean"/>
1964
+ </attribute>
1965
+ </optional>
1966
+ <optional>
1967
+ <attribute name="geographic-area"/>
1968
+ </optional>
1969
+ <choice>
1970
+ <ref name="expression_designation"/>
1971
+ <ref name="letter_symbol_designation"/>
1972
+ <ref name="graphical_symbol_designation"/>
1973
+ </choice>
1974
+ <optional>
1975
+ <ref name="fieldofapplication"/>
1976
+ </optional>
1977
+ <optional>
1978
+ <ref name="usageinfo"/>
1979
+ </optional>
1980
+ <zeroOrMore>
1981
+ <ref name="termsource"/>
1982
+ </zeroOrMore>
1983
+ </define>
1984
+ <define name="fieldofapplication">
1985
+ <element name="field-of-application">
1986
+ <oneOrMore>
1987
+ <ref name="PureTextElement"/>
1988
+ </oneOrMore>
1989
+ </element>
1990
+ </define>
1991
+ <define name="usageinfo">
1992
+ <element name="usage-info">
1993
+ <oneOrMore>
1994
+ <ref name="PureTextElement"/>
1995
+ </oneOrMore>
1996
+ </element>
1997
+ </define>
1998
+ <define name="letter_symbol_designation">
1999
+ <element name="letter-symbol">
1711
2000
  <optional>
1712
- <attribute name="type">
2001
+ <attribute name="isInternational">
2002
+ <data type="boolean"/>
2003
+ </attribute>
2004
+ </optional>
2005
+ <element name="name">
2006
+ <oneOrMore>
1713
2007
  <choice>
1714
- <value>compare</value>
1715
- <value>contrast</value>
1716
- <value>see</value>
2008
+ <ref name="PureTextElement"/>
2009
+ <ref name="stem"/>
1717
2010
  </choice>
2011
+ </oneOrMore>
2012
+ </element>
2013
+ </element>
2014
+ </define>
2015
+ <define name="graphical_symbol_designation">
2016
+ <element name="graphical-symbol">
2017
+ <optional>
2018
+ <attribute name="isInternational">
2019
+ <data type="boolean"/>
1718
2020
  </attribute>
1719
2021
  </optional>
1720
- <oneOrMore>
1721
- <ref name="TextElement"/>
1722
- </oneOrMore>
2022
+ <ref name="figure"/>
1723
2023
  </element>
1724
2024
  </define>
1725
- <define name="deprecates">
1726
- <element name="deprecates">
1727
- <oneOrMore>
1728
- <ref name="TextElement"/>
1729
- </oneOrMore>
2025
+ <define name="expression_designation">
2026
+ <element name="expression">
2027
+ <optional>
2028
+ <attribute name="language">
2029
+ <a:documentation>ISO-639</a:documentation>
2030
+ </attribute>
2031
+ </optional>
2032
+ <optional>
2033
+ <attribute name="script">
2034
+ <a:documentation>ISO-15924</a:documentation>
2035
+ </attribute>
2036
+ </optional>
2037
+ <optional>
2038
+ <attribute name="type">
2039
+ <ref name="ExpressionDesignationType"/>
2040
+ </attribute>
2041
+ </optional>
2042
+ <optional>
2043
+ <attribute name="isInternational">
2044
+ <data type="boolean"/>
2045
+ </attribute>
2046
+ </optional>
2047
+ <element name="name">
2048
+ <zeroOrMore>
2049
+ <choice>
2050
+ <ref name="PureTextElement"/>
2051
+ <ref name="stem"/>
2052
+ <ref name="index"/>
2053
+ </choice>
2054
+ </zeroOrMore>
2055
+ </element>
2056
+ <optional>
2057
+ <element name="abbreviation-type">
2058
+ <ref name="AbbreviationType"/>
2059
+ </element>
2060
+ </optional>
2061
+ <optional>
2062
+ <element name="pronunciation">
2063
+ <ref name="LocalizedString"/>
2064
+ </element>
2065
+ </optional>
2066
+ <optional>
2067
+ <element name="grammar">
2068
+ <ref name="Grammar"/>
2069
+ </element>
2070
+ </optional>
1730
2071
  </element>
1731
2072
  </define>
2073
+ <define name="ExpressionDesignationType">
2074
+ <choice>
2075
+ <value>prefix</value>
2076
+ <value>suffix</value>
2077
+ <value>abbreviation</value>
2078
+ <value>full</value>
2079
+ </choice>
2080
+ </define>
2081
+ <define name="AbbreviationType">
2082
+ <choice>
2083
+ <value>truncation</value>
2084
+ <value>acronym</value>
2085
+ <value>initialism</value>
2086
+ </choice>
2087
+ </define>
2088
+ <define name="Grammar">
2089
+ <zeroOrMore>
2090
+ <element name="gender">
2091
+ <ref name="GrammarGender"/>
2092
+ </element>
2093
+ </zeroOrMore>
2094
+ <zeroOrMore>
2095
+ <element name="number">
2096
+ <ref name="GrammarNumber"/>
2097
+ </element>
2098
+ </zeroOrMore>
2099
+ <optional>
2100
+ <element name="isPreposition">
2101
+ <data type="boolean"/>
2102
+ </element>
2103
+ </optional>
2104
+ <optional>
2105
+ <element name="isParticiple">
2106
+ <data type="boolean"/>
2107
+ </element>
2108
+ </optional>
2109
+ <optional>
2110
+ <element name="isAdjective">
2111
+ <data type="boolean"/>
2112
+ </element>
2113
+ </optional>
2114
+ <optional>
2115
+ <element name="isVerb">
2116
+ <data type="boolean"/>
2117
+ </element>
2118
+ </optional>
2119
+ <optional>
2120
+ <element name="isAdverb">
2121
+ <data type="boolean"/>
2122
+ </element>
2123
+ </optional>
2124
+ <optional>
2125
+ <element name="isNoun">
2126
+ <data type="boolean"/>
2127
+ </element>
2128
+ </optional>
2129
+ <zeroOrMore>
2130
+ <element name="grammar-value">
2131
+ <text/>
2132
+ </element>
2133
+ </zeroOrMore>
2134
+ </define>
2135
+ <define name="GrammarGender">
2136
+ <choice>
2137
+ <value>masculine</value>
2138
+ <value>feminine</value>
2139
+ <value>neuter</value>
2140
+ <value>common</value>
2141
+ </choice>
2142
+ </define>
2143
+ <define name="GrammarNumber">
2144
+ <choice>
2145
+ <value>singular</value>
2146
+ <value>dual</value>
2147
+ <value>plural</value>
2148
+ </choice>
2149
+ </define>
1732
2150
  <define name="termdomain">
1733
2151
  <element name="domain">
1734
2152
  <oneOrMore>
@@ -1736,22 +2154,55 @@
1736
2154
  </oneOrMore>
1737
2155
  </element>
1738
2156
  </define>
1739
- <define name="termgrammar">
1740
- <element name="grammar">
2157
+ <define name="termsubject">
2158
+ <element name="subject">
1741
2159
  <oneOrMore>
1742
2160
  <ref name="TextElement"/>
1743
2161
  </oneOrMore>
1744
2162
  </element>
1745
2163
  </define>
1746
- <define name="definition">
2164
+ <define name="termdefinition">
1747
2165
  <element name="definition">
2166
+ <choice>
2167
+ <ref name="verbaldefinition"/>
2168
+ <ref name="nonverbalrep"/>
2169
+ <group>
2170
+ <ref name="verbaldefinition"/>
2171
+ <ref name="nonverbalrep"/>
2172
+ </group>
2173
+ </choice>
2174
+ </element>
2175
+ </define>
2176
+ <define name="verbaldefinition">
2177
+ <element name="verbal-definition">
1748
2178
  <oneOrMore>
1749
2179
  <choice>
1750
2180
  <ref name="paragraph"/>
2181
+ <ref name="dl"/>
2182
+ <ref name="ol"/>
2183
+ <ref name="ul"/>
2184
+ <ref name="table"/>
2185
+ <ref name="figure"/>
2186
+ <ref name="formula"/>
2187
+ </choice>
2188
+ </oneOrMore>
2189
+ <zeroOrMore>
2190
+ <ref name="termsource"/>
2191
+ </zeroOrMore>
2192
+ </element>
2193
+ </define>
2194
+ <define name="nonverbalrep">
2195
+ <element name="non-verbal-representation">
2196
+ <oneOrMore>
2197
+ <choice>
2198
+ <ref name="table"/>
1751
2199
  <ref name="figure"/>
1752
2200
  <ref name="formula"/>
1753
2201
  </choice>
1754
2202
  </oneOrMore>
2203
+ <zeroOrMore>
2204
+ <ref name="termsource"/>
2205
+ </zeroOrMore>
1755
2206
  </element>
1756
2207
  </define>
1757
2208
  <define name="termnote">
@@ -1780,6 +2231,14 @@
1780
2231
  <data type="boolean"/>
1781
2232
  </attribute>
1782
2233
  </optional>
2234
+ <optional>
2235
+ <attribute name="tag"/>
2236
+ </optional>
2237
+ <optional>
2238
+ <attribute name="multilingual-rendering">
2239
+ <ref name="MultilingualRenderingType"/>
2240
+ </attribute>
2241
+ </optional>
1783
2242
  <oneOrMore>
1784
2243
  <choice>
1785
2244
  <ref name="paragraph"/>
@@ -1796,7 +2255,36 @@
1796
2255
  <attribute name="id">
1797
2256
  <data type="ID"/>
1798
2257
  </attribute>
1799
- <ref name="paragraph"/>
2258
+ <optional>
2259
+ <attribute name="keep-with-next">
2260
+ <data type="boolean"/>
2261
+ </attribute>
2262
+ </optional>
2263
+ <optional>
2264
+ <attribute name="keep-lines-together">
2265
+ <data type="boolean"/>
2266
+ </attribute>
2267
+ </optional>
2268
+ <optional>
2269
+ <attribute name="tag"/>
2270
+ </optional>
2271
+ <optional>
2272
+ <attribute name="multilingual-rendering">
2273
+ <ref name="MultilingualRenderingType"/>
2274
+ </attribute>
2275
+ </optional>
2276
+ <oneOrMore>
2277
+ <choice>
2278
+ <ref name="formula"/>
2279
+ <ref name="ul"/>
2280
+ <ref name="ol"/>
2281
+ <ref name="dl"/>
2282
+ <ref name="quote"/>
2283
+ <ref name="sourcecode"/>
2284
+ <ref name="paragraph"/>
2285
+ <ref name="figure"/>
2286
+ </choice>
2287
+ </oneOrMore>
1800
2288
  </element>
1801
2289
  </define>
1802
2290
  <define name="termsource">
@@ -1807,6 +2295,12 @@
1807
2295
  <value>modified</value>
1808
2296
  </choice>
1809
2297
  </attribute>
2298
+ <attribute name="type">
2299
+ <choice>
2300
+ <value>authoritative</value>
2301
+ <value>lineage</value>
2302
+ </choice>
2303
+ </attribute>
1810
2304
  <ref name="origin"/>
1811
2305
  <optional>
1812
2306
  <ref name="modification"/>
@@ -1922,9 +2416,6 @@
1922
2416
  <zeroOrMore>
1923
2417
  <ref name="BasicBlock"/>
1924
2418
  </zeroOrMore>
1925
- <zeroOrMore>
1926
- <ref name="note"/>
1927
- </zeroOrMore>
1928
2419
  <zeroOrMore>
1929
2420
  <choice>
1930
2421
  <ref name="term-clause"/>
@@ -1963,6 +2454,14 @@
1963
2454
  <optional>
1964
2455
  <attribute name="title"/>
1965
2456
  </optional>
2457
+ <optional>
2458
+ <attribute name="tag"/>
2459
+ </optional>
2460
+ <optional>
2461
+ <attribute name="multilingual-rendering">
2462
+ <ref name="MultilingualRenderingType"/>
2463
+ </attribute>
2464
+ </optional>
1966
2465
  <optional>
1967
2466
  <element name="location">
1968
2467
  <zeroOrMore>
@@ -2022,6 +2521,14 @@
2022
2521
  </define>
2023
2522
  <define name="imagemap">
2024
2523
  <element name="imagemap">
2524
+ <optional>
2525
+ <attribute name="tag"/>
2526
+ </optional>
2527
+ <optional>
2528
+ <attribute name="multilingual-rendering">
2529
+ <ref name="MultilingualRenderingType"/>
2530
+ </attribute>
2531
+ </optional>
2025
2532
  <ref name="figure"/>
2026
2533
  <zeroOrMore>
2027
2534
  <element name="area">
@@ -2066,6 +2573,14 @@
2066
2573
  </define>
2067
2574
  <define name="svgmap">
2068
2575
  <element name="svgmap">
2576
+ <optional>
2577
+ <attribute name="tag"/>
2578
+ </optional>
2579
+ <optional>
2580
+ <attribute name="multilingual-rendering">
2581
+ <ref name="MultilingualRenderingType"/>
2582
+ </attribute>
2583
+ </optional>
2069
2584
  <ref name="figure"/>
2070
2585
  <zeroOrMore>
2071
2586
  <element name="target">
@@ -2103,4 +2618,17 @@
2103
2618
  </oneOrMore>
2104
2619
  </element>
2105
2620
  </define>
2621
+ <define name="floating-title">
2622
+ <element name="floating-title">
2623
+ <attribute name="id">
2624
+ <data type="ID"/>
2625
+ </attribute>
2626
+ <attribute name="depth">
2627
+ <data type="int"/>
2628
+ </attribute>
2629
+ <zeroOrMore>
2630
+ <ref name="TextElement"/>
2631
+ </zeroOrMore>
2632
+ </element>
2633
+ </define>
2106
2634
  </grammar>