metanorma-ogc 1.4.2 → 1.4.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (29) hide show
  1. checksums.yaml +4 -4
  2. data/lib/asciidoctor/ogc/basicdoc.rng +21 -4
  3. data/lib/asciidoctor/ogc/cleanup.rb +41 -13
  4. data/lib/asciidoctor/ogc/converter.rb +10 -0
  5. data/lib/asciidoctor/ogc/isodoc.rng +388 -76
  6. data/lib/asciidoctor/ogc/reqt.rng +23 -2
  7. data/lib/isodoc/ogc/biblio.rb +1 -1
  8. data/lib/isodoc/ogc/html/wordstyle.css +12 -1
  9. data/lib/isodoc/ogc/html/wordstyle.scss +12 -1
  10. data/lib/isodoc/ogc/html/wordstyle_wp.css +12 -1
  11. data/lib/isodoc/ogc/html/wordstyle_wp.scss +12 -1
  12. data/lib/isodoc/ogc/ogc.abstract-specification-topic.xsl +308 -60
  13. data/lib/isodoc/ogc/ogc.best-practice.xsl +308 -60
  14. data/lib/isodoc/ogc/ogc.change-request-supporting-document.xsl +308 -60
  15. data/lib/isodoc/ogc/ogc.community-practice.xsl +308 -60
  16. data/lib/isodoc/ogc/ogc.community-standard.xsl +308 -60
  17. data/lib/isodoc/ogc/ogc.discussion-paper.xsl +308 -60
  18. data/lib/isodoc/ogc/ogc.engineering-report.xsl +308 -60
  19. data/lib/isodoc/ogc/ogc.other.xsl +308 -60
  20. data/lib/isodoc/ogc/ogc.policy.xsl +308 -60
  21. data/lib/isodoc/ogc/ogc.reference-model.xsl +308 -60
  22. data/lib/isodoc/ogc/ogc.release-notes.xsl +308 -60
  23. data/lib/isodoc/ogc/ogc.standard.xsl +308 -60
  24. data/lib/isodoc/ogc/ogc.test-suite.xsl +308 -60
  25. data/lib/isodoc/ogc/ogc.user-guide.xsl +308 -60
  26. data/lib/isodoc/ogc/ogc.white-paper.xsl +207 -21
  27. data/lib/isodoc/ogc/reqt.rb +2 -1
  28. data/lib/metanorma/ogc/version.rb +1 -1
  29. metadata +3 -3
data/lib/asciidoctor/ogc/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">
@@ -62,7 +62,9 @@
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"/>
@@ -1699,17 +1803,20 @@
1699
1803
  <ref name="admitted"/>
1700
1804
  </zeroOrMore>
1701
1805
  <zeroOrMore>
1702
- <ref name="related"/>
1806
+ <ref name="deprecates"/>
1703
1807
  </zeroOrMore>
1704
1808
  <zeroOrMore>
1705
- <ref name="deprecates"/>
1809
+ <ref name="related"/>
1706
1810
  </zeroOrMore>
1707
1811
  <optional>
1708
1812
  <ref name="termdomain"/>
1709
1813
  </optional>
1710
- <zeroOrMore>
1711
- <ref name="termgrammar"/>
1712
- </zeroOrMore>
1814
+ <optional>
1815
+ <ref name="termsubject"/>
1816
+ </optional>
1817
+ <optional>
1818
+ <ref name="termusage"/>
1819
+ </optional>
1713
1820
  <oneOrMore>
1714
1821
  <ref name="termdefinition"/>
1715
1822
  </oneOrMore>
@@ -1726,52 +1833,210 @@
1726
1833
  </define>
1727
1834
  <define name="preferred">
1728
1835
  <element name="preferred">
1729
- <oneOrMore>
1730
- <ref name="TextElement"/>
1731
- </oneOrMore>
1836
+ <ref name="Designation"/>
1732
1837
  </element>
1733
1838
  </define>
1734
1839
  <define name="admitted">
1735
1840
  <element name="admitted">
1736
- <oneOrMore>
1737
- <ref name="TextElement"/>
1738
- </oneOrMore>
1841
+ <ref name="Designation"/>
1739
1842
  </element>
1740
1843
  </define>
1741
1844
  <define name="related">
1742
1845
  <element name="related">
