metanorma-generic 1.10.4 → 1.11.3

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/isodoc.rng +473 -77
  4. data/lib/asciidoctor/generic/reqt.rng +23 -2
  5. data/lib/isodoc/generic/base_convert.rb +4 -3
  6. data/lib/isodoc/generic/html/generic.scss +0 -1
  7. data/lib/isodoc/generic/html/htmlstyle.scss +14 -11
  8. data/lib/isodoc/generic/html/scripts.html +0 -1
  9. data/lib/isodoc/generic/html/wordstyle.scss +30 -18
  10. data/lib/metanorma/generic/version.rb +1 -1
  11. data/lib/metanorma/generic.rb +9 -21
  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,6 +184,14 @@
170
184
  <data type="boolean"/>
171
185
  </attribute>
172
186
  </optional>
187
+ <optional>
188
+ <attribute name="tag"/>
189
+ </optional>
190
+ <optional>
191
+ <attribute name="multilingual-rendering">
192
+ <ref name="MultilingualRenderingType"/>
193
+ </attribute>
194
+ </optional>
173
195
  <optional>
174
196
  <attribute name="type">
175
197
  <choice>
@@ -209,6 +231,14 @@
209
231
  <data type="boolean"/>
210
232
  </attribute>
211
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>
212
242
  <oneOrMore>
213
243
  <ref name="dt"/>
214
244
  <ref name="dd"/>
@@ -256,6 +286,14 @@
256
286
  <data type="boolean"/>
257
287
  </attribute>
258
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>
259
297
  <optional>
260
298
  <ref name="tname"/>
261
299
  </optional>
@@ -316,6 +354,14 @@
316
354
  <optional>
317
355
  <attribute name="width"/>
318
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>
319
365
  <optional>
320
366
  <ref name="colgroup"/>
321
367
  </optional>
@@ -366,6 +412,14 @@
366
412
  <optional>
367
413
  <attribute name="class"/>
368
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>
369
423
  <optional>
370
424
  <ref name="source"/>
371
425
  </optional>
@@ -424,6 +478,14 @@
424
478
  <optional>
425
479
  <attribute name="lang"/>
426
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>
427
489
  <optional>
428
490
  <ref name="tname"/>
429
491
  </optional>
@@ -472,6 +534,14 @@
472
534
  <data type="boolean"/>
473
535
  </attribute>
474
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>
475
545
  <ref name="stem"/>
476
546
  <optional>
477
547
  <ref name="dl"/>
@@ -500,6 +570,14 @@
500
570
  <data type="boolean"/>
501
571
  </attribute>
502
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>
503
581
  <zeroOrMore>
504
582
  <ref name="TextElement"/>
505
583
  </zeroOrMore>
@@ -527,6 +605,14 @@
527
605
  <data type="boolean"/>
528
606
  </attribute>
529
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>
530
616
  <zeroOrMore>
531
617
  <choice>
532
618
  <ref name="TextElement"/>
@@ -558,6 +644,14 @@
558
644
  <data type="boolean"/>
559
645
  </attribute>
560
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>
561
655
  <optional>
562
656
  <ref name="quote-source"/>
563
657
  </optional>
@@ -624,9 +718,6 @@
624
718
  <zeroOrMore>
625
719
  <ref name="BasicBlock"/>
626
720
  </zeroOrMore>
627
- <zeroOrMore>
628
- <ref name="note"/>
629
- </zeroOrMore>
630
721
  <zeroOrMore>
631
722
  <ref name="bibitem"/>
632
723
  <zeroOrMore>
@@ -667,6 +758,14 @@
667
758
  <optional>
668
759
  <attribute name="type"/>
669
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>
670
769
  <oneOrMore>
671
770
  <choice>
672
771
  <ref name="paragraph"/>
@@ -703,14 +802,9 @@
703
802
  <optional>
704
803
  <ref name="section-title"/>
705
804
  </optional>
706
- <group>
707
- <oneOrMore>
708
- <ref name="BasicBlock"/>
709
- </oneOrMore>
710
- <zeroOrMore>
711
- <ref name="note"/>
712
- </zeroOrMore>
713
- </group>
805
+ <oneOrMore>
806
+ <ref name="BasicBlock"/>
807
+ </oneOrMore>
714
808
  </define>
715
809
  <define name="li">
716
810
  <element name="li">
@@ -845,6 +939,9 @@
845
939
  <ref name="PureTextElement"/>
