metanorma-generic 1.10.2 → 1.11.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (15) 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 +537 -93
  5. data/lib/asciidoctor/generic/reqt.rng +38 -6
  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.rb +0 -1
  10. data/lib/metanorma/generic/processor.rb +0 -3
  11. data/lib/metanorma/generic/version.rb +1 -1
  12. data/lib/metanorma/generic.rb +21 -17
  13. data/metanorma-generic.gemspec +2 -3
  14. metadata +10 -25
  15. data/lib/isodoc/generic/pdf_convert.rb +0 -66
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">
@@ -32,6 +32,18 @@
32
32
  <ref name="DocumentType"/>
33
33
  </element>
34
34
  </define>
35
+ <define name="section-title">
36
+ <element name="title">
37
+ <zeroOrMore>
38
+ <ref name="TextElement"/>
39
+ </zeroOrMore>
40
+ </element>
41
+ <zeroOrMore>
42
+ <element name="variant-title">
43
+ <ref name="TypedTitleString"/>
44
+ </element>
45
+ </zeroOrMore>
46
+ </define>
35
47
  <define name="hyperlink">
36
48
  <element name="link">
37
49
  <attribute name="target">
@@ -46,11 +58,13 @@
46
58
  <attribute name="alt"/>
47
59
  </optional>
48
60
  <optional>
49
- <attribute name="updatetype">
61
+ <attribute name="update-type">
50
62
  <data type="boolean"/>
51
63
  </attribute>
52
64
  </optional>
53
- <text/>
65
+ <oneOrMore>
66
+ <ref name="PureTextElement"/>
67
+ </oneOrMore>
54
68
  </element>
55
69
  </define>
56
70
  <define name="xref">
@@ -88,7 +102,9 @@
88
102
  <data type="boolean"/>
89
103
  </attribute>
90
104
  </optional>
91
- <text/>
105
+ <oneOrMore>
106
+ <ref name="PureTextElement"/>
107
+ </oneOrMore>
92
108
  </element>
93
109
  </define>
94
110
  <define name="erefType">
@@ -118,7 +134,9 @@
118
134
  </attribute>
119
135
  </optional>
120
136
  <ref name="CitationType"/>
121
- <text/>
137
+ <oneOrMore>
138
+ <ref name="PureTextElement"/>
139
+ </oneOrMore>
122
140
  </define>
123
141
  <define name="ul">
124
142
  <element name="ul">
@@ -135,6 +153,14 @@
135
153
  <data type="boolean"/>
136
154
  </attribute>
137
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>
138
164
  <oneOrMore>
139
165
  <ref name="ul_li"/>
140
166
  </oneOrMore>
@@ -158,15 +184,25 @@
158
184
  <data type="boolean"/>
159
185
  </attribute>
160
186
  </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>
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>
170
206
  <oneOrMore>
171
207
  <ref name="li"/>
172
208
  </oneOrMore>
@@ -195,6 +231,14 @@
195
231
  <data type="boolean"/>
196
232
  </attribute>
197
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>
198
242
  <oneOrMore>
199
243
  <ref name="dt"/>
200
244
  <ref name="dd"/>
@@ -204,6 +248,18 @@
204
248
  </zeroOrMore>
205
249
  </element>
206
250
  </define>
251
+ <define name="dt">
252
+ <element name="dt">
253
+ <optional>
254
+ <attribute name="id">
255
+ <data type="ID"/>
256
+ </attribute>
257
+ </optional>
258
+ <zeroOrMore>
259
+ <ref name="TextElement"/>
260
+ </zeroOrMore>
261
+ </element>
262
+ </define>
207
263
  <define name="example">
208
264
  <element name="example">
209
265
  <attribute name="id">
@@ -230,6 +286,14 @@
230
286
  <data type="boolean"/>
231
287
  </attribute>
232
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>
233
297
  <optional>
234
298
  <ref name="tname"/>
235
299
  </optional>
@@ -290,6 +354,14 @@
290
354
  <optional>
291
355
  <attribute name="width"/>
292
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>
293
365
  <optional>
294
366
  <ref name="colgroup"/>
295
367
  </optional>
@@ -340,6 +412,14 @@
340
412
  <optional>
341
413
  <attribute name="class"/>
342
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>
343
423
  <optional>
