metanorma-generic 1.10.3 → 1.11.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (13) hide show
  1. checksums.yaml +4 -4
  2. data/lib/asciidoctor/generic/basicdoc.rng +21 -4
  3. data/lib/asciidoctor/generic/converter.rb +24 -20
  4. data/lib/asciidoctor/generic/isodoc.rng +497 -88
  5. data/lib/asciidoctor/generic/reqt.rng +23 -2
  6. data/lib/isodoc/generic/base_convert.rb +4 -3
  7. data/lib/isodoc/generic/html/generic.scss +0 -1
  8. data/lib/isodoc/generic/html/htmlstyle.scss +12 -1
  9. data/lib/isodoc/generic/html/scripts.html +0 -1
  10. data/lib/metanorma/generic/version.rb +1 -1
  11. data/lib/metanorma/generic.rb +27 -35
  12. data/metanorma-generic.gemspec +2 -3
  13. metadata +10 -24
data/lib/asciidoctor/generic/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">
@@ -58,11 +58,13 @@
58
58
  <attribute name="alt"/>
59
59
  </optional>
60
60
  <optional>
61
- <attribute name="updatetype">
61
+ <attribute name="update-type">
62
62
  <data type="boolean"/>
63
63
  </attribute>
64
64
  </optional>
65
- <text/>
65
+ <oneOrMore>
66
+ <ref name="PureTextElement"/>
67
+ </oneOrMore>
66
68
  </element>
67
69
  </define>
68
70
  <define name="xref">
@@ -100,7 +102,9 @@
100
102
  <data type="boolean"/>
101
103
  </attribute>
102
104
  </optional>
103
- <text/>
105
+ <oneOrMore>
106
+ <ref name="PureTextElement"/>
107
+ </oneOrMore>
104
108
  </element>
105
109
  </define>
106
110
  <define name="erefType">
@@ -130,7 +134,9 @@
130
134
  </attribute>
131
135
  </optional>
132
136
  <ref name="CitationType"/>
133
- <text/>
137
+ <oneOrMore>
138
+ <ref name="PureTextElement"/>
139
+ </oneOrMore>
134
140
  </define>
135
141
  <define name="ul">
136
142
  <element name="ul">
@@ -147,6 +153,14 @@
147
153
  <data type="boolean"/>
148
154
  </attribute>
149
155
  </optional>
156
+ <optional>
157
+ <attribute name="tag"/>
158
+ </optional>
159
+ <optional>
160
+ <attribute name="multilingual-rendering">
161
+ <ref name="MultilingualRenderingType"/>
162
+ </attribute>
163
+ </optional>
150
164
  <oneOrMore>
151
165
  <ref name="ul_li"/>
152
166
  </oneOrMore>
@@ -170,15 +184,25 @@
170
184
  <data type="boolean"/>
171
185
  </attribute>
172
186
  </optional>
173
- <attribute name="type">
174
- <choice>
175
- <value>roman</value>
176
- <value>alphabet</value>
177
- <value>arabic</value>
178
- <value>roman_upper</value>
179
- <value>alphabet_upper</value>
180
- </choice>
181
- </attribute>
187
+ <optional>
188
+ <attribute name="tag"/>
189
+ </optional>
190
+ <optional>
191
+ <attribute name="multilingual-rendering">
192
+ <ref name="MultilingualRenderingType"/>
193
+ </attribute>
194
+ </optional>
195
+ <optional>
196
+ <attribute name="type">
197
+ <choice>
198
+ <value>roman</value>
199
+ <value>alphabet</value>
200
+ <value>arabic</value>
201
+ <value>roman_upper</value>
202
+ <value>alphabet_upper</value>
203
+ </choice>
204
+ </attribute>
205
+ </optional>
182
206
  <oneOrMore>
183
207
  <ref name="li"/>
184
208
  </oneOrMore>
@@ -207,6 +231,14 @@
207
231
  <data type="boolean"/>
208
232
  </attribute>
209
233
  </optional>
234
+ <optional>
235
+ <attribute name="tag"/>
236
+ </optional>
237
+ <optional>
238
+ <attribute name="multilingual-rendering">
239
+ <ref name="MultilingualRenderingType"/>
240
+ </attribute>
241
+ </optional>
210
242
  <oneOrMore>