846
940
  <ref name="stem"/>
847
941
  <ref name="index"/>
942
+ <ref name="eref"/>
943
+ <ref name="xref"/>
944
+ <ref name="hyperlink"/>
848
945
  </choice>
849
946
  </zeroOrMore>
850
947
  </element>
@@ -856,6 +953,9 @@
856
953
  <ref name="PureTextElement"/>
857
954
  <ref name="stem"/>
858
955
  <ref name="index"/>
956
+ <ref name="eref"/>
957
+ <ref name="xref"/>
958
+ <ref name="hyperlink"/>
859
959
  </choice>
860
960
  </zeroOrMore>
861
961
  </element>
@@ -866,6 +966,9 @@
866
966
  <choice>
867
967
  <ref name="PureTextElement"/>
868
968
  <ref name="index"/>
969
+ <ref name="eref"/>
970
+ <ref name="xref"/>
971
+ <ref name="hyperlink"/>
869
972
  </choice>
870
973
  </zeroOrMore>
871
974
  </element>
@@ -924,6 +1027,14 @@
924
1027
  </define>
925
1028
  </include>
926
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>
927
1038
  <define name="docsubtype">
928
1039
  <element name="subdoctype">
929
1040
  <ref name="DocumentSubtype"/>
@@ -1036,6 +1147,7 @@
1036
1147
  <ref name="svgmap"/>
1037
1148
  <ref name="inputform"/>
1038
1149
  <ref name="toc"/>
1150
+ <ref name="passthrough"/>
1039
1151
  </choice>
1040
1152
  </define>
1041
1153
  <define name="toc">
@@ -1043,6 +1155,14 @@
1043
1155
  <ref name="ul"/>
1044
1156
  </element>
1045
1157
  </define>
1158
+ <define name="passthrough">
1159
+ <element name="passthrough">
1160
+ <optional>
1161
+ <attribute name="formats"/>
1162
+ </optional>
1163
+ <text/>
1164
+ </element>
1165
+ </define>
1046
1166
  <define name="inputform">
1047
1167
  <element name="form">
1048
1168
  <attribute name="id">
@@ -1053,6 +1173,14 @@
1053
1173
  <optional>
1054
1174
  <attribute name="class"/>
1055
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>
1056
1184
  <zeroOrMore>
1057
1185
  <choice>
1058
1186
  <ref name="TextElement"/>
@@ -1252,9 +1380,6 @@
1252
1380
  <zeroOrMore>
1253
1381
  <ref name="BasicBlock"/>
1254
1382
  </zeroOrMore>
1255
- <zeroOrMore>
1256
- <ref name="note"/>
1257
- </zeroOrMore>
1258
1383
  <choice>
1259
1384
  <oneOrMore>
1260
1385
  <ref name="reference-clause"/>
@@ -1437,9 +1562,6 @@
1437
1562
  <zeroOrMore>
1438
1563
  <ref name="BasicBlock"/>
1439
1564
  </zeroOrMore>
1440
- <zeroOrMore>
1441
- <ref name="note"/>
1442
- </zeroOrMore>
1443
1565
  <ref name="dl"/>
1444
1566
  </oneOrMore>
1445
1567
  </element>
@@ -1499,14 +1621,9 @@
1499
1621
  <ref name="section-title"/>
1500
1622
  </optional>
1501
1623
  <group>
1502
- <group>
1503
- <zeroOrMore>
1504
- <ref name="BasicBlock"/>
1505
- </zeroOrMore>
1506
- <zeroOrMore>
1507
- <ref name="note"/>
1508
- </zeroOrMore>
1509
- </group>
1624
+ <zeroOrMore>
1625
+ <ref name="BasicBlock"/>
1626
+ </zeroOrMore>
1510
1627
  <zeroOrMore>
1511
1628
  <ref name="content-subsection"/>
1512
1629
  </zeroOrMore>
@@ -1553,14 +1670,9 @@
1553
1670
  </optional>
1554
1671
  <choice>
1555
1672
  <choice>
1556
- <group>
1557
- <oneOrMore>
1558
- <ref name="BasicBlock"/>
1559
- </oneOrMore>
1560
- <zeroOrMore>
1561
- <ref name="note"/>
1562
- </zeroOrMore>
1563
- </group>
1673
+ <oneOrMore>
1674
+ <ref name="BasicBlock"/>
1675
+ </oneOrMore>
1564
1676
  <ref name="amend"/>