344
424
  <ref name="source"/>
345
425
  </optional>
@@ -398,6 +478,14 @@
398
478
  <optional>
399
479
  <attribute name="lang"/>
400
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>
401
489
  <optional>
402
490
  <ref name="tname"/>
403
491
  </optional>
@@ -446,6 +534,14 @@
446
534
  <data type="boolean"/>
447
535
  </attribute>
448
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>
449
545
  <ref name="stem"/>
450
546
  <optional>
451
547
  <ref name="dl"/>
@@ -474,6 +570,14 @@
474
570
  <data type="boolean"/>
475
571
  </attribute>
476
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>
477
581
  <zeroOrMore>
478
582
  <ref name="TextElement"/>
479
583
  </zeroOrMore>
@@ -501,6 +605,14 @@
501
605
  <data type="boolean"/>
502
606
  </attribute>
503
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>
504
616
  <zeroOrMore>
505
617
  <choice>
506
618
  <ref name="TextElement"/>
@@ -532,6 +644,14 @@
532
644
  <data type="boolean"/>
533
645
  </attribute>
534
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>
535
655
  <optional>
536
656
  <ref name="quote-source"/>
537
657
  </optional>
@@ -598,9 +718,6 @@
598
718
  <zeroOrMore>
599
719
  <ref name="BasicBlock"/>
600
720
  </zeroOrMore>
601
- <zeroOrMore>
602
- <ref name="note"/>
603
- </zeroOrMore>
604
721
  <zeroOrMore>
605
722
  <ref name="bibitem"/>
606
723
  <zeroOrMore>
@@ -641,6 +758,14 @@
641
758
  <optional>
642
759
  <attribute name="type"/>
643
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>
644
769
  <oneOrMore>
645
770
  <choice>
646
771
  <ref name="paragraph"/>
@@ -677,14 +802,9 @@
677
802
  <optional>
678
803
  <ref name="section-title"/>
679
804
  </optional>
680
- <group>
681
- <oneOrMore>
682
- <ref name="BasicBlock"/>
683
- </oneOrMore>
684
- <zeroOrMore>
685
- <ref name="note"/>
686
- </zeroOrMore>
687
- </group>
805
+ <oneOrMore>
806
+ <ref name="BasicBlock"/>
807
+ </oneOrMore>
688
808
  </define>
689
809
  <define name="li">
690
810
  <element name="li">
@@ -819,6 +939,9 @@
819
939
  <ref name="PureTextElement"/>
820
940
  <ref name="stem"/>
821
941
  <ref name="index"/>
942
+ <ref name="eref"/>
943
+ <ref name="xref"/>
944
+ <ref name="hyperlink"/>
822
945
  </choice>
823
946
  </zeroOrMore>
824
947
  </element>
@@ -830,6 +953,9 @@
830
953
  <ref name="PureTextElement"/>
831
954
  <ref name="stem"/>
832
955
  <ref name="index"/>
956
+ <ref name="eref"/>
957
+ <ref name="xref"/>
958
+ <ref name="hyperlink"/>
833
959
  </choice>
834
960
  </zeroOrMore>
835
961
  </element>
@@ -840,6 +966,9 @@
840
966
  <choice>
841
967
  <ref name="PureTextElement"/>
842
968
  <ref name="index"/>
969
+ <ref name="eref"/>
970
+ <ref name="xref"/>
971
+ <ref name="hyperlink"/>
843
972
  </choice>
844
973
  </zeroOrMore>
845
974
  </element>
@@ -898,8 +1027,16 @@
898
1027
  </define>
899
1028
  </include>
900
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>
901
1038
  <define name="docsubtype">
902
- <element name="docsubtype">
1039
+ <element name="subdoctype">
903
1040
  <ref name="DocumentSubtype"/>
904
1041
  </element>
905
1042
  </define>
@@ -954,6 +1091,26 @@
954
1091
  </define>
955
1092
  <define name="concept">
956
1093
  <element name="concept">
1094
+ <optional>
1095
+ <attribute name="ital">
1096
+ <data type="boolean"/>
1097
+ </attribute>
1098
+ </optional>
1099
+ <optional>
1100
+ <attribute name="ref">
1101
+ <data type="boolean"/>
1102
+ </attribute>
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>
957
1114
  <optional>
