metanorma-generic 1.10.1 → 1.11.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (14) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/rake.yml +1 -1
  3. data/lib/asciidoctor/generic/basicdoc.rng +21 -4
  4. data/lib/asciidoctor/generic/converter.rb +24 -20
  5. data/lib/asciidoctor/generic/isodoc.rng +518 -93
  6. data/lib/asciidoctor/generic/reqt.rng +38 -6
  7. data/lib/isodoc/generic/html/htmlstyle.scss +8 -0
  8. data/lib/isodoc/generic.rb +0 -1
  9. data/lib/metanorma/generic/processor.rb +0 -3
  10. data/lib/metanorma/generic/version.rb +1 -1
  11. data/lib/metanorma/generic.rb +21 -17
  12. data/metanorma-generic.gemspec +1 -2
  13. metadata +5 -20
  14. 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">
@@ -50,7 +62,9 @@
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>
@@ -955,7 +1092,44 @@
955
1092
  <define name="concept">
956
1093
  <element name="concept">
957
1094
  <optional>
958
- <attribute name="term"/>
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>
1114
+ <optional>
1115
+ <element name="refterm">
1116
+ <zeroOrMore>
1117
+ <choice>
1118
+ <ref name="PureTextElement"/>
1119
+ <ref name="stem"/>
1120
+ </choice>
1121
+ </zeroOrMore>
1122
+ </element>
1123
+ </optional>
1124
+ <optional>
1125
+ <element name="renderterm">
1126
+ <zeroOrMore>
1127
+ <choice>
1128
+ <ref name="PureTextElement"/>
1129
+ <ref name="stem"/>
1130
+ </choice>
1131
+ </zeroOrMore>
1132
+ </element>
959
1133
  </optional>
960
1134
  <choice>
961
1135
  <ref name="eref"/>
@@ -972,8 +1146,23 @@
972
1146
  <ref name="imagemap"/>
973
1147
  <ref name="svgmap"/>
974
1148
  <ref name="inputform"/>
1149
+ <ref name="toc"/>
1150
+ <ref name="passthrough"/>
975
1151
  </choice>
976
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>
977
1166
  <define name="inputform">
978
1167
  <element name="form">
979
1168
  <attribute name="id">
@@ -981,6 +1170,17 @@
981
1170
  </attribute>
982
1171
  <attribute name="name"/>
983
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>
984
1184
  <zeroOrMore>
985
1185
  <choice>
986
1186
  <ref name="TextElement"/>
@@ -1180,9 +1380,6 @@
1180
1380
  <zeroOrMore>
1181
1381
  <ref name="BasicBlock"/>
1182
1382
  </zeroOrMore>
1183
- <zeroOrMore>
1184
- <ref name="note"/>
1185
- </zeroOrMore>
1186
1383
  <choice>
1187
1384
  <oneOrMore>
1188
1385
  <ref name="reference-clause"/>
@@ -1212,6 +1409,12 @@
1212
1409
  <optional>
1213
1410
  <attribute name="type"/>
1214
1411
  </optional>
1412
+ <optional>
1413
+ <attribute name="identifier"/>
1414
+ </optional>
1415
+ <optional>
1416
+ <attribute name="prefix"/>
1417
+ </optional>
1215
1418
  <text/>
1216
1419
  </define>
1217
1420
  <define name="ics">
@@ -1359,9 +1562,6 @@
1359
1562
  <zeroOrMore>
1360
1563
  <ref name="BasicBlock"/>
1361
1564
  </zeroOrMore>
1362
- <zeroOrMore>
1363
- <ref name="note"/>
1364
- </zeroOrMore>
1365
1565
  <ref name="dl"/>
1366
1566
  </oneOrMore>
1367
1567
  </element>
@@ -1421,14 +1621,9 @@
1421
1621
  <ref name="section-title"/>
1422
1622
  </optional>
1423
1623
  <group>