1565
1677
  </choice>
1566
1678
  <oneOrMore>
@@ -1601,14 +1713,9 @@
1601
1713
  <ref name="section-title"/>
1602
1714
  </optional>
1603
1715
  <group>
1604
- <group>
1605
- <zeroOrMore>
1606
- <ref name="BasicBlock"/>
1607
- </zeroOrMore>
1608
- <zeroOrMore>
1609
- <ref name="note"/>
1610
- </zeroOrMore>
1611
- </group>
1716
+ <zeroOrMore>
1717
+ <ref name="BasicBlock"/>
1718
+ </zeroOrMore>
1612
1719
  <zeroOrMore>
1613
1720
  <choice>
1614
1721
  <ref name="annex-subsection"/>
@@ -1667,9 +1774,6 @@
1667
1774
  <zeroOrMore>
1668
1775
  <ref name="BasicBlock"/>
1669
1776
  </zeroOrMore>
1670
- <zeroOrMore>
1671
- <ref name="note"/>
1672
- </zeroOrMore>
1673
1777
  <choice>
1674
1778
  <oneOrMore>
1675
1779
  <ref name="term"/>
@@ -1692,6 +1796,20 @@
1692
1796
  <data type="ID"/>
1693
1797
  </attribute>
1694
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>
1695
1813
  <oneOrMore>
1696
1814
  <ref name="preferred"/>
1697
1815
  </oneOrMore>
@@ -1699,17 +1817,17 @@
1699
1817
  <ref name="admitted"/>
1700
1818
  </zeroOrMore>
1701
1819
  <zeroOrMore>
1702
- <ref name="related"/>
1820
+ <ref name="deprecates"/>
1703
1821
  </zeroOrMore>
1704
1822
  <zeroOrMore>
1705
- <ref name="deprecates"/>
1823
+ <ref name="related"/>
1706
1824
  </zeroOrMore>
1707
1825
  <optional>
1708
1826
  <ref name="termdomain"/>
1709
1827
  </optional>
1710
- <zeroOrMore>
1711
- <ref name="termgrammar"/>
1712
- </zeroOrMore>
1828
+ <optional>
1829
+ <ref name="termsubject"/>
1830
+ </optional>
1713
1831
  <oneOrMore>
1714
1832
  <ref name="termdefinition"/>
1715
1833
  </oneOrMore>
@@ -1726,41 +1844,236 @@
1726
1844
  </define>
1727
1845
  <define name="preferred">
1728
1846
  <element name="preferred">
1729
- <oneOrMore>
1730
- <ref name="TextElement"/>
1731
- </oneOrMore>
1847
+ <ref name="Designation"/>
1732
1848
  </element>
1733
1849
  </define>
1734
1850
  <define name="admitted">
1735
1851
  <element name="admitted">
1736
- <oneOrMore>
1737
- <ref name="TextElement"/>
1738
- </oneOrMore>
1852
+ <ref name="Designation"/>
1739
1853
  </element>
1740
1854
  </define>
1741
1855
  <define name="related">
1742
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">
1743
1927
  <optional>
1744
- <attribute name="type">
1928
+ <attribute name="isInternational">
1929
+ <data type="boolean"/>
1930
+ </attribute>
1931
+ </optional>
1932
+ <element name="name">
1933
+ <oneOrMore>
1745
1934
  <choice>
1746
- <value>compare</value>
1747
- <value>contrast</value>
1748
- <value>see</value>
1935
+ <ref name="PureTextElement"/>
1936
+ <ref name="stem"/>
1749
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"/>
1750
1947
  </attribute>
1751
1948
  </optional>
1752
- <oneOrMore>
1753
- <ref name="TextElement"/>
1754
- </oneOrMore>
1949
+ <ref name="figure"/>
1755
1950
  </element>
1756
1951
  </define>
1757
- <define name="deprecates">
1758
- <element name="deprecates">
1759
- <oneOrMore>
1760
- <ref name="TextElement"/>
1761
- </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
+ <choice>
1977
+ <ref name="PureTextElement"/>
1978
+ <ref name="stem"/>
1979
+ <ref name="index"/>
1980
+ </choice>
1981
+ </zeroOrMore>
1982
+ </element>
1983
+ <optional>
1984
+ <element name="abbreviation-type">
1985
+ <ref name="AbbreviationType"/>
1986
+ </element>
1987
+ </optional>
1988
+ <optional>
1989
+ <element name="pronunciation">
1990
+ <ref name="LocalizedString"/>
1991
+ </element>
1992
+ </optional>
1993
+ <optional>
1994
+ <element name="grammar">
1995
+ <ref name="Grammar"/>
1996
+ </element>
1997
+ </optional>
1762
1998
  </element>