958
1115
  <element name="refterm">
959
1116
  <zeroOrMore>
@@ -989,8 +1146,23 @@
989
1146
  <ref name="imagemap"/>
990
1147
  <ref name="svgmap"/>
991
1148
  <ref name="inputform"/>
1149
+ <ref name="toc"/>
1150
+ <ref name="passthrough"/>
992
1151
  </choice>
993
1152
  </define>
1153
+ <define name="toc">
1154
+ <element name="toc">
1155
+ <ref name="ul"/>
1156
+ </element>
1157
+ </define>
1158
+ <define name="passthrough">
1159
+ <element name="passthrough">
1160
+ <optional>
1161
+ <attribute name="formats"/>
1162
+ </optional>
1163
+ <text/>
1164
+ </element>
1165
+ </define>
994
1166
  <define name="inputform">
995
1167
  <element name="form">
996
1168
  <attribute name="id">
@@ -998,6 +1170,17 @@
998
1170
  </attribute>
999
1171
  <attribute name="name"/>
1000
1172
  <attribute name="action"/>
1173
+ <optional>
1174
+ <attribute name="class"/>
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>
1001
1184
  <zeroOrMore>
1002
1185
  <choice>
1003
1186
  <ref name="TextElement"/>
@@ -1197,9 +1380,6 @@
1197
1380
  <zeroOrMore>
1198
1381
  <ref name="BasicBlock"/>
1199
1382
  </zeroOrMore>
1200
- <zeroOrMore>
1201
- <ref name="note"/>
1202
- </zeroOrMore>
1203
1383
  <choice>
1204
1384
  <oneOrMore>
1205
1385
  <ref name="reference-clause"/>
@@ -1229,6 +1409,12 @@
1229
1409
  <optional>
1230
1410
  <attribute name="type"/>
1231
1411
  </optional>
1412
+ <optional>
1413
+ <attribute name="identifier"/>
1414
+ </optional>
1415
+ <optional>
1416
+ <attribute name="prefix"/>
1417
+ </optional>
1232
1418
  <text/>
1233
1419
  </define>
1234
1420
  <define name="ics">
@@ -1376,9 +1562,6 @@
1376
1562
  <zeroOrMore>
1377
1563
  <ref name="BasicBlock"/>
1378
1564
  </zeroOrMore>
1379
- <zeroOrMore>
1380
- <ref name="note"/>
1381
- </zeroOrMore>
1382
1565
  <ref name="dl"/>
1383
1566
  </oneOrMore>
1384
1567
  </element>
@@ -1438,14 +1621,9 @@
1438
1621
  <ref name="section-title"/>
1439
1622
  </optional>
1440
1623
  <group>
1441
- <group>
1442
- <zeroOrMore>
1443
- <ref name="BasicBlock"/>
1444
- </zeroOrMore>
1445
- <zeroOrMore>
1446
- <ref name="note"/>
1447
- </zeroOrMore>
1448
- </group>
1624
+ <zeroOrMore>
1625
+ <ref name="BasicBlock"/>
1626
+ </zeroOrMore>
1449
1627
  <zeroOrMore>
1450
1628
  <ref name="content-subsection"/>
1451
1629
  </zeroOrMore>
@@ -1490,26 +1668,21 @@
1490
1668
  <optional>
1491
1669
  <ref name="section-title"/>
1492
1670
  </optional>
1493
- <group>
1671
+ <choice>
1494
1672
  <choice>
1495
- <group>
1496
- <zeroOrMore>
1497
- <ref name="BasicBlock"/>
1498
- </zeroOrMore>
1499
- <zeroOrMore>
1500
- <ref name="note"/>
1501
- </zeroOrMore>
1502
- </group>
1673
+ <oneOrMore>
1674
+ <ref name="BasicBlock"/>
1675
+ </oneOrMore>
1503
1676
  <ref name="amend"/>
1504
1677
  </choice>
1505
- <zeroOrMore>
1678
+ <oneOrMore>
1506
1679
  <choice>
1507
1680
  <ref name="clause-subsection"/>
1508
1681
  <ref name="terms"/>
1509
1682
  <ref name="definitions"/>
1510
1683
  </choice>