1424
- <group>
1425
- <zeroOrMore>
1426
- <ref name="BasicBlock"/>
1427
- </zeroOrMore>
1428
- <zeroOrMore>
1429
- <ref name="note"/>
1430
- </zeroOrMore>
1431
- </group>
1624
+ <zeroOrMore>
1625
+ <ref name="BasicBlock"/>
1626
+ </zeroOrMore>
1432
1627
  <zeroOrMore>
1433
1628
  <ref name="content-subsection"/>
1434
1629
  </zeroOrMore>
@@ -1473,26 +1668,21 @@
1473
1668
  <optional>
1474
1669
  <ref name="section-title"/>
1475
1670
  </optional>
1476
- <group>
1671
+ <choice>
1477
1672
  <choice>
1478
- <group>
1479
- <zeroOrMore>
1480
- <ref name="BasicBlock"/>
1481
- </zeroOrMore>
1482
- <zeroOrMore>
1483
- <ref name="note"/>
1484
- </zeroOrMore>
1485
- </group>
1673
+ <oneOrMore>
1674
+ <ref name="BasicBlock"/>
1675
+ </oneOrMore>
1486
1676
  <ref name="amend"/>
1487
1677
  </choice>
1488
- <zeroOrMore>
1678
+ <oneOrMore>
1489
1679
  <choice>
1490
1680
  <ref name="clause-subsection"/>
1491
1681
  <ref name="terms"/>
1492
1682
  <ref name="definitions"/>
1493
1683
  </choice>
1494
- </zeroOrMore>
1495
- </group>
1684
+ </oneOrMore>
1685
+ </choice>
1496
1686
  </define>
1497
1687
  <define name="Annex-Section">
1498
1688
  <optional>
@@ -1523,14 +1713,9 @@
1523
1713
  <ref name="section-title"/>
1524
1714
  </optional>
1525
1715
  <group>
1526
- <group>
1527
- <zeroOrMore>
1528
- <ref name="BasicBlock"/>
1529
- </zeroOrMore>
1530
- <zeroOrMore>
1531
- <ref name="note"/>
1532
- </zeroOrMore>
1533
- </group>
1716
+ <zeroOrMore>
1717
+ <ref name="BasicBlock"/>
1718
+ </zeroOrMore>
1534
1719
  <zeroOrMore>
1535
1720
  <choice>
1536
1721
  <ref name="annex-subsection"/>
@@ -1589,9 +1774,6 @@
1589
1774
  <zeroOrMore>
1590
1775
  <ref name="BasicBlock"/>
1591
1776
  </zeroOrMore>
1592
- <zeroOrMore>
1593
- <ref name="note"/>
1594
- </zeroOrMore>
1595
1777
  <choice>
1596
1778
  <oneOrMore>
1597
1779
  <ref name="term"/>
@@ -1621,18 +1803,23 @@
1621
1803
  <ref name="admitted"/>
1622
1804
  </zeroOrMore>
1623
1805
  <zeroOrMore>
1624
- <ref name="related"/>
1806
+ <ref name="deprecates"/>
1625
1807
  </zeroOrMore>
1626
1808
  <zeroOrMore>
1627
- <ref name="deprecates"/>
1809
+ <ref name="related"/>
1628
1810
  </zeroOrMore>
1629
1811
  <optional>
1630
1812
  <ref name="termdomain"/>
1631
1813
  </optional>
1632
- <zeroOrMore>
1633
- <ref name="termgrammar"/>
1634
- </zeroOrMore>
1635
- <ref name="definition"/>
1814
+ <optional>
1815
+ <ref name="termsubject"/>
1816
+ </optional>
1817
+ <optional>
1818
+ <ref name="termusage"/>
1819
+ </optional>
1820
+ <oneOrMore>
1821
+ <ref name="termdefinition"/>
1822
+ </oneOrMore>
1636
1823
  <zeroOrMore>
1637
1824
  <ref name="termnote"/>