211
243
  <ref name="dt"/>
212
244
  <ref name="dd"/>
@@ -254,6 +286,14 @@
254
286
  <data type="boolean"/>
255
287
  </attribute>
256
288
  </optional>
289
+ <optional>
290
+ <attribute name="tag"/>
291
+ </optional>
292
+ <optional>
293
+ <attribute name="multilingual-rendering">
294
+ <ref name="MultilingualRenderingType"/>
295
+ </attribute>
296
+ </optional>
257
297
  <optional>
258
298
  <ref name="tname"/>
259
299
  </optional>
@@ -314,6 +354,14 @@
314
354
  <optional>
315
355
  <attribute name="width"/>
316
356
  </optional>
357
+ <optional>
358
+ <attribute name="tag"/>
359
+ </optional>
360
+ <optional>
361
+ <attribute name="multilingual-rendering">
362
+ <ref name="MultilingualRenderingType"/>
363
+ </attribute>
364
+ </optional>
317
365
  <optional>
318
366
  <ref name="colgroup"/>
319
367
  </optional>
@@ -364,6 +412,14 @@
364
412
  <optional>
365
413
  <attribute name="class"/>
366
414
  </optional>
415
+ <optional>
416
+ <attribute name="tag"/>
417
+ </optional>
418
+ <optional>
419
+ <attribute name="multilingual-rendering">
420
+ <ref name="MultilingualRenderingType"/>
421
+ </attribute>
422
+ </optional>
367
423
  <optional>
368
424
  <ref name="source"/>
369
425
  </optional>
@@ -422,6 +478,14 @@
422
478
  <optional>
423
479
  <attribute name="lang"/>
424
480
  </optional>
481
+ <optional>
482
+ <attribute name="tag"/>
483
+ </optional>
484
+ <optional>
485
+ <attribute name="multilingual-rendering">
486
+ <ref name="MultilingualRenderingType"/>
487
+ </attribute>
488
+ </optional>
425
489
  <optional>
426
490
  <ref name="tname"/>
427
491
  </optional>
@@ -470,6 +534,14 @@
470
534
  <data type="boolean"/>
471
535
  </attribute>
472
536
  </optional>
537
+ <optional>
538
+ <attribute name="tag"/>
539
+ </optional>
540
+ <optional>
541
+ <attribute name="multilingual-rendering">
542
+ <ref name="MultilingualRenderingType"/>
543
+ </attribute>
544
+ </optional>
473
545
  <ref name="stem"/>
474
546
  <optional>
475
547
  <ref name="dl"/>
@@ -498,6 +570,14 @@
498
570
  <data type="boolean"/>
499
571
  </attribute>
500
572
  </optional>
573
+ <optional>
574
+ <attribute name="tag"/>
575
+ </optional>
576
+ <optional>
577
+ <attribute name="multilingual-rendering">
578
+ <ref name="MultilingualRenderingType"/>
579
+ </attribute>
580
+ </optional>
501
581
  <zeroOrMore>
502
582
  <ref name="TextElement"/>
503
583
  </zeroOrMore>
@@ -525,6 +605,14 @@
525
605
  <data type="boolean"/>
526
606
  </attribute>
527
607
  </optional>
608
+ <optional>
609
+ <attribute name="tag"/>
610
+ </optional>
611
+ <optional>
612
+ <attribute name="multilingual-rendering">
613
+ <ref name="MultilingualRenderingType"/>
614
+ </attribute>
615
+ </optional>
528
616
  <zeroOrMore>
529
617
  <choice>
530
618
  <ref name="TextElement"/>
@@ -556,6 +644,14 @@
556
644
  <data type="boolean"/>
557
645
  </attribute>
558
646
  </optional>
647
+ <optional>
648
+ <attribute name="tag"/>
649
+ </optional>
650
+ <optional>
651
+ <attribute name="multilingual-rendering">
652
+ <ref name="MultilingualRenderingType"/>
653
+ </attribute>
654
+ </optional>
559
655
  <optional>
560
656
  <ref name="quote-source"/>