1511
- </zeroOrMore>
1512
- </group>
1684
+ </oneOrMore>
1685
+ </choice>
1513
1686
  </define>
1514
1687
  <define name="Annex-Section">
1515
1688
  <optional>
@@ -1540,14 +1713,9 @@
1540
1713
  <ref name="section-title"/>
1541
1714
  </optional>
1542
1715
  <group>
1543
- <group>
1544
- <zeroOrMore>
1545
- <ref name="BasicBlock"/>
1546
- </zeroOrMore>
1547
- <zeroOrMore>
1548
- <ref name="note"/>
1549
- </zeroOrMore>
1550
- </group>
1716
+ <zeroOrMore>
1717
+ <ref name="BasicBlock"/>
1718
+ </zeroOrMore>
1551
1719
  <zeroOrMore>
1552
1720
  <choice>
1553
1721
  <ref name="annex-subsection"/>
@@ -1606,9 +1774,6 @@
1606
1774
  <zeroOrMore>
1607
1775
  <ref name="BasicBlock"/>
1608
1776
  </zeroOrMore>
1609
- <zeroOrMore>
1610
- <ref name="note"/>
1611
- </zeroOrMore>
1612
1777
  <choice>
1613
1778
  <oneOrMore>
1614
1779
  <ref name="term"/>
@@ -1638,18 +1803,20 @@
1638
1803
  <ref name="admitted"/>
1639
1804
  </zeroOrMore>
1640
1805
  <zeroOrMore>
1641
- <ref name="related"/>
1806
+ <ref name="deprecates"/>
1642
1807
  </zeroOrMore>
1643
1808
  <zeroOrMore>
1644
- <ref name="deprecates"/>
1809
+ <ref name="related"/>
1645
1810
  </zeroOrMore>
1646
1811
  <optional>
1647
1812
  <ref name="termdomain"/>
1648
1813
  </optional>
1649
- <zeroOrMore>
1650
- <ref name="termgrammar"/>
1651
- </zeroOrMore>
1652
- <ref name="definition"/>
1814
+ <optional>
1815
+ <ref name="termsubject"/>
1816
+ </optional>
1817
+ <oneOrMore>
1818
+ <ref name="termdefinition"/>
1819
+ </oneOrMore>
1653
1820
  <zeroOrMore>
1654
1821
  <ref name="termnote"/>
1655
1822
  </zeroOrMore>
@@ -1663,41 +1830,232 @@
1663
1830
  </define>
1664
1831
  <define name="preferred">
1665
1832
  <element name="preferred">
1666
- <oneOrMore>
1667
- <ref name="TextElement"/>
1668
- </oneOrMore>
1833
+ <ref name="Designation"/>
1669
1834
  </element>
1670
1835
  </define>
1671
1836
  <define name="admitted">
1672
1837
  <element name="admitted">
1673
- <oneOrMore>
1674
- <ref name="TextElement"/>
1675
- </oneOrMore>
1838
+ <ref name="Designation"/>
1676
1839
  </element>
1677
1840
  </define>
1678
1841
  <define name="related">
1679
1842
  <element name="related">