1638
1825
  </zeroOrMore>
@@ -1646,64 +1833,255 @@
1646
1833
  </define>
1647
1834
  <define name="preferred">
1648
1835
  <element name="preferred">
1649
- <oneOrMore>
1650
- <ref name="TextElement"/>
1651
- </oneOrMore>
1836
+ <ref name="Designation"/>
1652
1837
  </element>
1653
1838
  </define>
1654
1839
  <define name="admitted">
1655
1840
  <element name="admitted">
1656
- <oneOrMore>
1657
- <ref name="TextElement"/>
1658
- </oneOrMore>
1841
+ <ref name="Designation"/>
1659
1842
  </element>
1660
1843
  </define>
1661
1844
  <define name="related">
1662
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
+ <ref name="graphical_symbol_designation"/>
1889
+ </choice>
1890
+ <zeroOrMore>
1891
+ <ref name="termsource"/>
1892
+ </zeroOrMore>
1893
+ </define>
1894
+ <define name="letter_symbol_designation">
1895
+ <element name="letter-symbol">
1663
1896
  <optional>
1664
- <attribute name="type">
1897
+ <attribute name="isInternational">
1898
+ <data type="boolean"/>
1899
+ </attribute>
1900
+ </optional>
1901
+ <element name="name">
1902
+ <oneOrMore>
1665
1903
  <choice>
1666
- <value>compare</value>
1667
- <value>contrast</value>
1668
- <value>see</value>
1904
+ <ref name="PureTextElement"/>
1905
+ <ref name="stem"/>
1669
1906
  </choice>
1907
+ </oneOrMore>
1908
+ </element>
1909
+ </element>
1910
+ </define>
1911
+ <define name="graphical_symbol_designation">
1912
+ <element name="graphical-symbol">
1913
+ <optional>
1914
+ <attribute name="isInternational">
1915
+ <data type="boolean"/>
1916
+ </attribute>
1917
+ </optional>
1918
+ <ref name="figure"/>
1919
+ </element>
1920
+ </define>
1921
+ <define name="expression_designation">
1922
+ <element name="expression">
1923
+ <optional>
1924
+ <attribute name="language">
1925
+ <a:documentation>ISO-639</a:documentation>
1670
1926
  </attribute>
1671
1927
  </optional>