561
657
  </optional>
@@ -622,9 +718,6 @@
622
718
  <zeroOrMore>
623
719
  <ref name="BasicBlock"/>
624
720
  </zeroOrMore>
625
- <zeroOrMore>
626
- <ref name="note"/>
627
- </zeroOrMore>
628
721
  <zeroOrMore>
629
722
  <ref name="bibitem"/>
630
723
  <zeroOrMore>
@@ -665,6 +758,14 @@
665
758
  <optional>
666
759
  <attribute name="type"/>
667
760
  </optional>
761
+ <optional>
762
+ <attribute name="tag"/>
763
+ </optional>
764
+ <optional>
765
+ <attribute name="multilingual-rendering">
766
+ <ref name="MultilingualRenderingType"/>
767
+ </attribute>
768
+ </optional>
668
769
  <oneOrMore>
669
770
  <choice>
670
771
  <ref name="paragraph"/>
@@ -701,14 +802,9 @@
701
802
  <optional>
702
803
  <ref name="section-title"/>
703
804
  </optional>
704
- <group>
705
- <oneOrMore>
706
- <ref name="BasicBlock"/>
707
- </oneOrMore>
708
- <zeroOrMore>
709
- <ref name="note"/>
710
- </zeroOrMore>
711
- </group>
805
+ <oneOrMore>
806
+ <ref name="BasicBlock"/>
807
+ </oneOrMore>
712
808
  </define>
713
809
  <define name="li">
714
810
  <element name="li">
@@ -843,6 +939,9 @@
843
939
  <ref name="PureTextElement"/>
844
940
  <ref name="stem"/>
845
941
  <ref name="index"/>
942
+ <ref name="eref"/>
943
+ <ref name="xref"/>
944
+ <ref name="hyperlink"/>
846
945
  </choice>
847
946
  </zeroOrMore>
848
947
  </element>
@@ -854,6 +953,9 @@
854
953
  <ref name="PureTextElement"/>
855
954
  <ref name="stem"/>
856
955
  <ref name="index"/>
956
+ <ref name="eref"/>
957
+ <ref name="xref"/>
958
+ <ref name="hyperlink"/>
857
959
  </choice>
858
960
  </zeroOrMore>
859
961
  </element>
@@ -864,6 +966,9 @@
864
966
  <choice>
865
967
  <ref name="PureTextElement"/>
866
968
  <ref name="index"/>
969
+ <ref name="eref"/>
970
+ <ref name="xref"/>
971
+ <ref name="hyperlink"/>
867
972
  </choice>
868
973
  </zeroOrMore>
869
974
  </element>
@@ -922,6 +1027,14 @@
922
1027
  </define>
923
1028
  </include>
924
1029
  <!-- end overrides -->
1030
+ <define name="MultilingualRenderingType">
1031
+ <choice>
1032
+ <value>common</value>
1033
+ <value>all-columns</value>
1034
+ <value>parallel</value>
1035
+ <value>tag</value>
1036
+ </choice>
1037
+ </define>
925
1038
  <define name="docsubtype">
926
1039
  <element name="subdoctype">
927
1040
  <ref name="DocumentSubtype"/>
@@ -988,6 +1101,16 @@
988
1101
  <data type="boolean"/>
989
1102
  </attribute>
990
1103
  </optional>
1104
+ <optional>
1105
+ <attribute name="linkmention">
1106
+ <data type="boolean"/>
1107
+ </attribute>
1108
+ </optional>
1109
+ <optional>
1110
+ <attribute name="linkref">
1111
+ <data type="boolean"/>
1112
+ </attribute>
1113
+ </optional>
991
1114
  <optional>
992
1115
  <element name="refterm">
993
1116
  <zeroOrMore>
@@ -1024,6 +1147,7 @@
1024
1147
  <ref name="svgmap"/>
1025
1148
  <ref name="inputform"/>
1026
1149
  <ref name="toc"/>
1150
+ <ref name="passthrough"/>
1027
1151
  </choice>
1028
1152
  </define>
1029
1153
  <define name="toc">
@@ -1031,6 +1155,14 @@
1031
1155
  <ref name="ul"/>