1843
+ <attribute name="type">
1844
+ <ref name="RelatedTermType"/>
1845
+ </attribute>
1846
+ <element name="preferred">
1847
+ <ref name="Designation"/>
1848
+ </element>
1849
+ <choice>
1850
+ <ref name="eref"/>
1851
+ <ref name="xref"/>
1852
+ <ref name="termref"/>
1853
+ </choice>
1854
+ </element>
1855
+ </define>
1856
+ <define name="RelatedTermType">
1857
+ <choice>
1858
+ <value>deprecates</value>
1859
+ <value>supersedes</value>
1860
+ <value>narrower</value>
1861
+ <value>broader</value>
1862
+ <value>equivalent</value>
1863
+ <value>compare</value>
1864
+ <value>contrast</value>
1865
+ <value>see</value>
1866
+ </choice>
1867
+ </define>
1868
+ <define name="deprecates">
1869
+ <element name="deprecates">
1870
+ <ref name="Designation"/>
1871
+ </element>
1872
+ </define>
1873
+ <define name="Designation">
1874
+ <optional>
1875
+ <attribute name="absent">
1876
+ <data type="boolean"/>
1877
+ </attribute>
1878
+ </optional>
1879
+ <optional>
1880
+ <attribute name="geographic-area"/>
1881
+ </optional>
1882
+ <choice>
1883
+ <ref name="expression_designation"/>
1884
+ <ref name="letter_symbol_designation"/>
1885
+ <ref name="graphical_symbol_designation"/>
1886
+ </choice>
1887
+ <optional>
1888
+ <ref name="fieldofapplication"/>
1889
+ </optional>
1890
+ <optional>
1891
+ <ref name="usageinfo"/>
1892
+ </optional>
1893
+ <zeroOrMore>
1894
+ <ref name="termsource"/>
1895
+ </zeroOrMore>
1896
+ </define>
1897
+ <define name="fieldofapplication">
1898
+ <element name="field-of-application">
1899
+ <oneOrMore>
1900
+ <ref name="PureTextElement"/>
1901
+ </oneOrMore>
1902
+ </element>
1903
+ </define>
1904
+ <define name="usageinfo">
1905
+ <element name="usage-info">
1906
+ <oneOrMore>
1907
+ <ref name="PureTextElement"/>
1908
+ </oneOrMore>
1909
+ </element>
1910
+ </define>
1911
+ <define name="letter_symbol_designation">
1912
+ <element name="letter-symbol">
1680
1913
  <optional>
1681
- <attribute name="type">
1914
+ <attribute name="isInternational">
1915
+ <data type="boolean"/>
1916
+ </attribute>
1917
+ </optional>
1918
+ <element name="name">
1919
+ <oneOrMore>
1682
1920
  <choice>
1683
- <value>compare</value>
1684
- <value>contrast</value>
1685
- <value>see</value>
1921
+ <ref name="PureTextElement"/>
1922
+ <ref name="stem"/>
1686
1923
  </choice>
1924
+ </oneOrMore>
1925
+ </element>
1926
+ </element>
1927
+ </define>
1928
+ <define name="graphical_symbol_designation">
1929
+ <element name="graphical-symbol">
1930
+ <optional>
1931
+ <attribute name="isInternational">
1932
+ <data type="boolean"/>
1687
1933
  </attribute>
1688
1934
  </optional>
1689
- <oneOrMore>
1690
- <ref name="TextElement"/>
1691
- </oneOrMore>
1935
+ <ref name="figure"/>
1692
1936
  </element>
1693
1937
  </define>
1694
- <define name="deprecates">
1695
- <element name="deprecates">
1696
- <oneOrMore>
1697
- <ref name="TextElement"/>
1698
- </oneOrMore>
1938
+ <define name="expression_designation">
1939
+ <element name="expression">
1940
+ <optional>
1941
+ <attribute name="language">
1942
+ <a:documentation>ISO-639</a:documentation>
1943
+ </attribute>
1944
+ </optional>
1945
+ <optional>
1946
+ <attribute name="script">
1947
+ <a:documentation>ISO-15924</a:documentation>
1948
+ </attribute>
1949
+ </optional>
1950
+ <optional>
1951
+ <attribute name="type">
1952
+ <ref name="ExpressionDesignationType"/>
1953
+ </attribute>
1954
+ </optional>
1955
+ <optional>
1956
+ <attribute name="isInternational">
1957
+ <data type="boolean"/>
1958
+ </attribute>
1959
+ </optional>
1960
+ <element name="name">
1961
+ <zeroOrMore>
1962
+ <ref name="PureTextElement"/>
1963
+ </zeroOrMore>
1964
+ </element>
1965
+ <optional>
1966
+ <element name="abbreviation-type">
1967
+ <ref name="AbbreviationType"/>
1968
+ </element>
1969
+ </optional>
1970
+ <optional>
1971
+ <element name="pronunciation">
1972
+ <ref name="LocalizedString"/>
1973
+ </element>
1974
+ </optional>
1975
+ <optional>
1976
+ <element name="grammar-info">
1977
+ <ref name="Grammar"/>
1978
+ </element>
1979
+ </optional>
1699
1980
  </element>
1700
1981
  </define>