1928
+ <optional>
1929
+ <attribute name="script">
1930
+ <a:documentation>ISO-15924</a:documentation>
1931
+ </attribute>
1932
+ </optional>
1933
+ <optional>
1934
+ <attribute name="type">
1935
+ <ref name="ExpressionDesignationType"/>
1936
+ </attribute>
1937
+ </optional>
1938
+ <optional>
1939
+ <attribute name="isInternational">
1940
+ <data type="boolean"/>
1941
+ </attribute>
1942
+ </optional>
1943
+ <element name="name">
1944
+ <zeroOrMore>
1945
+ <ref name="PureTextElement"/>
1946
+ </zeroOrMore>
1947
+ </element>
1948
+ <optional>
1949
+ <element name="abbreviationType">
1950
+ <ref name="AbbreviationType"/>
1951
+ </element>
1952
+ </optional>
1953
+ <optional>
1954
+ <element name="pronunciation">
1955
+ <ref name="LocalizedString"/>
1956
+ </element>
1957
+ </optional>
1958
+ <optional>
1959
+ <element name="grammarInfo">
1960
+ <ref name="Grammar"/>
1961
+ </element>
1962
+ </optional>
1963
+ </element>
1964
+ </define>
1965
+ <define name="ExpressionDesignationType">
1966
+ <choice>
1967
+ <value>prefix</value>
1968
+ <value>suffix</value>
1969
+ <value>abbreviation</value>
1970
+ <value>full</value>
1971
+ </choice>
1972
+ </define>
1973
+ <define name="AbbreviationType">
1974
+ <choice>
1975
+ <value>truncation</value>
1976
+ <value>acronym</value>
1977
+ <value>initialism</value>
1978
+ </choice>
1979
+ </define>
1980
+ <define name="Grammar">
1981
+ <zeroOrMore>
1982
+ <element name="gender">
1983
+ <ref name="GrammarGender"/>
1984
+ </element>
1985
+ </zeroOrMore>
1986
+ <optional>
1987
+ <element name="isPreposition">
1988
+ <data type="boolean"/>
1989
+ </element>
1990
+ </optional>
1991
+ <optional>
1992
+ <element name="isParticiple">
1993
+ <data type="boolean"/>
1994
+ </element>
1995
+ </optional>
1996
+ <optional>
1997
+ <element name="isAdjective">
1998
+ <data type="boolean"/>
1999
+ </element>
2000
+ </optional>
2001
+ <optional>
2002
+ <element name="isVerb">
2003
+ <data type="boolean"/>
2004
+ </element>
2005
+ </optional>
2006
+ <optional>
2007
+ <element name="isAdverb">
2008
+ <data type="boolean"/>
2009
+ </element>
2010
+ </optional>
2011
+ <optional>
2012
+ <element name="isNoun">
2013
+ <data type="boolean"/>
2014
+ </element>
2015
+ </optional>
2016
+ <zeroOrMore>
2017
+ <element name="grammarvalue">
2018
+ <text/>
2019
+ </element>
2020
+ </zeroOrMore>
2021
+ </define>
2022
+ <define name="GrammarGender">
2023
+ <choice>
2024
+ <value>masculine</value>
2025
+ <value>feminine</value>
2026
+ <value>neuter</value>
2027
+ <value>common</value>
2028
+ </choice>
2029
+ </define>
2030
+ <define name="termdomain">
2031
+ <element name="domain">
1672
2032
  <oneOrMore>
1673
2033
  <ref name="TextElement"/>
1674
2034
  </oneOrMore>
1675
2035
  </element>
1676
2036
  </define>
1677
- <define name="deprecates">
1678
- <element name="deprecates">
2037
+ <define name="termsubject">
2038
+ <element name="subject">
1679
2039
  <oneOrMore>
1680
2040
  <ref name="TextElement"/>
1681
2041
  </oneOrMore>
1682
2042
  </element>
1683
2043
  </define>
1684
- <define name="termdomain">
1685
- <element name="domain">
2044
+ <define name="termusage">
2045
+ <element name="usageinfo">
1686
2046
  <oneOrMore>
1687
- <ref name="TextElement"/>
2047
+ <ref name="BasicBlock"/>
1688
2048
  </oneOrMore>
1689
2049
  </element>
1690
2050
  </define>
1691
- <define name="termgrammar">
1692
- <element name="grammar">
2051
+ <define name="termdefinition">
2052
+ <element name="definition">
2053
+ <choice>
2054
+ <ref name="verbaldefinition"/>
2055
+ <ref name="nonverbalrep"/>
2056
+ <group>
2057
+ <ref name="verbaldefinition"/>
2058
+ <ref name="nonverbalrep"/>
2059
+ </group>
2060
+ </choice>
2061
+ </element>
2062
+ </define>
2063
+ <define name="verbaldefinition">
2064
+ <element name="verbaldefinition">
1693
2065
  <oneOrMore>
1694
- <ref name="TextElement"/>
2066
+ <ref name="paragraph"/>
1695
2067
  </oneOrMore>
2068
+ <zeroOrMore>
2069
+ <ref name="termsource"/>
2070
+ </zeroOrMore>
1696
2071
  </element>
1697
2072
  </define>
1698
- <define name="definition">
1699
- <element name="definition">
2073
+ <define name="nonverbalrep">
2074
+ <element name="nonverbalrepresentation">
1700
2075
  <oneOrMore>
1701
2076
  <choice>
1702
- <ref name="paragraph"/>
2077
+ <ref name="table"/>
1703
2078
  <ref name="figure"/>