1032
1156
  </element>
1033
1157
  </define>
1158
+ <define name="passthrough">
1159
+ <element name="passthrough">
1160
+ <optional>
1161
+ <attribute name="formats"/>
1162
+ </optional>
1163
+ <text/>
1164
+ </element>
1165
+ </define>
1034
1166
  <define name="inputform">
1035
1167
  <element name="form">
1036
1168
  <attribute name="id">
@@ -1041,6 +1173,14 @@
1041
1173
  <optional>
1042
1174
  <attribute name="class"/>
1043
1175
  </optional>
1176
+ <optional>
1177
+ <attribute name="tag"/>
1178
+ </optional>
1179
+ <optional>
1180
+ <attribute name="multilingual-rendering">
1181
+ <ref name="MultilingualRenderingType"/>
1182
+ </attribute>
1183
+ </optional>
1044
1184
  <zeroOrMore>
1045
1185
  <choice>
1046
1186
  <ref name="TextElement"/>
@@ -1240,9 +1380,6 @@
1240
1380
  <zeroOrMore>
1241
1381
  <ref name="BasicBlock"/>
1242
1382
  </zeroOrMore>
1243
- <zeroOrMore>
1244
- <ref name="note"/>
1245
- </zeroOrMore>
1246
1383
  <choice>
1247
1384
  <oneOrMore>
1248
1385
  <ref name="reference-clause"/>
@@ -1425,9 +1562,6 @@
1425
1562
  <zeroOrMore>
1426
1563
  <ref name="BasicBlock"/>
1427
1564
  </zeroOrMore>
1428
- <zeroOrMore>
1429
- <ref name="note"/>
1430
- </zeroOrMore>
1431
1565
  <ref name="dl"/>
1432
1566
  </oneOrMore>
1433
1567
  </element>
@@ -1487,14 +1621,9 @@
1487
1621
  <ref name="section-title"/>
1488
1622
  </optional>
1489
1623
  <group>
1490
- <group>
1491
- <zeroOrMore>
1492
- <ref name="BasicBlock"/>
1493
- </zeroOrMore>
1494
- <zeroOrMore>
1495
- <ref name="note"/>
1496
- </zeroOrMore>
1497
- </group>
1624
+ <zeroOrMore>
1625
+ <ref name="BasicBlock"/>
1626
+ </zeroOrMore>
1498
1627
  <zeroOrMore>
1499
1628
  <ref name="content-subsection"/>
1500
1629
  </zeroOrMore>
@@ -1541,14 +1670,9 @@
1541
1670
  </optional>
1542
1671
  <choice>
1543
1672
  <choice>
1544
- <group>
1545
- <oneOrMore>
1546
- <ref name="BasicBlock"/>
1547
- </oneOrMore>
1548
- <zeroOrMore>
1549
- <ref name="note"/>
1550
- </zeroOrMore>
1551
- </group>
1673
+ <oneOrMore>
1674
+ <ref name="BasicBlock"/>
1675
+ </oneOrMore>
1552
1676
  <ref name="amend"/>
1553
1677
  </choice>
1554
1678
  <oneOrMore>
@@ -1589,14 +1713,9 @@
1589
1713
  <ref name="section-title"/>
1590
1714
  </optional>
1591
1715
  <group>
1592
- <group>
1593
- <zeroOrMore>
1594
- <ref name="BasicBlock"/>
1595
- </zeroOrMore>
1596
- <zeroOrMore>
1597
- <ref name="note"/>
1598
- </zeroOrMore>
1599
- </group>
1716
+ <zeroOrMore>
1717
+ <ref name="BasicBlock"/>
1718
+ </zeroOrMore>
1600
1719
  <zeroOrMore>
1601
1720
  <choice>
1602
1721
  <ref name="annex-subsection"/>
@@ -1655,9 +1774,6 @@
1655
1774
  <zeroOrMore>
1656
1775
  <ref name="BasicBlock"/>
1657
1776
  </zeroOrMore>
1658
- <zeroOrMore>
1659
- <ref name="note"/>
1660
- </zeroOrMore>
1661
1777
  <choice>
1662
1778
  <oneOrMore>
