metanorma-csa 2.0.0 → 2.0.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/isodoc/csa/csa.standard.xsl +2299 -1506
- data/lib/isodoc/csa/html/csa.css +1 -2
- data/lib/isodoc/csa/html/csa.scss +0 -1
- data/lib/isodoc/csa/html/htmlstyle.css +22 -17
- data/lib/isodoc/csa/html/htmlstyle.scss +9 -2
- data/lib/metanorma/csa/basicdoc.rng +5 -3
- data/lib/metanorma/csa/biblio.rng +7 -5
- data/lib/metanorma/csa/isodoc.rng +171 -4
- data/lib/metanorma/csa/version.rb +1 -1
- metadata +2 -2
data/lib/isodoc/csa/html/csa.css
CHANGED
@@ -786,8 +786,7 @@ div.example p.MsoListParagraph {
|
|
786
786
|
font-size: {{smallerfontsize}}; }
|
787
787
|
|
788
788
|
div.Note p.MsoListParagraph {
|
789
|
-
font-size: {{smallerfontsize}};
|
790
|
-
margin-left: 1.0cm; }
|
789
|
+
font-size: {{smallerfontsize}}; }
|
791
790
|
|
792
791
|
div.Note span.stem {
|
793
792
|
font-size: {{smallerfontsize}}; }
|
@@ -248,51 +248,56 @@ body {
|
|
248
248
|
main {
|
249
249
|
margin: 0 3em 0 6em; }
|
250
250
|
|
251
|
-
#toc {
|
251
|
+
#toc, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
|
252
252
|
font-family: {{bodyfont}};
|
253
253
|
font-weight: 400; }
|
254
|
-
#toc ul {
|
254
|
+
#toc ul, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) ul {
|
255
255
|
margin: 0;
|
256
256
|
padding: 0;
|
257
257
|
list-style: none; }
|
258
|
-
#toc ul li a {
|
258
|
+
#toc ul li a, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) ul li a {
|
259
259
|
padding: 5px 10px; }
|
260
|
-
#toc ul a {
|
260
|
+
#toc ul a, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) ul a {
|
261
261
|
color: #4D7EA5;
|
262
262
|
text-decoration: none;
|
263
263
|
display: block; }
|
264
|
-
#toc ul a:hover {
|
264
|
+
#toc ul a:hover, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) ul a:hover {
|
265
265
|
box-shadow: none;
|
266
266
|
color: #4D7EA5; }
|
267
|
-
#toc .h2 {
|
267
|
+
#toc .h2, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .h2 {
|
268
268
|
padding-left: 30px; }
|
269
|
-
#toc .h3 {
|
269
|
+
#toc .h3, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .h3 {
|
270
270
|
padding-left: 50px; }
|
271
|
-
#toc .toc-active, #toc li:hover {
|
271
|
+
#toc .toc-active, #toc li:hover, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover {
|
272
272
|
background: #4D7EA5;
|
273
273
|
box-shadow: inset -5px 0px 10px -5px #4D7EA5 !important; }
|
274
|
-
#toc .toc-active a, #toc li:hover a {
|
274
|
+
#toc .toc-active a, #toc li:hover a, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active a, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover a {
|
275
275
|
color: #4D7EA5; }
|
276
276
|
@media print {
|
277
|
-
#toc .toc-active, #toc li:hover {
|
277
|
+
#toc .toc-active, #toc li:hover, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover {
|
278
278
|
background: white;
|
279
279
|
box-shadow: none !important; }
|
280
|
-
#toc .toc-active a {
|
280
|
+
#toc .toc-active a, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active a {
|
281
281
|
color: #4D7EA5; }
|
282
|
-
#toc li:hover a {
|
282
|
+
#toc li:hover a, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover a {
|
283
283
|
color: black; } }
|
284
284
|
@media screen and (max-width: 768px) {
|
285
|
-
#toc {
|
285
|
+
#toc, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
|
286
286
|
padding: 0 1.5em;
|
287
287
|
overflow: visible; } }
|
288
|
-
#toc .toc-active a {
|
288
|
+
#toc .toc-active a, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active a {
|
289
289
|
color: white; }
|
290
|
-
#toc li a {
|
290
|
+
#toc li a, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li a {
|
291
291
|
text-transform: none; }
|
292
|
-
#toc ul a:hover {
|
292
|
+
#toc ul a:hover, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) ul a:hover {
|
293
293
|
box-shadow: none;
|
294
294
|
color: white; }
|
295
295
|
|
296
|
+
#toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
|
297
|
+
margin-top: 0;
|
298
|
+
margin-bottom: 0;
|
299
|
+
font-size: 100%; }
|
300
|
+
|
296
301
|
li {
|
297
302
|
margin-left: 1em;
|
298
303
|
list-style-position: outside; }
|
@@ -353,7 +358,7 @@ li {
|
|
353
358
|
display: none; }
|
354
359
|
h1.toc-contents {
|
355
360
|
margin-top: 1em; }
|
356
|
-
ul#toc-list {
|
361
|
+
ul#toc-list, ul#toc-list > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
|
357
362
|
padding: 0;
|
358
363
|
margin: 0; } }
|
359
364
|
|
@@ -18,7 +18,7 @@ main {
|
|
18
18
|
margin: 0 3em 0 6em;
|
19
19
|
}
|
20
20
|
|
21
|
-
#toc {
|
21
|
+
#toc, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
|
22
22
|
@include toc(#4D7EA5, #4D7EA5, #4D7EA5);
|
23
23
|
@include sidebarToc();
|
24
24
|
|
@@ -38,6 +38,13 @@ main {
|
|
38
38
|
}
|
39
39
|
}
|
40
40
|
|
41
|
+
#toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
|
42
|
+
margin-top: 0;
|
43
|
+
margin-bottom: 0;
|
44
|
+
font-size: 100%;
|
45
|
+
}
|
46
|
+
|
47
|
+
|
41
48
|
li {
|
42
49
|
margin-left: 1em;
|
43
50
|
list-style-position: outside;
|
@@ -68,7 +75,7 @@ nav {
|
|
68
75
|
margin-top: 1em;
|
69
76
|
}
|
70
77
|
|
71
|
-
ul#toc-list {
|
78
|
+
ul#toc-list, ul#toc-list > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
|
72
79
|
padding: 0;
|
73
80
|
margin: 0;
|
74
81
|
}
|
@@ -173,9 +173,11 @@
|
|
173
173
|
<data type="dateTime"/>
|
174
174
|
</attribute>
|
175
175
|
</optional>
|
176
|
-
<
|
177
|
-
<
|
178
|
-
|
176
|
+
<optional>
|
177
|
+
<attribute name="from">
|
178
|
+
<data type="IDREF"/>
|
179
|
+
</attribute>
|
180
|
+
</optional>
|
179
181
|
<optional>
|
180
182
|
<attribute name="to">
|
181
183
|
<data type="IDREF"/>
|
@@ -209,9 +209,6 @@
|
|
209
209
|
<zeroOrMore>
|
210
210
|
<ref name="contact"/>
|
211
211
|
</zeroOrMore>
|
212
|
-
<zeroOrMore>
|
213
|
-
<ref name="uri"/>
|
214
|
-
</zeroOrMore>
|
215
212
|
</element>
|
216
213
|
</define>
|
217
214
|
<define name="fullname">
|
@@ -401,9 +398,9 @@
|
|
401
398
|
<choice>
|
402
399
|
<!-- iso191606 TODO -->
|
403
400
|
<group>
|
404
|
-
<
|
401
|
+
<zeroOrMore>
|
405
402
|
<ref name="street"/>
|
406
|
-
</
|
403
|
+
</zeroOrMore>
|
407
404
|
<ref name="city"/>
|
408
405
|
<optional>
|
409
406
|
<ref name="state"/>
|
@@ -828,6 +825,11 @@
|
|
828
825
|
<optional>
|
829
826
|
<attribute name="scope"/>
|
830
827
|
</optional>
|
828
|
+
<optional>
|
829
|
+
<attribute name="primary">
|
830
|
+
<data type="boolean"/>
|
831
|
+
</attribute>
|
832
|
+
</optional>
|
831
833
|
<text/>
|
832
834
|
</element>
|
833
835
|
</define>
|
@@ -32,6 +32,56 @@
|
|
32
32
|
<ref name="DocumentType"/>
|
33
33
|
</element>
|
34
34
|
</define>
|
35
|
+
<define name="index">
|
36
|
+
<element name="index">
|
37
|
+
<optional>
|
38
|
+
<attribute name="to">
|
39
|
+
<data type="IDREF"/>
|
40
|
+
</attribute>
|
41
|
+
</optional>
|
42
|
+
<element name="primary">
|
43
|
+
<oneOrMore>
|
44
|
+
<choice>
|
45
|
+
<ref name="PureTextElement"/>
|
46
|
+
<ref name="stem"/>
|
47
|
+
</choice>
|
48
|
+
</oneOrMore>
|
49
|
+
</element>
|
50
|
+
<optional>
|
51
|
+
<element name="secondary">
|
52
|
+
<oneOrMore>
|
53
|
+
<choice>
|
54
|
+
<ref name="PureTextElement"/>
|
55
|
+
<ref name="stem"/>
|
56
|
+
</choice>
|
57
|
+
</oneOrMore>
|
58
|
+
</element>
|
59
|
+
</optional>
|
60
|
+
<optional>
|
61
|
+
<element name="tertiary">
|
62
|
+
<oneOrMore>
|
63
|
+
<choice>
|
64
|
+
<ref name="PureTextElement"/>
|
65
|
+
<ref name="stem"/>
|
66
|
+
</choice>
|
67
|
+
</oneOrMore>
|
68
|
+
</element>
|
69
|
+
</optional>
|
70
|
+
</element>
|
71
|
+
</define>
|
72
|
+
<define name="bibitem">
|
73
|
+
<element name="bibitem">
|
74
|
+
<attribute name="id">
|
75
|
+
<data type="ID"/>
|
76
|
+
</attribute>
|
77
|
+
<optional>
|
78
|
+
<attribute name="hidden">
|
79
|
+
<data type="boolean"/>
|
80
|
+
</attribute>
|
81
|
+
</optional>
|
82
|
+
<ref name="BibliographicItem"/>
|
83
|
+
</element>
|
84
|
+
</define>
|
35
85
|
<define name="section-title">
|
36
86
|
<element name="title">
|
37
87
|
<zeroOrMore>
|
@@ -102,9 +152,7 @@
|
|
102
152
|
<data type="boolean"/>
|
103
153
|
</attribute>
|
104
154
|
</optional>
|
105
|
-
<
|
106
|
-
<ref name="PureTextElement"/>
|
107
|
-
</oneOrMore>
|
155
|
+
<ref name="XrefBody"/>
|
108
156
|
</element>
|
109
157
|
</define>
|
110
158
|
<define name="erefType">
|
@@ -138,6 +186,42 @@
|
|
138
186
|
<ref name="PureTextElement"/>
|
139
187
|
</oneOrMore>
|
140
188
|
</define>
|
189
|
+
<define name="localityStack">
|
190
|
+
<element name="localityStack">
|
191
|
+
<optional>
|
192
|
+
<attribute name="connective">
|
193
|
+
<choice>
|
194
|
+
<value>and</value>
|
195
|
+
<value>or</value>
|
196
|
+
<value>from</value>
|
197
|
+
<value>to</value>
|
198
|
+
<value/>
|
199
|
+
</choice>
|
200
|
+
</attribute>
|
201
|
+
</optional>
|
202
|
+
<zeroOrMore>
|
203
|
+
<ref name="locality"/>
|
204
|
+
</zeroOrMore>
|
205
|
+
</element>
|
206
|
+
</define>
|
207
|
+
<define name="sourceLocalityStack">
|
208
|
+
<element name="sourceLocalityStack">
|
209
|
+
<optional>
|
210
|
+
<attribute name="connective">
|
211
|
+
<choice>
|
212
|
+
<value>and</value>
|
213
|
+
<value>or</value>
|
214
|
+
<value>from</value>
|
215
|
+
<value>to</value>
|
216
|
+
<value/>
|
217
|
+
</choice>
|
218
|
+
</attribute>
|
219
|
+
</optional>
|
220
|
+
<zeroOrMore>
|
221
|
+
<ref name="sourceLocality"/>
|
222
|
+
</zeroOrMore>
|
223
|
+
</element>
|
224
|
+
</define>
|
141
225
|
<define name="ul">
|
142
226
|
<element name="ul">
|
143
227
|
<attribute name="id">
|
@@ -690,6 +774,7 @@
|
|
690
774
|
<ref name="terms"/>
|
691
775
|
<ref name="term-clause"/>
|
692
776
|
<ref name="definitions"/>
|
777
|
+
<ref name="floating-title"/>
|
693
778
|
</choice>
|
694
779
|
</oneOrMore>
|
695
780
|
</element>
|
@@ -1013,6 +1098,26 @@
|
|
1013
1098
|
</zeroOrMore>
|
1014
1099
|
</element>
|
1015
1100
|
</define>
|
1101
|
+
<define name="sub">
|
1102
|
+
<element name="sub">
|
1103
|
+
<zeroOrMore>
|
1104
|
+
<choice>
|
1105
|
+
<ref name="PureTextElement"/>
|
1106
|
+
<ref name="stem"/>
|
1107
|
+
</choice>
|
1108
|
+
</zeroOrMore>
|
1109
|
+
</element>
|
1110
|
+
</define>
|
1111
|
+
<define name="sup">
|
1112
|
+
<element name="sup">
|
1113
|
+
<zeroOrMore>
|
1114
|
+
<choice>
|
1115
|
+
<ref name="PureTextElement"/>
|
1116
|
+
<ref name="stem"/>
|
1117
|
+
</choice>
|
1118
|
+
</zeroOrMore>
|
1119
|
+
</element>
|
1120
|
+
</define>
|
1016
1121
|
<define name="pagebreak">
|
1017
1122
|
<element name="pagebreak">
|
1018
1123
|
<optional>
|
@@ -1027,6 +1132,16 @@
|
|
1027
1132
|
</define>
|
1028
1133
|
</include>
|
1029
1134
|
<!-- end overrides -->
|
1135
|
+
<define name="image" combine="choice">
|
1136
|
+
<element name="svg">
|
1137
|
+
<oneOrMore>
|
1138
|
+
<choice>
|
1139
|
+
<text/>
|
1140
|
+
<ref name="AnyElement"/>
|
1141
|
+
</choice>
|
1142
|
+
</oneOrMore>
|
1143
|
+
</element>
|
1144
|
+
</define>
|
1030
1145
|
<define name="MultilingualRenderingType">
|
1031
1146
|
<choice>
|
1032
1147
|
<value>common</value>
|
@@ -1680,6 +1795,7 @@
|
|
1680
1795
|
<ref name="clause-subsection"/>
|
1681
1796
|
<ref name="terms"/>
|
1682
1797
|
<ref name="definitions"/>
|
1798
|
+
<ref name="floating-title"/>
|
1683
1799
|
</choice>
|
1684
1800
|
</oneOrMore>
|
1685
1801
|
</choice>
|
@@ -1722,6 +1838,7 @@
|
|
1722
1838
|
<ref name="terms"/>
|
1723
1839
|
<ref name="definitions"/>
|
1724
1840
|
<ref name="references"/>
|
1841
|
+
<ref name="floating-title"/>
|
1725
1842
|
</choice>
|
1726
1843
|
</zeroOrMore>
|
1727
1844
|
</group>
|
@@ -2200,7 +2317,18 @@
|
|
2200
2317
|
<ref name="MultilingualRenderingType"/>
|
2201
2318
|
</attribute>
|
2202
2319
|
</optional>
|
2203
|
-
<
|
2320
|
+
<oneOrMore>
|
2321
|
+
<choice>
|
2322
|
+
<ref name="formula"/>
|
2323
|
+
<ref name="ul"/>
|
2324
|
+
<ref name="ol"/>
|
2325
|
+
<ref name="dl"/>
|
2326
|
+
<ref name="quote"/>
|
2327
|
+
<ref name="sourcecode"/>
|
2328
|
+
<ref name="paragraph"/>
|
2329
|
+
<ref name="figure"/>
|
2330
|
+
</choice>
|
2331
|
+
</oneOrMore>
|
2204
2332
|
</element>
|
2205
2333
|
</define>
|
2206
2334
|
<define name="termsource">
|
@@ -2534,4 +2662,43 @@
|
|
2534
2662
|
</oneOrMore>
|
2535
2663
|
</element>
|
2536
2664
|
</define>
|
2665
|
+
<define name="floating-title">
|
2666
|
+
<element name="floating-title">
|
2667
|
+
<attribute name="id">
|
2668
|
+
<data type="ID"/>
|
2669
|
+
</attribute>
|
2670
|
+
<attribute name="depth">
|
2671
|
+
<data type="int"/>
|
2672
|
+
</attribute>
|
2673
|
+
<zeroOrMore>
|
2674
|
+
<ref name="TextElement"/>
|
2675
|
+
</zeroOrMore>
|
2676
|
+
</element>
|
2677
|
+
</define>
|
2678
|
+
<define name="XrefBody">
|
2679
|
+
<zeroOrMore>
|
2680
|
+
<ref name="XrefTarget"/>
|
2681
|
+
</zeroOrMore>
|
2682
|
+
<oneOrMore>
|
2683
|
+
<ref name="PureTextElement"/>
|
2684
|
+
</oneOrMore>
|
2685
|
+
</define>
|
2686
|
+
<define name="XrefTarget">
|
2687
|
+
<element name="location">
|
2688
|
+
<attribute name="target">
|
2689
|
+
<data type="string">
|
2690
|
+
<param name="pattern">\i\c*|\c+#\c+</param>
|
2691
|
+
</data>
|
2692
|
+
</attribute>
|
2693
|
+
<attribute name="connective">
|
2694
|
+
<choice>
|
2695
|
+
<value>and</value>
|
2696
|
+
<value>or</value>
|
2697
|
+
<value>from</value>
|
2698
|
+
<value>to</value>
|
2699
|
+
<value/>
|
2700
|
+
</choice>
|
2701
|
+
</attribute>
|
2702
|
+
</element>
|
2703
|
+
</define>
|
2537
2704
|
</grammar>
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: metanorma-csa
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.0.
|
4
|
+
version: 2.0.4
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ribose Inc.
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2022-
|
11
|
+
date: 2022-02-21 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: metanorma-generic
|