1982
+ <define name="ExpressionDesignationType">
1983
+ <choice>
1984
+ <value>prefix</value>
1985
+ <value>suffix</value>
1986
+ <value>abbreviation</value>
1987
+ <value>full</value>
1988
+ </choice>
1989
+ </define>
1990
+ <define name="AbbreviationType">
1991
+ <choice>
1992
+ <value>truncation</value>
1993
+ <value>acronym</value>
1994
+ <value>initialism</value>
1995
+ </choice>
1996
+ </define>
1997
+ <define name="Grammar">
1998
+ <zeroOrMore>
1999
+ <element name="gender">
2000
+ <ref name="GrammarGender"/>
2001
+ </element>
2002
+ </zeroOrMore>
2003
+ <zeroOrMore>
2004
+ <element name="number">
2005
+ <ref name="GrammarNumber"/>
2006
+ </element>
2007
+ </zeroOrMore>
2008
+ <optional>
2009
+ <element name="isPreposition">
2010
+ <data type="boolean"/>
2011
+ </element>
2012
+ </optional>
2013
+ <optional>
2014
+ <element name="isParticiple">
2015
+ <data type="boolean"/>
2016
+ </element>
2017
+ </optional>
2018
+ <optional>
2019
+ <element name="isAdjective">
2020
+ <data type="boolean"/>
2021
+ </element>
2022
+ </optional>
2023
+ <optional>
2024
+ <element name="isVerb">
2025
+ <data type="boolean"/>
2026
+ </element>
2027
+ </optional>
2028
+ <optional>
2029
+ <element name="isAdverb">
2030
+ <data type="boolean"/>
2031
+ </element>
2032
+ </optional>
2033
+ <optional>
2034
+ <element name="isNoun">
2035
+ <data type="boolean"/>
2036
+ </element>
2037
+ </optional>
2038
+ <zeroOrMore>
2039
+ <element name="grammar-value">
2040
+ <text/>
2041
+ </element>
2042
+ </zeroOrMore>
2043
+ </define>
2044
+ <define name="GrammarGender">
2045
+ <choice>
2046
+ <value>masculine</value>
2047
+ <value>feminine</value>
2048
+ <value>neuter</value>
2049
+ <value>common</value>
2050
+ </choice>
2051
+ </define>
2052
+ <define name="GrammarNumber">
2053
+ <choice>
2054
+ <value>singular</value>
2055
+ <value>dual</value>
2056
+ <value>plural</value>
2057
+ </choice>
2058
+ </define>
1701
2059
  <define name="termdomain">
1702
2060
  <element name="domain">
1703
2061
  <oneOrMore>
@@ -1705,22 +2063,55 @@
1705
2063
  </oneOrMore>
1706
2064
  </element>
1707
2065
  </define>
1708
- <define name="termgrammar">
1709
- <element name="grammar">
2066
+ <define name="termsubject">
2067
+ <element name="subject">
1710
2068
  <oneOrMore>
1711
2069
  <ref name="TextElement"/>
1712
2070
  </oneOrMore>
1713
2071
  </element>
1714
2072
  </define>
1715
- <define name="definition">
2073
+ <define name="termdefinition">
1716
2074
  <element name="definition">
2075
+ <choice>
2076
+ <ref name="verbaldefinition"/>
2077
+ <ref name="nonverbalrep"/>
2078
+ <group>
2079
+ <ref name="verbaldefinition"/>
2080
+ <ref name="nonverbalrep"/>
2081
+ </group>
2082
+ </choice>
2083
+ </element>
2084
+ </define>
2085
+ <define name="verbaldefinition">
2086
+ <element name="verbal-definition">
1717
2087
  <oneOrMore>
1718
2088
  <choice>
1719
2089
  <ref name="paragraph"/>
2090
+ <ref name="dl"/>
2091
+ <ref name="ol"/>
2092
+ <ref name="ul"/>
2093
+ <ref name="table"/>
1720
2094
  <ref name="figure"/>
1721
2095
  <ref name="formula"/>
1722
2096
  </choice>
1723
2097
  </oneOrMore>
2098
+ <zeroOrMore>
2099
+ <ref name="termsource"/>
2100
+ </zeroOrMore>
2101
+ </element>
2102
+ </define>
2103
+ <define name="nonverbalrep">
2104
+ <element name="non-verbal-representation">
2105
+ <oneOrMore>
2106
+ <choice>
2107
+ <ref name="table"/>
2108
+ <ref name="figure"/>
2109
+ <ref name="formula"/>
2110
+ </choice>
2111
+ </oneOrMore>
2112
+ <zeroOrMore>
2113
+ <ref name="termsource"/>
2114
+ </zeroOrMore>
1724
2115
  </element>