1663
1779
  <ref name="term"/>
@@ -1680,6 +1796,20 @@
1680
1796
  <data type="ID"/>
1681
1797
  </attribute>
1682
1798
  </optional>
1799
+ <optional>
1800
+ <attribute name="language"/>
1801
+ </optional>
1802
+ <optional>
1803
+ <attribute name="script"/>
1804
+ </optional>
1805
+ <optional>
1806
+ <attribute name="tag"/>
1807
+ </optional>
1808
+ <optional>
1809
+ <attribute name="multilingual-rendering">
1810
+ <ref name="MultilingualRenderingType"/>
1811
+ </attribute>
1812
+ </optional>
1683
1813
  <oneOrMore>
1684
1814
  <ref name="preferred"/>
1685
1815
  </oneOrMore>
@@ -1687,18 +1817,20 @@
1687
1817
  <ref name="admitted"/>
1688
1818
  </zeroOrMore>
1689
1819
  <zeroOrMore>
1690
- <ref name="related"/>
1820
+ <ref name="deprecates"/>
1691
1821
  </zeroOrMore>
1692
1822
  <zeroOrMore>
1693
- <ref name="deprecates"/>
1823
+ <ref name="related"/>
1694
1824
  </zeroOrMore>
1695
1825
  <optional>
1696
1826
  <ref name="termdomain"/>
1697
1827
  </optional>
1698
- <zeroOrMore>
1699
- <ref name="termgrammar"/>
1700
- </zeroOrMore>
1701
- <ref name="definition"/>
1828
+ <optional>
1829
+ <ref name="termsubject"/>
1830
+ </optional>
1831
+ <oneOrMore>
1832
+ <ref name="termdefinition"/>
1833
+ </oneOrMore>
1702
1834
  <zeroOrMore>
1703
1835
  <ref name="termnote"/>
1704
1836
  </zeroOrMore>
@@ -1712,41 +1844,232 @@
1712
1844
  </define>
1713
1845
  <define name="preferred">
1714
1846
  <element name="preferred">
1715
- <oneOrMore>
1716
- <ref name="TextElement"/>
1717
- </oneOrMore>
1847
+ <ref name="Designation"/>
1718
1848
  </element>
1719
1849
  </define>
1720
1850
  <define name="admitted">
1721
1851
  <element name="admitted">
1722
- <oneOrMore>
1723
- <ref name="TextElement"/>
1724
- </oneOrMore>
1852
+ <ref name="Designation"/>
1725
1853
  </element>
1726
1854
  </define>
1727
1855
  <define name="related">
1728
1856
  <element name="related">
1857
+ <attribute name="type">
1858
+ <ref name="RelatedTermType"/>
1859
+ </attribute>
1860
+ <element name="preferred">
1861
+ <ref name="Designation"/>
1862
+ </element>
1863
+ <choice>
1864
+ <ref name="eref"/>
1865
+ <ref name="xref"/>
1866
+ <ref name="termref"/>
1867
+ </choice>
1868
+ </element>
1869
+ </define>
1870
+ <define name="RelatedTermType">
1871
+ <choice>
1872
+ <value>deprecates</value>
1873
+ <value>supersedes</value>
1874
+ <value>narrower</value>
1875
+ <value>broader</value>
1876
+ <value>equivalent</value>
1877
+ <value>compare</value>
1878
+ <value>contrast</value>
1879
+ <value>see</value>
1880
+ </choice>
1881
+ </define>
1882
+ <define name="deprecates">
1883
+ <element name="deprecates">
1884
+ <ref name="Designation"/>
1885
+ </element>
1886
+ </define>
1887
+ <define name="Designation">
1888
+ <optional>
1889
+ <attribute name="absent">
1890
+ <data type="boolean"/>
1891
+ </attribute>
1892
+ </optional>
1893
+ <optional>
1894
+ <attribute name="geographic-area"/>
1895
+ </optional>
1896
+ <choice>
1897
+ <ref name="expression_designation"/>
1898
+ <ref name="letter_symbol_designation"/>
1899
+ <ref name="graphical_symbol_designation"/>
1900
+ </choice>
1901
+ <optional>
1902
+ <ref name="fieldofapplication"/>
1903
+ </optional>
1904
+ <optional>
1905
+ <ref name="usageinfo"/>
1906
+ </optional>
1907
+ <zeroOrMore>
1908
+ <ref name="termsource"/>
1909
+ </zeroOrMore>
1910
+ </define>
1911
+ <define name="fieldofapplication">
1912
+ <element name="field-of-application">
1913
+ <oneOrMore>
1914
+ <ref name="PureTextElement"/>
1915
+ </oneOrMore>
1916
+ </element>
1917
+ </define>
1918
+ <define name="usageinfo">
1919
+ <element name="usage-info">
1920
+ <oneOrMore>
1921
+ <ref name="PureTextElement"/>
1922
+ </oneOrMore>
1923
+ </element>
1924
+ </define>
1925
+ <define name="letter_symbol_designation">
1926
+ <element name="letter-symbol">
1729
1927
  <optional>
