metanorma-ogc 1.4.1 → 1.4.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (37) hide show
  1. checksums.yaml +4 -4
  2. data/lib/asciidoctor/ogc/basicdoc.rng +21 -4
  3. data/lib/asciidoctor/ogc/cleanup.rb +173 -0
  4. data/lib/asciidoctor/ogc/converter.rb +19 -76
  5. data/lib/asciidoctor/ogc/isodoc.rng +218 -52
  6. data/lib/asciidoctor/ogc/reqt.rng +23 -2
  7. data/lib/asciidoctor/ogc/validate.rb +35 -20
  8. data/lib/isodoc/ogc/base_convert.rb +47 -10
  9. data/lib/isodoc/ogc/html/htmlstyle.css +10 -0
  10. data/lib/isodoc/ogc/html/htmlstyle.scss +12 -0
  11. data/lib/isodoc/ogc/html/ogc.css +4 -0
  12. data/lib/isodoc/ogc/html/ogc.scss +4 -0
  13. data/lib/isodoc/ogc/html/wordstyle.css +12 -1
  14. data/lib/isodoc/ogc/html/wordstyle.scss +12 -1
  15. data/lib/isodoc/ogc/html/wordstyle_wp.css +12 -1
  16. data/lib/isodoc/ogc/html/wordstyle_wp.scss +12 -1
  17. data/lib/isodoc/ogc/i18n-en.yaml +10 -8
  18. data/lib/isodoc/ogc/ogc.abstract-specification-topic.xsl +268 -33
  19. data/lib/isodoc/ogc/ogc.best-practice.xsl +268 -33
  20. data/lib/isodoc/ogc/ogc.change-request-supporting-document.xsl +268 -33
  21. data/lib/isodoc/ogc/ogc.community-practice.xsl +268 -33
  22. data/lib/isodoc/ogc/ogc.community-standard.xsl +268 -33
  23. data/lib/isodoc/ogc/ogc.discussion-paper.xsl +268 -33
  24. data/lib/isodoc/ogc/ogc.engineering-report.xsl +268 -33
  25. data/lib/isodoc/ogc/ogc.other.xsl +268 -33
  26. data/lib/isodoc/ogc/ogc.policy.xsl +268 -33
  27. data/lib/isodoc/ogc/ogc.reference-model.xsl +268 -33
  28. data/lib/isodoc/ogc/ogc.release-notes.xsl +268 -33
  29. data/lib/isodoc/ogc/ogc.standard.xsl +268 -33
  30. data/lib/isodoc/ogc/ogc.test-suite.xsl +268 -33
  31. data/lib/isodoc/ogc/ogc.user-guide.xsl +268 -33
  32. data/lib/isodoc/ogc/ogc.white-paper.xsl +167 -10
  33. data/lib/isodoc/ogc/presentation_xml_convert.rb +6 -3
  34. data/lib/isodoc/ogc/reqt.rb +49 -36
  35. data/lib/isodoc/ogc/xref.rb +1 -2
  36. data/lib/metanorma/ogc/version.rb +1 -1
  37. metadata +3 -2
data/lib/asciidoctor/ogc/isodoc.rng CHANGED
@@ -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"/>
@@ -990,6 +1101,16 @@
990
1101
  <data type="boolean"/>
991
1102
  </attribute>
992
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>
993
1114
  <optional>
994
1115
  <element name="refterm">
995
1116
  <zeroOrMore>
@@ -1026,6 +1147,7 @@
1026
1147
  <ref name="svgmap"/>
1027
1148
  <ref name="inputform"/>
1028
1149
  <ref name="toc"/>
1150
+ <ref name="passthrough"/>
1029
1151
  </choice>
1030
1152
  </define>
1031
1153
  <define name="toc">
@@ -1033,6 +1155,14 @@
1033
1155
  <ref name="ul"/>
1034
1156
  </element>
1035
1157
  </define>
1158
+ <define name="passthrough">
1159
+ <element name="passthrough">
1160
+ <optional>
1161
+ <attribute name="formats"/>
1162
+ </optional>
1163
+ <text/>
1164
+ </element>
1165
+ </define>
1036
1166
  <define name="inputform">
1037
1167
  <element name="form">
1038
1168
  <attribute name="id">
@@ -1043,6 +1173,14 @@
1043
1173
  <optional>
1044
1174
  <attribute name="class"/>
1045
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>
1046
1184
  <zeroOrMore>
1047
1185
  <choice>
1048
1186
  <ref name="TextElement"/>
@@ -1242,9 +1380,6 @@
1242
1380
  <zeroOrMore>
1243
1381
  <ref name="BasicBlock"/>
1244
1382
  </zeroOrMore>