1725
2116
  </define>
1726
2117
  <define name="termnote">
@@ -1749,6 +2140,14 @@
1749
2140
  <data type="boolean"/>
1750
2141
  </attribute>
1751
2142
  </optional>
2143
+ <optional>
2144
+ <attribute name="tag"/>
2145
+ </optional>
2146
+ <optional>
2147
+ <attribute name="multilingual-rendering">
2148
+ <ref name="MultilingualRenderingType"/>
2149
+ </attribute>
2150
+ </optional>
1752
2151
  <oneOrMore>
1753
2152
  <choice>
1754
2153
  <ref name="paragraph"/>
@@ -1765,6 +2164,24 @@
1765
2164
  <attribute name="id">
1766
2165
  <data type="ID"/>
1767
2166
  </attribute>
2167
+ <optional>
2168
+ <attribute name="keep-with-next">
2169
+ <data type="boolean"/>
2170
+ </attribute>
2171
+ </optional>
2172
+ <optional>
2173
+ <attribute name="keep-lines-together">
2174
+ <data type="boolean"/>
2175
+ </attribute>
2176
+ </optional>
2177
+ <optional>
2178
+ <attribute name="tag"/>
2179
+ </optional>
2180
+ <optional>
2181
+ <attribute name="multilingual-rendering">
2182
+ <ref name="MultilingualRenderingType"/>
2183
+ </attribute>
2184
+ </optional>
1768
2185
  <ref name="paragraph"/>
1769
2186
  </element>
1770
2187
  </define>
@@ -1776,6 +2193,12 @@
1776
2193
  <value>modified</value>
1777
2194
  </choice>
1778
2195
  </attribute>
2196
+ <attribute name="type">
2197
+ <choice>
2198
+ <value>authoritative</value>
2199
+ <value>lineage</value>
2200
+ </choice>
2201
+ </attribute>
1779
2202
  <ref name="origin"/>
1780
2203
  <optional>
1781
2204
  <ref name="modification"/>
@@ -1891,9 +2314,6 @@
1891
2314
  <zeroOrMore>
1892
2315
  <ref name="BasicBlock"/>
1893
2316
  </zeroOrMore>
1894
- <zeroOrMore>
1895
- <ref name="note"/>
1896
- </zeroOrMore>
1897
2317
  <zeroOrMore>
1898
2318
  <choice>
1899
2319
  <ref name="term-clause"/>
@@ -1932,6 +2352,14 @@
1932
2352
  <optional>
1933
2353
  <attribute name="title"/>
1934
2354
  </optional>
2355
+ <optional>
2356
+ <attribute name="tag"/>
2357
+ </optional>
2358
+ <optional>
2359
+ <attribute name="multilingual-rendering">
2360
+ <ref name="MultilingualRenderingType"/>
2361
+ </attribute>
2362
+ </optional>
1935
2363
  <optional>
1936
2364
  <element name="location">
1937
2365
  <zeroOrMore>
@@ -1991,6 +2419,14 @@
1991
2419
  </define>
1992
2420
  <define name="imagemap">
1993
2421
  <element name="imagemap">
2422
+ <optional>
2423
+ <attribute name="tag"/>
2424
+ </optional>
2425
+ <optional>
2426
+ <attribute name="multilingual-rendering">
2427
+ <ref name="MultilingualRenderingType"/>
2428
+ </attribute>
2429
+ </optional>
1994
2430
  <ref name="figure"/>
1995
2431
  <zeroOrMore>
1996
2432
  <element name="area">
@@ -2035,6 +2471,14 @@
2035
2471
  </define>
2036
2472
  <define name="svgmap">
2037
2473
  <element name="svgmap">
2474
+ <optional>
2475
+ <attribute name="tag"/>
2476
+ </optional>
2477
+ <optional>
2478
+ <attribute name="multilingual-rendering">
2479
+ <ref name="MultilingualRenderingType"/>
2480
+ </attribute>
2481
+ </optional>
2038
2482
  <ref name="figure"/>
2039
2483
  <zeroOrMore>
2040
2484
  <element name="target">