1730
- <attribute name="type">
1928
+ <attribute name="isInternational">
1929
+ <data type="boolean"/>
1930
+ </attribute>
1931
+ </optional>
1932
+ <element name="name">
1933
+ <oneOrMore>
1731
1934
  <choice>
1732
- <value>compare</value>
1733
- <value>contrast</value>
1734
- <value>see</value>
1935
+ <ref name="PureTextElement"/>
1936
+ <ref name="stem"/>
1735
1937
  </choice>
1938
+ </oneOrMore>
1939
+ </element>
1940
+ </element>
1941
+ </define>
1942
+ <define name="graphical_symbol_designation">
1943
+ <element name="graphical-symbol">
1944
+ <optional>
1945
+ <attribute name="isInternational">
1946
+ <data type="boolean"/>
1736
1947
  </attribute>
1737
1948
  </optional>
1738
- <oneOrMore>
1739
- <ref name="TextElement"/>
1740
- </oneOrMore>
1949
+ <ref name="figure"/>
1741
1950
  </element>
1742
1951
  </define>
1743
- <define name="deprecates">
1744
- <element name="deprecates">
1745
- <oneOrMore>
1746
- <ref name="TextElement"/>
1747
- </oneOrMore>
1952
+ <define name="expression_designation">
1953
+ <element name="expression">
1954
+ <optional>
1955
+ <attribute name="language">
1956
+ <a:documentation>ISO-639</a:documentation>
1957
+ </attribute>
1958
+ </optional>
1959
+ <optional>
1960
+ <attribute name="script">
1961
+ <a:documentation>ISO-15924</a:documentation>
1962
+ </attribute>
1963
+ </optional>
1964
+ <optional>
1965
+ <attribute name="type">
1966
+ <ref name="ExpressionDesignationType"/>
1967
+ </attribute>
1968
+ </optional>
1969
+ <optional>
1970
+ <attribute name="isInternational">
1971
+ <data type="boolean"/>
1972
+ </attribute>
1973
+ </optional>
1974
+ <element name="name">
1975
+ <zeroOrMore>
1976
+ <ref name="PureTextElement"/>
1977
+ </zeroOrMore>
1978
+ </element>
1979
+ <optional>
1980
+ <element name="abbreviation-type">
1981
+ <ref name="AbbreviationType"/>
1982
+ </element>
1983
+ </optional>
1984
+ <optional>
1985
+ <element name="pronunciation">
1986
+ <ref name="LocalizedString"/>
1987
+ </element>
1988
+ </optional>
1989
+ <optional>
1990
+ <element name="grammar-info">
1991
+ <ref name="Grammar"/>
1992
+ </element>
1993
+ </optional>
1748
1994
  </element>
1749
1995
  </define>