1846
+ <attribute name="type">
1847
+ <ref name="RelatedTermType"/>
1848
+ </attribute>
1849
+ <element name="preferred">
1850
+ <ref name="Designation"/>
1851
+ </element>
1852
+ <choice>
1853
+ <ref name="eref"/>
1854
+ <ref name="xref"/>
1855
+ <ref name="termref"/>
1856
+ </choice>
1857
+ </element>
1858
+ </define>
1859
+ <define name="RelatedTermType">
1860
+ <choice>
1861
+ <value>deprecates</value>
1862
+ <value>supersedes</value>
1863
+ <value>narrower</value>
1864
+ <value>broader</value>
1865
+ <value>equivalent</value>
1866
+ <value>compare</value>
1867
+ <value>contrast</value>
1868
+ <value>see</value>
1869
+ </choice>
1870
+ </define>
1871
+ <define name="deprecates">
1872
+ <element name="deprecates">
1873
+ <ref name="Designation"/>
1874
+ </element>
1875
+ </define>
1876
+ <define name="Designation">
1877
+ <optional>
1878
+ <attribute name="absent">
1879
+ <data type="boolean"/>
1880
+ </attribute>
1881
+ </optional>
1882
+ <optional>
1883
+ <attribute name="geographicArea"/>
1884
+ </optional>
1885
+ <choice>
1886
+ <ref name="expression_designation"/>
1887
+ <ref name="letter_symbol_designation"/>
1888
+ </choice>
1889
+ <zeroOrMore>
1890
+ <ref name="termsource"/>
1891
+ </zeroOrMore>
1892
+ </define>
1893
+ <define name="letter_symbol_designation">
1894
+ <element name="letter-symbol">
1743
1895
  <optional>
1744
- <attribute name="type">
1896
+ <attribute name="isInternational">
1897
+ <data type="boolean"/>
1898
+ </attribute>
1899
+ </optional>
1900
+ <element name="name">
1901
+ <oneOrMore>
1745
1902
  <choice>
1746
- <value>compare</value>
1747
- <value>contrast</value>
1748
- <value>see</value>
1903
+ <ref name="PureTextElement"/>
1904
+ <ref name="stem"/>
1749
1905
  </choice>
1906
+ </oneOrMore>
1907
+ </element>
1908
+ </element>
1909
+ </define>
1910
+ <define name="expression_designation">
1911
+ <element name="expression">
1912
+ <optional>
1913
+ <attribute name="language">
1914
+ <a:documentation>ISO-639</a:documentation>
1750
1915
  </attribute>
1751
1916
  </optional>
1752
- <oneOrMore>
1753
- <ref name="TextElement"/>
1754
- </oneOrMore>
1917
+ <optional>
1918
+ <attribute name="script">
1919
+ <a:documentation>ISO-15924</a:documentation>
1920
+ </attribute>
1921
+ </optional>
1922
+ <optional>
1923
+ <attribute name="type">
1924
+ <ref name="ExpressionDesignationType"/>
1925
+ </attribute>
1926
+ </optional>
1927
+ <optional>
1928
+ <attribute name="isInternational">
1929
+ <data type="boolean"/>
1930
+ </attribute>
1931
+ </optional>
1932
+ <element name="name">
1933
+ <oneOrMore>
1934
+ <choice>
1935
+ <ref name="PureTextElement"/>
1936
+ <ref name="stem"/>
1937
+ </choice>
1938
+ </oneOrMore>
1939
+ </element>
1940
+ <optional>
1941
+ <element name="abbreviationType">
1942
+ <ref name="AbbreviationType"/>
1943
+ </element>
1944
+ </optional>
1945
+ <optional>
1946
+ <element name="pronunciation">
1947
+ <ref name="LocalizedString"/>
1948
+ </element>
1949
+ </optional>
1950
+ <optional>
1951
+ <element name="grammarInfo">
1952
+ <ref name="Grammar"/>
1953
+ </element>
1954
+ </optional>
1755
1955
  </element>
1756
1956
  </define>
1757
- <define name="deprecates">
1758
- <element name="deprecates">
1957
+ <define name="ExpressionDesignationType">
1958
+ <choice>
1959
+ <value>prefix</value>
1960
+ <value>suffix</value>
1961
+ <value>abbreviation</value>
1962
+ <value>full</value>
1963
+ </choice>
1964
+ </define>
1965
+ <define name="AbbreviationType">
1966
+ <choice>
1967
+ <value>truncation</value>
1968
+ <value>acronym</value>
1969
+ <value>initialism</value>
1970
+ </choice>
1971
+ </define>
1972
+ <define name="Grammar">
1973
+ <zeroOrMore>
1974
+ <element name="gender">
1975
+ <ref name="GrammarGender"/>
1976
+ </element>
1977
+ </zeroOrMore>
1978
+ <optional>
1979
+ <element name="isPreposition">
1980
+ <data type="boolean"/>
1981
+ </element>
1982
+ </optional>
1983
+ <optional>
1984
+ <element name="isParticiple">
1985
+ <data type="boolean"/>
1986
+ </element>
1987
+ </optional>
1988
+ <optional>
1989
+ <element name="isAdjective">
1990
+ <data type="boolean"/>
1991
+ </element>
1992
+ </optional>
1993
+ <optional>
1994
+ <element name="isVerb">
1995
+ <data type="boolean"/>
1996
+ </element>
1997
+ </optional>
1998
+ <optional>
1999
+ <element name="isAdverb">
2000
+ <data type="boolean"/>
2001
+ </element>
2002
+ </optional>
2003
+ <optional>
2004
+ <element name="isNoun">
2005
+ <data type="boolean"/>
2006
+ </element>
2007
+ </optional>
2008
+ <zeroOrMore>
2009
+ <element name="grammarvalue">
2010
+ <text/>
2011
+ </element>
2012
+ </zeroOrMore>
2013
+ </define>
2014
+ <define name="GrammarGender">
2015
+ <choice>
2016
+ <value>masculine</value>
2017
+ <value>feminine</value>
2018
+ <value>neuter</value>
2019
+ <value>common</value>
2020
+ </choice>
2021
+ </define>
2022
+ <define name="termdomain">
2023
+ <element name="domain">
1759
2024
  <oneOrMore>