1763
1999
  </define>
2000
+ <define name="ExpressionDesignationType">
2001
+ <choice>
2002
+ <value>prefix</value>
2003
+ <value>suffix</value>
2004
+ <value>abbreviation</value>
2005
+ <value>full</value>
2006
+ </choice>
2007
+ </define>
2008
+ <define name="AbbreviationType">
2009
+ <choice>
2010
+ <value>truncation</value>
2011
+ <value>acronym</value>
2012
+ <value>initialism</value>
2013
+ </choice>
2014
+ </define>
2015
+ <define name="Grammar">
2016
+ <zeroOrMore>
2017
+ <element name="gender">
2018
+ <ref name="GrammarGender"/>
2019
+ </element>
2020
+ </zeroOrMore>
2021
+ <zeroOrMore>
2022
+ <element name="number">
2023
+ <ref name="GrammarNumber"/>
2024
+ </element>
2025
+ </zeroOrMore>
2026
+ <optional>
2027
+ <element name="isPreposition">
2028
+ <data type="boolean"/>
2029
+ </element>
2030
+ </optional>
2031
+ <optional>
2032
+ <element name="isParticiple">
2033
+ <data type="boolean"/>
2034
+ </element>
2035
+ </optional>
2036
+ <optional>
2037
+ <element name="isAdjective">
2038
+ <data type="boolean"/>
2039
+ </element>
2040
+ </optional>
2041
+ <optional>
2042
+ <element name="isVerb">
2043
+ <data type="boolean"/>
2044
+ </element>
2045
+ </optional>
2046
+ <optional>
2047
+ <element name="isAdverb">
2048
+ <data type="boolean"/>
2049
+ </element>
2050
+ </optional>
2051
+ <optional>
2052
+ <element name="isNoun">
2053
+ <data type="boolean"/>
2054
+ </element>
2055
+ </optional>
2056
+ <zeroOrMore>
2057
+ <element name="grammar-value">
2058
+ <text/>
2059
+ </element>
2060
+ </zeroOrMore>
2061
+ </define>
2062
+ <define name="GrammarGender">
2063
+ <choice>
2064
+ <value>masculine</value>
2065
+ <value>feminine</value>
2066
+ <value>neuter</value>
2067
+ <value>common</value>
2068
+ </choice>
2069
+ </define>
2070
+ <define name="GrammarNumber">
2071
+ <choice>
2072
+ <value>singular</value>
2073
+ <value>dual</value>
2074
+ <value>plural</value>
2075
+ </choice>
2076
+ </define>
1764
2077
  <define name="termdomain">
1765
2078
  <element name="domain">
1766
2079
  <oneOrMore>
@@ -1768,8 +2081,8 @@
1768
2081
  </oneOrMore>
1769
2082
  </element>
1770
2083
  </define>
1771
- <define name="termgrammar">
1772
- <element name="grammar">
2084
+ <define name="termsubject">
2085
+ <element name="subject">
1773
2086
  <oneOrMore>
1774
2087
  <ref name="TextElement"/>
1775
2088
  </oneOrMore>
@@ -1777,9 +2090,39 @@
1777
2090
  </define>
1778
2091
  <define name="termdefinition">
1779
2092
  <element name="definition">
2093
+ <choice>
2094
+ <ref name="verbaldefinition"/>
2095
+ <ref name="nonverbalrep"/>
2096
+ <group>
2097
+ <ref name="verbaldefinition"/>
2098
+ <ref name="nonverbalrep"/>
2099
+ </group>
2100
+ </choice>
2101
+ </element>
2102
+ </define>
2103
+ <define name="verbaldefinition">
2104
+ <element name="verbal-definition">
1780
2105
  <oneOrMore>
1781
2106
  <choice>
1782
2107
  <ref name="paragraph"/>
2108
+ <ref name="dl"/>
2109
+ <ref name="ol"/>
2110
+ <ref name="ul"/>
2111
+ <ref name="table"/>
2112
+ <ref name="figure"/>
2113
+ <ref name="formula"/>
2114
+ </choice>
2115
+ </oneOrMore>
2116
+ <zeroOrMore>
2117
+ <ref name="termsource"/>
2118
+ </zeroOrMore>
2119
+ </element>
2120
+ </define>
2121
+ <define name="nonverbalrep">
2122
+ <element name="non-verbal-representation">
2123
+ <oneOrMore>
2124
+ <choice>
2125
+ <ref name="table"/>
1783
2126
  <ref name="figure"/>