1245
- <zeroOrMore>
1246
- <ref name="note"/>
1247
- </zeroOrMore>
1248
1383
  <choice>
1249
1384
  <oneOrMore>
1250
1385
  <ref name="reference-clause"/>
@@ -1427,9 +1562,6 @@
1427
1562
  <zeroOrMore>
1428
1563
  <ref name="BasicBlock"/>
1429
1564
  </zeroOrMore>
1430
- <zeroOrMore>
1431
- <ref name="note"/>
1432
- </zeroOrMore>
1433
1565
  <ref name="dl"/>
1434
1566
  </oneOrMore>
1435
1567
  </element>
@@ -1489,14 +1621,9 @@
1489
1621
  <ref name="section-title"/>
1490
1622
  </optional>
1491
1623
  <group>
1492
- <group>
1493
- <zeroOrMore>
1494
- <ref name="BasicBlock"/>
1495
- </zeroOrMore>
1496
- <zeroOrMore>
1497
- <ref name="note"/>
1498
- </zeroOrMore>
1499
- </group>
1624
+ <zeroOrMore>
1625
+ <ref name="BasicBlock"/>
1626
+ </zeroOrMore>
1500
1627
  <zeroOrMore>
1501
1628
  <ref name="content-subsection"/>
1502
1629
  </zeroOrMore>
@@ -1543,14 +1670,9 @@
1543
1670
  </optional>
1544
1671
  <choice>
1545
1672
  <choice>
1546
- <group>
1547
- <oneOrMore>
1548
- <ref name="BasicBlock"/>
1549
- </oneOrMore>
1550
- <zeroOrMore>
1551
- <ref name="note"/>
1552
- </zeroOrMore>
1553
- </group>
1673
+ <oneOrMore>
1674
+ <ref name="BasicBlock"/>
1675
+ </oneOrMore>
1554
1676
  <ref name="amend"/>
1555
1677
  </choice>
1556
1678
  <oneOrMore>
@@ -1591,14 +1713,9 @@
1591
1713
  <ref name="section-title"/>
1592
1714
  </optional>
1593
1715
  <group>
1594
- <group>
1595
- <zeroOrMore>
1596
- <ref name="BasicBlock"/>
1597
- </zeroOrMore>
1598
- <zeroOrMore>
1599
- <ref name="note"/>
1600
- </zeroOrMore>
1601
- </group>
1716
+ <zeroOrMore>
1717
+ <ref name="BasicBlock"/>
1718
+ </zeroOrMore>
1602
1719
  <zeroOrMore>
1603
1720
  <choice>
1604
1721
  <ref name="annex-subsection"/>
@@ -1657,9 +1774,6 @@
1657
1774
  <zeroOrMore>
1658
1775
  <ref name="BasicBlock"/>
1659
1776
  </zeroOrMore>
1660
- <zeroOrMore>
1661
- <ref name="note"/>
1662
- </zeroOrMore>
1663
1777
  <choice>
1664
1778
  <oneOrMore>
1665
1779
  <ref name="term"/>
@@ -1700,7 +1814,9 @@
1700
1814
  <zeroOrMore>
1701
1815
  <ref name="termgrammar"/>
1702
1816
  </zeroOrMore>
1703
- <ref name="definition"/>
1817
+ <oneOrMore>
1818
+ <ref name="termdefinition"/>
1819
+ </oneOrMore>
1704
1820
  <zeroOrMore>
1705
1821
  <ref name="termnote"/>
1706
1822
  </zeroOrMore>
@@ -1763,7 +1879,7 @@
1763
1879
  </oneOrMore>
1764
1880
  </element>
1765
1881
  </define>
1766
- <define name="definition">
1882
+ <define name="termdefinition">
1767
1883
  <element name="definition">
1768
1884
  <oneOrMore>
1769
1885
  <choice>
@@ -1772,6 +1888,9 @@
1772
1888
  <ref name="formula"/>
1773
1889
  </choice>
1774
1890
  </oneOrMore>
1891
+ <zeroOrMore>
1892
+ <ref name="termsource"/>
1893
+ </zeroOrMore>
1775
1894
  </element>
1776
1895
  </define>
1777
1896
  <define name="termnote">
@@ -1800,6 +1919,14 @@
1800
1919
  <data type="boolean"/>
1801
1920
  </attribute>
1802
1921
  </optional>
1922
+ <optional>
1923
+ <attribute name="tag"/>
1924
+ </optional>
1925
+ <optional>
1926
+ <attribute name="multilingual-rendering">
1927
+ <ref name="MultilingualRenderingType"/>
1928
+ </attribute>
1929
+ </optional>
1803
1930
  <oneOrMore>