1996
+ <define name="ExpressionDesignationType">
1997
+ <choice>
1998
+ <value>prefix</value>
1999
+ <value>suffix</value>
2000
+ <value>abbreviation</value>
2001
+ <value>full</value>
2002
+ </choice>
2003
+ </define>
2004
+ <define name="AbbreviationType">
2005
+ <choice>
2006
+ <value>truncation</value>
2007
+ <value>acronym</value>
2008
+ <value>initialism</value>
2009
+ </choice>
2010
+ </define>
2011
+ <define name="Grammar">
2012
+ <zeroOrMore>
2013
+ <element name="gender">
2014
+ <ref name="GrammarGender"/>
2015
+ </element>
2016
+ </zeroOrMore>
2017
+ <zeroOrMore>
2018
+ <element name="number">
2019
+ <ref name="GrammarNumber"/>
2020
+ </element>
2021
+ </zeroOrMore>
2022
+ <optional>
2023
+ <element name="isPreposition">
2024
+ <data type="boolean"/>
2025
+ </element>
2026
+ </optional>
2027
+ <optional>
2028
+ <element name="isParticiple">
2029
+ <data type="boolean"/>
2030
+ </element>
2031
+ </optional>
2032
+ <optional>
2033
+ <element name="isAdjective">
2034
+ <data type="boolean"/>
2035
+ </element>
2036
+ </optional>
2037
+ <optional>
2038
+ <element name="isVerb">
2039
+ <data type="boolean"/>
2040
+ </element>
2041
+ </optional>
2042
+ <optional>
2043
+ <element name="isAdverb">
2044
+ <data type="boolean"/>
2045
+ </element>
2046
+ </optional>
2047
+ <optional>
2048
+ <element name="isNoun">
2049
+ <data type="boolean"/>
2050
+ </element>
2051
+ </optional>
2052
+ <zeroOrMore>
2053
+ <element name="grammar-value">
2054
+ <text/>
2055
+ </element>
2056
+ </zeroOrMore>
2057
+ </define>
2058
+ <define name="GrammarGender">
2059
+ <choice>
2060
+ <value>masculine</value>
2061
+ <value>feminine</value>
2062
+ <value>neuter</value>
2063
+ <value>common</value>
2064
+ </choice>
2065
+ </define>
2066
+ <define name="GrammarNumber">
2067
+ <choice>
2068
+ <value>singular</value>
2069
+ <value>dual</value>
2070
+ <value>plural</value>
2071
+ </choice>
2072
+ </define>
1750
2073
  <define name="termdomain">
1751
2074
  <element name="domain">
1752
2075
  <oneOrMore>
@@ -1754,22 +2077,55 @@
1754
2077
  </oneOrMore>
1755
2078
  </element>
1756
2079
  </define>
1757
- <define name="termgrammar">
1758
- <element name="grammar">
2080
+ <define name="termsubject">
2081
+ <element name="subject">
1759
2082
  <oneOrMore>
1760
2083
  <ref name="TextElement"/>
1761
2084
  </oneOrMore>
1762
2085
  </element>
1763
2086
  </define>
1764
- <define name="definition">
2087
+ <define name="termdefinition">
1765
2088
  <element name="definition">
2089
+ <choice>
2090
+ <ref name="verbaldefinition"/>
2091
+ <ref name="nonverbalrep"/>
2092
+ <group>
2093
+ <ref name="verbaldefinition"/>
2094
+ <ref name="nonverbalrep"/>
2095
+ </group>
2096
+ </choice>
2097
+ </element>
2098
+ </define>
2099
+ <define name="verbaldefinition">
2100
+ <element name="verbal-definition">
1766
2101
  <oneOrMore>
1767
2102
  <choice>
1768
2103
  <ref name="paragraph"/>
2104
+ <ref name="dl"/>
2105
+ <ref name="ol"/>
2106
+ <ref name="ul"/>
2107
+ <ref name="table"/>
1769
2108
  <ref name="figure"/>
1770
2109
  <ref name="formula"/>
1771
2110
  </choice>
1772
2111
  </oneOrMore>
2112
+ <zeroOrMore>
2113
+ <ref name="termsource"/>
2114
+ </zeroOrMore>
2115
+ </element>
2116
+ </define>
2117
+ <define name="nonverbalrep">
2118
+ <element name="non-verbal-representation">
2119
+ <oneOrMore>
2120
+ <choice>
2121
+ <ref name="table"/>
2122
+ <ref name="figure"/>
2123
+ <ref name="formula"/>
2124
+ </choice>
2125
+ </oneOrMore>
2126
+ <zeroOrMore>
2127
+ <ref name="termsource"/>
2128
+ </zeroOrMore>
1773
2129
  </element>