1784
2127
  <ref name="formula"/>
1785
2128
  </choice>
@@ -1815,6 +2158,14 @@
1815
2158
  <data type="boolean"/>
1816
2159
  </attribute>
1817
2160
  </optional>
2161
+ <optional>
2162
+ <attribute name="tag"/>
2163
+ </optional>
2164
+ <optional>
2165
+ <attribute name="multilingual-rendering">
2166
+ <ref name="MultilingualRenderingType"/>
2167
+ </attribute>
2168
+ </optional>
1818
2169
  <oneOrMore>
1819
2170
  <choice>
1820
2171
  <ref name="paragraph"/>
@@ -1831,6 +2182,24 @@
1831
2182
  <attribute name="id">
1832
2183
  <data type="ID"/>
1833
2184
  </attribute>
2185
+ <optional>
2186
+ <attribute name="keep-with-next">
2187
+ <data type="boolean"/>
2188
+ </attribute>
2189
+ </optional>
2190
+ <optional>
2191
+ <attribute name="keep-lines-together">
2192
+ <data type="boolean"/>
2193
+ </attribute>
2194
+ </optional>
2195
+ <optional>
2196
+ <attribute name="tag"/>
2197
+ </optional>
2198
+ <optional>
2199
+ <attribute name="multilingual-rendering">
2200
+ <ref name="MultilingualRenderingType"/>
2201
+ </attribute>
2202
+ </optional>
1834
2203
  <ref name="paragraph"/>
1835
2204
  </element>
1836
2205
  </define>
@@ -1842,6 +2211,12 @@
1842
2211
  <value>modified</value>
1843
2212
  </choice>
1844
2213
  </attribute>
2214
+ <attribute name="type">
2215
+ <choice>
2216
+ <value>authoritative</value>
2217
+ <value>lineage</value>
2218
+ </choice>
2219
+ </attribute>
1845
2220
  <ref name="origin"/>
1846
2221
  <optional>
1847
2222
  <ref name="modification"/>
@@ -1957,9 +2332,6 @@
1957
2332
  <zeroOrMore>
1958
2333
  <ref name="BasicBlock"/>
1959
2334
  </zeroOrMore>
1960
- <zeroOrMore>
1961
- <ref name="note"/>
1962
- </zeroOrMore>
1963
2335
  <zeroOrMore>
1964
2336
  <choice>
1965
2337
  <ref name="term-clause"/>
@@ -1998,6 +2370,14 @@
1998
2370
  <optional>
1999
2371
  <attribute name="title"/>
2000
2372
  </optional>
2373
+ <optional>
2374
+ <attribute name="tag"/>
2375
+ </optional>
2376
+ <optional>
2377
+ <attribute name="multilingual-rendering">
2378
+ <ref name="MultilingualRenderingType"/>
2379
+ </attribute>
2380
+ </optional>
2001
2381
  <optional>
2002
2382
  <element name="location">
2003
2383
  <zeroOrMore>
@@ -2057,6 +2437,14 @@
2057
2437
  </define>
2058
2438
  <define name="imagemap">
2059
2439
  <element name="imagemap">
2440
+ <optional>
2441
+ <attribute name="tag"/>
2442
+ </optional>
2443
+ <optional>
2444
+ <attribute name="multilingual-rendering">
2445
+ <ref name="MultilingualRenderingType"/>
2446
+ </attribute>
2447
+ </optional>
2060
2448
  <ref name="figure"/>
2061
2449
  <zeroOrMore>
2062
2450
  <element name="area">
@@ -2101,6 +2489,14 @@
2101
2489
  </define>
2102
2490
  <define name="svgmap">
2103
2491
  <element name="svgmap">
2492
+ <optional>
2493
+ <attribute name="tag"/>
2494
+ </optional>
2495
+ <optional>
2496
+ <attribute name="multilingual-rendering">
2497
+ <ref name="MultilingualRenderingType"/>
2498
+ </attribute>
2499
+ </optional>
2104
2500
  <ref name="figure"/>
2105
2501
  <zeroOrMore>
2106
2502
  <element name="target">