1804
1931
  <choice>
1805
1932
  <ref name="paragraph"/>
@@ -1816,6 +1943,24 @@
1816
1943
  <attribute name="id">
1817
1944
  <data type="ID"/>
1818
1945
  </attribute>
1946
+ <optional>
1947
+ <attribute name="keep-with-next">
1948
+ <data type="boolean"/>
1949
+ </attribute>
1950
+ </optional>
1951
+ <optional>
1952
+ <attribute name="keep-lines-together">
1953
+ <data type="boolean"/>
1954
+ </attribute>
1955
+ </optional>
1956
+ <optional>
1957
+ <attribute name="tag"/>
1958
+ </optional>
1959
+ <optional>
1960
+ <attribute name="multilingual-rendering">
1961
+ <ref name="MultilingualRenderingType"/>
1962
+ </attribute>
1963
+ </optional>
1819
1964
  <ref name="paragraph"/>
1820
1965
  </element>
1821
1966
  </define>
@@ -1942,9 +2087,6 @@
1942
2087
  <zeroOrMore>
1943
2088
  <ref name="BasicBlock"/>
1944
2089
  </zeroOrMore>
1945
- <zeroOrMore>
1946
- <ref name="note"/>
1947
- </zeroOrMore>
1948
2090
  <zeroOrMore>
1949
2091
  <choice>
1950
2092
  <ref name="term-clause"/>
@@ -1983,6 +2125,14 @@
1983
2125
  <optional>
1984
2126
  <attribute name="title"/>
1985
2127
  </optional>
2128
+ <optional>
2129
+ <attribute name="tag"/>
2130
+ </optional>
2131
+ <optional>
2132
+ <attribute name="multilingual-rendering">
2133
+ <ref name="MultilingualRenderingType"/>
2134
+ </attribute>
2135
+ </optional>
1986
2136
  <optional>
1987
2137
  <element name="location">
1988
2138
  <zeroOrMore>
@@ -2042,6 +2192,14 @@
2042
2192
  </define>
2043
2193
  <define name="imagemap">
2044
2194
  <element name="imagemap">
2195
+ <optional>
2196
+ <attribute name="tag"/>
2197
+ </optional>
2198
+ <optional>
2199
+ <attribute name="multilingual-rendering">
2200
+ <ref name="MultilingualRenderingType"/>
2201
+ </attribute>
2202
+ </optional>
2045
2203
  <ref name="figure"/>
2046
2204
  <zeroOrMore>
2047
2205
  <element name="area">
@@ -2086,6 +2244,14 @@
2086
2244
  </define>
2087
2245
  <define name="svgmap">
2088
2246
  <element name="svgmap">
2247
+ <optional>
2248
+ <attribute name="tag"/>
2249
+ </optional>
2250
+ <optional>
2251
+ <attribute name="multilingual-rendering">
2252
+ <ref name="MultilingualRenderingType"/>
2253
+ </attribute>
2254
+ </optional>
2089
2255
  <ref name="figure"/>
2090
2256
  <zeroOrMore>
2091
2257
  <element name="target">
data/lib/asciidoctor/ogc/reqt.rng CHANGED
@@ -58,6 +58,14 @@
58
58
  <optional>
59
59
  <attribute name="type"/>
60
60
  </optional>
61
+ <optional>
62
+ <attribute name="tag"/>
63
+ </optional>
64
+ <optional>
65
+ <attribute name="multilingual-rendering">
66
+ <ref name="MultilingualRenderingType"/>
67
+ </attribute>
68
+ </optional>
61
69
  <optional>
62
70
  <ref name="reqtitle"/>
63
71
  </optional>
@@ -101,7 +109,9 @@
101
109
  </define>
102
110
  <define name="label">
103
111
  <element name="label">
104
- <text/>
112
+ <oneOrMore>
113
+ <ref name="TextElement"/>
114
+ </oneOrMore>
105
115
  </element>
106
116
  </define>
107
117
  <define name="subject">
@@ -175,8 +185,19 @@
175
185
  <data type="boolean"/>
176
186
  </attribute>
177
187
  </optional>
188
+ <optional>
189
+ <attribute name="tag"/>
190
+ </optional>
191
+ <optional>
192
+ <attribute name="multilingual-rendering">
193
+ <ref name="MultilingualRenderingType"/>
194
+ </attribute>
195
+ </optional>
178
196
  <oneOrMore>
179
- <ref name="BasicBlock"/>
197
+ <choice>
198
+ <ref name="BasicBlock"/>
199
+ <ref name="component"/>
200
+ </choice>
180
201
  </oneOrMore>
181
202
  </define>
182
203
  <define name="ObligationType">