1704
2079
  <ref name="formula"/>
1705
2080
  </choice>
1706
2081
  </oneOrMore>
2082
+ <zeroOrMore>
2083
+ <ref name="termsource"/>
2084
+ </zeroOrMore>
1707
2085
  </element>
1708
2086
  </define>
1709
2087
  <define name="termnote">
@@ -1732,6 +2110,14 @@
1732
2110
  <data type="boolean"/>
1733
2111
  </attribute>
1734
2112
  </optional>
2113
+ <optional>
2114
+ <attribute name="tag"/>
2115
+ </optional>
2116
+ <optional>
2117
+ <attribute name="multilingual-rendering">
2118
+ <ref name="MultilingualRenderingType"/>
2119
+ </attribute>
2120
+ </optional>
1735
2121
  <oneOrMore>
1736
2122
  <choice>
1737
2123
  <ref name="paragraph"/>
@@ -1748,6 +2134,24 @@
1748
2134
  <attribute name="id">
1749
2135
  <data type="ID"/>
1750
2136
  </attribute>
2137
+ <optional>
2138
+ <attribute name="keep-with-next">
2139
+ <data type="boolean"/>
2140
+ </attribute>
2141
+ </optional>
2142
+ <optional>
2143
+ <attribute name="keep-lines-together">
2144
+ <data type="boolean"/>
2145
+ </attribute>
2146
+ </optional>
2147
+ <optional>
2148
+ <attribute name="tag"/>
2149
+ </optional>
2150
+ <optional>
2151
+ <attribute name="multilingual-rendering">
2152
+ <ref name="MultilingualRenderingType"/>
2153
+ </attribute>
2154
+ </optional>
1751
2155
  <ref name="paragraph"/>
1752
2156
  </element>
1753
2157
  </define>
@@ -1874,9 +2278,6 @@
1874
2278
  <zeroOrMore>
1875
2279
  <ref name="BasicBlock"/>
1876
2280
  </zeroOrMore>
1877
- <zeroOrMore>
1878
- <ref name="note"/>
1879
- </zeroOrMore>
1880
2281
  <zeroOrMore>
1881
2282
  <choice>
1882
2283
  <ref name="term-clause"/>
@@ -1915,6 +2316,14 @@
1915
2316
  <optional>
1916
2317
  <attribute name="title"/>
1917
2318
  </optional>
2319
+ <optional>
2320
+ <attribute name="tag"/>
2321
+ </optional>
2322
+ <optional>
2323
+ <attribute name="multilingual-rendering">
2324
+ <ref name="MultilingualRenderingType"/>
2325
+ </attribute>
2326
+ </optional>
1918
2327
  <optional>
1919
2328
  <element name="location">
1920
2329
  <zeroOrMore>
@@ -1974,6 +2383,14 @@
1974
2383
  </define>
1975
2384
  <define name="imagemap">
1976
2385
  <element name="imagemap">
2386
+ <optional>
2387
+ <attribute name="tag"/>
2388
+ </optional>
2389
+ <optional>
2390
+ <attribute name="multilingual-rendering">
2391
+ <ref name="MultilingualRenderingType"/>
2392
+ </attribute>
2393
+ </optional>
1977
2394
  <ref name="figure"/>
1978
2395
  <zeroOrMore>
1979
2396
  <element name="area">
@@ -2018,6 +2435,14 @@
2018
2435
  </define>
2019
2436
  <define name="svgmap">
2020
2437
  <element name="svgmap">
2438
+ <optional>
2439
+ <attribute name="tag"/>
2440
+ </optional>
2441
+ <optional>
2442
+ <attribute name="multilingual-rendering">
2443
+ <ref name="MultilingualRenderingType"/>
2444
+ </attribute>
2445
+ </optional>
2021
2446
  <ref name="figure"/>
2022
2447
  <zeroOrMore>
2023
2448
  <element name="target">