1774
2130
  </define>
1775
2131
  <define name="termnote">
@@ -1798,6 +2154,14 @@
1798
2154
  <data type="boolean"/>
1799
2155
  </attribute>
1800
2156
  </optional>
2157
+ <optional>
2158
+ <attribute name="tag"/>
2159
+ </optional>
2160
+ <optional>
2161
+ <attribute name="multilingual-rendering">
2162
+ <ref name="MultilingualRenderingType"/>
2163
+ </attribute>
2164
+ </optional>
1801
2165
  <oneOrMore>
1802
2166
  <choice>
1803
2167
  <ref name="paragraph"/>
@@ -1814,6 +2178,24 @@
1814
2178
  <attribute name="id">
1815
2179
  <data type="ID"/>
1816
2180
  </attribute>
2181
+ <optional>
2182
+ <attribute name="keep-with-next">
2183
+ <data type="boolean"/>
2184
+ </attribute>
2185
+ </optional>
2186
+ <optional>
2187
+ <attribute name="keep-lines-together">
2188
+ <data type="boolean"/>
2189
+ </attribute>
2190
+ </optional>
2191
+ <optional>
2192
+ <attribute name="tag"/>
2193
+ </optional>
2194
+ <optional>
2195
+ <attribute name="multilingual-rendering">
2196
+ <ref name="MultilingualRenderingType"/>
2197
+ </attribute>
2198
+ </optional>
1817
2199
  <ref name="paragraph"/>
1818
2200
  </element>
1819
2201
  </define>
@@ -1825,6 +2207,12 @@
1825
2207
  <value>modified</value>
1826
2208
  </choice>
1827
2209
  </attribute>
2210
+ <attribute name="type">
2211
+ <choice>
2212
+ <value>authoritative</value>
2213
+ <value>lineage</value>
2214
+ </choice>
2215
+ </attribute>
1828
2216
  <ref name="origin"/>
1829
2217
  <optional>
1830
2218
  <ref name="modification"/>
@@ -1940,9 +2328,6 @@
1940
2328
  <zeroOrMore>
1941
2329
  <ref name="BasicBlock"/>
1942
2330
  </zeroOrMore>
1943
- <zeroOrMore>
1944
- <ref name="note"/>
1945
- </zeroOrMore>
1946
2331
  <zeroOrMore>
1947
2332
  <choice>
1948
2333
  <ref name="term-clause"/>
@@ -1981,6 +2366,14 @@
1981
2366
  <optional>
1982
2367
  <attribute name="title"/>
1983
2368
  </optional>
2369
+ <optional>
2370
+ <attribute name="tag"/>
2371
+ </optional>
2372
+ <optional>
2373
+ <attribute name="multilingual-rendering">
2374
+ <ref name="MultilingualRenderingType"/>
2375
+ </attribute>
2376
+ </optional>
1984
2377
  <optional>
1985
2378
  <element name="location">
1986
2379
  <zeroOrMore>
@@ -2040,6 +2433,14 @@
2040
2433
  </define>
2041
2434
  <define name="imagemap">
2042
2435
  <element name="imagemap">
2436
+ <optional>
2437
+ <attribute name="tag"/>
2438
+ </optional>
2439
+ <optional>
2440
+ <attribute name="multilingual-rendering">
2441
+ <ref name="MultilingualRenderingType"/>
2442
+ </attribute>
2443
+ </optional>
2043
2444
  <ref name="figure"/>
2044
2445
  <zeroOrMore>
2045
2446
  <element name="area">
@@ -2084,6 +2485,14 @@
2084
2485
  </define>
2085
2486
  <define name="svgmap">
2086
2487
  <element name="svgmap">
2488
+ <optional>
2489
+ <attribute name="tag"/>
2490
+ </optional>
2491
+ <optional>
2492
+ <attribute name="multilingual-rendering">
2493
+ <ref name="MultilingualRenderingType"/>
2494
+ </attribute>
2495
+ </optional>
2087
2496
  <ref name="figure"/>
2088
2497
  <zeroOrMore>
2089
2498
  <element name="target">