1760
2025
  <ref name="TextElement"/>
1761
2026
  </oneOrMore>
1762
2027
  </element>
1763
2028
  </define>
1764
- <define name="termdomain">
1765
- <element name="domain">
2029
+ <define name="termsubject">
2030
+ <element name="subject">
1766
2031
  <oneOrMore>
1767
2032
  <ref name="TextElement"/>
1768
2033
  </oneOrMore>
1769
2034
  </element>
1770
2035
  </define>
1771
- <define name="termgrammar">
1772
- <element name="grammar">
2036
+ <define name="termusage">
2037
+ <element name="usageinfo">
1773
2038
  <oneOrMore>
1774
- <ref name="TextElement"/>
2039
+ <ref name="BasicBlock"/>
1775
2040
  </oneOrMore>
1776
2041
  </element>
1777
2042
  </define>
@@ -1815,6 +2080,14 @@
1815
2080
  <data type="boolean"/>
1816
2081
  </attribute>
1817
2082
  </optional>
2083
+ <optional>
2084
+ <attribute name="tag"/>
2085
+ </optional>
2086
+ <optional>
2087
+ <attribute name="multilingual-rendering">
2088
+ <ref name="MultilingualRenderingType"/>
2089
+ </attribute>
2090
+ </optional>
1818
2091
  <oneOrMore>
1819
2092
  <choice>
1820
2093
  <ref name="paragraph"/>
@@ -1831,6 +2104,24 @@
1831
2104
  <attribute name="id">
1832
2105
  <data type="ID"/>
1833
2106
  </attribute>
2107
+ <optional>
2108
+ <attribute name="keep-with-next">
2109
+ <data type="boolean"/>
2110
+ </attribute>
2111
+ </optional>
2112
+ <optional>
2113
+ <attribute name="keep-lines-together">
2114
+ <data type="boolean"/>
2115
+ </attribute>
2116
+ </optional>
2117
+ <optional>
2118
+ <attribute name="tag"/>
2119
+ </optional>
2120
+ <optional>
2121
+ <attribute name="multilingual-rendering">
2122
+ <ref name="MultilingualRenderingType"/>
2123
+ </attribute>
2124
+ </optional>
1834
2125
  <ref name="paragraph"/>
1835
2126
  </element>
1836
2127
  </define>
@@ -1957,9 +2248,6 @@
1957
2248
  <zeroOrMore>
1958
2249
  <ref name="BasicBlock"/>
1959
2250
  </zeroOrMore>
1960
- <zeroOrMore>
1961
- <ref name="note"/>
1962
- </zeroOrMore>
1963
2251
  <zeroOrMore>
1964
2252
  <choice>
1965
2253
  <ref name="term-clause"/>
@@ -1998,6 +2286,14 @@
1998
2286
  <optional>
1999
2287
  <attribute name="title"/>
2000
2288
  </optional>
2289
+ <optional>
2290
+ <attribute name="tag"/>
2291
+ </optional>
2292
+ <optional>
2293
+ <attribute name="multilingual-rendering">
2294
+ <ref name="MultilingualRenderingType"/>
2295
+ </attribute>
2296
+ </optional>
2001
2297
  <optional>
2002
2298
  <element name="location">
2003
2299
  <zeroOrMore>
@@ -2057,6 +2353,14 @@
2057
2353
  </define>
2058
2354
  <define name="imagemap">
2059
2355
  <element name="imagemap">
2356
+ <optional>
2357
+ <attribute name="tag"/>
2358
+ </optional>
2359
+ <optional>
2360
+ <attribute name="multilingual-rendering">
2361
+ <ref name="MultilingualRenderingType"/>
2362
+ </attribute>
2363
+ </optional>
2060
2364
  <ref name="figure"/>
2061
2365
  <zeroOrMore>
2062
2366
  <element name="area">
@@ -2101,6 +2405,14 @@
2101
2405
  </define>
2102
2406
  <define name="svgmap">
2103
2407
  <element name="svgmap">
2408
+ <optional>
2409
+ <attribute name="tag"/>
2410
+ </optional>
2411
+ <optional>
2412
+ <attribute name="multilingual-rendering">
2413
+ <ref name="MultilingualRenderingType"/>
2414
+ </attribute>
2415
+ </optional>
2104
2416
  <ref name="figure"/>
2105
2417
  <zeroOrMore>
2106
2418
  <element name="target">