metanorma-csa 2.4.6 → 2.4.8

Sign up to get free protection for your applications and to get access to all the features.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/csa/csa.standard.xsl +1262 -878
  3. data/lib/isodoc/csa/html/htmlstyle.css +53 -0
  4. data/lib/metanorma/csa/basicdoc.rng +840 -419
  5. data/lib/metanorma/csa/biblio.rng +41 -43
  6. data/lib/metanorma/csa/csa.rng +24 -28
  7. data/lib/metanorma/csa/isodoc.rng +386 -624
  8. data/lib/metanorma/csa/version.rb +1 -1
  9. metadata +3 -3
data/lib/metanorma/csa/biblio.rng CHANGED
@@ -95,7 +95,7 @@
95
95
  <text/>
96
96
  </element>
97
97
  </define>
98
- <define name="LocalizedString1">
98
+ <define name="LocalizedStringAttrs">
99
99
  <optional>
100
100
  <!-- multiple languages and scripts possible: comma delimit them if so -->
101
101
  <attribute name="language"/>
@@ -106,6 +106,10 @@
106
106
  <optional>
107
107
  <attribute name="script"/>
108
108
  </optional>
109
+ </define>
110
+ <define name="LocalizedString1">
111
+ <!-- multiple languages and scripts possible: comma delimit them if so -->
112
+ <ref name="LocalizedStringAttrs"/>
109
113
  <text/>
110
114
  </define>
111
115
  <define name="LocalizedString">
@@ -118,6 +122,23 @@
118
122
  </oneOrMore>
119
123
  </choice>
120
124
  </define>
125
+ <define name="LocalizedMarkedUpString1">
126
+ <!-- multiple languages and scripts possible: comma delimit them if so -->
127
+ <ref name="LocalizedStringAttrs"/>
128
+ <oneOrMore>
129
+ <ref name="TextElement"/>
130
+ </oneOrMore>
131
+ </define>
132
+ <define name="LocalizedMarkedUpString">
133
+ <choice>
134
+ <ref name="LocalizedMarkedUpString1"/>
135
+ <oneOrMore>
136
+ <element name="variant">
137
+ <ref name="LocalizedMarkedUpString1"/>
138
+ </element>
139
+ </oneOrMore>
140
+ </choice>
141
+ </define>
121
142
  <!--
122
143
  Unlike UML, change type to format: type is overloaded
123
144
  Would be need if plain were default value and could omit the attribute
@@ -142,16 +163,8 @@
142
163
  <ref name="LocalizedStringOrXsAny"/>
143
164
  </define>
144
165
  <define name="LocalizedStringOrXsAny1">
145
- <optional>
146
- <!-- multiple languages and scripts possible: comma delimit them if so -->
147
- <attribute name="language"/>
148
- </optional>
149
- <optional>
150
- <attribute name="locale"/>
151
- </optional>
152
- <optional>
153
- <attribute name="script"/>
154
- </optional>
166
+ <!-- multiple languages and scripts possible: comma delimit them if so -->
167
+ <ref name="LocalizedStringAttrs"/>
155
168
  <oneOrMore>
156
169
  <choice>
157
170
  <text/>
@@ -208,9 +221,7 @@
208
221
  </define>
209
222
  <define name="roledescription">
210
223
  <element name="description">
211
- <oneOrMore>
212
- <ref name="TextElement"/>
213
- </oneOrMore>
224
+ <ref name="LocalizedMarkedUpString"/>
214
225
  </element>
215
226
  </define>
216
227
  <define name="person">
@@ -335,9 +346,7 @@
335
346
  </define>
336
347
  <define name="affiliationdescription">
337
348
  <element name="description">
338
- <oneOrMore>
339
- <ref name="TextElement"/>
340
- </oneOrMore>
349
+ <ref name="LocalizedMarkedUpString"/>
341
350
  </element>
342
351
  </define>
343
352
  <define name="organization">
@@ -386,7 +395,7 @@
386
395
  </define>
387
396
  <define name="logo">
388
397
  <element name="logo">
389
- <ref name="image"/>
398
+ <ref name="image-no-id"/>
390
399
  </element>
391
400
  </define>
392
401
  <define name="depiction">
@@ -395,7 +404,7 @@
395
404
  <attribute name="scope"/>
396
405
  </optional>
397
406
  <zeroOrMore>
398
- <ref name="image"/>
407
+ <ref name="image-no-id"/>
399
408
  </zeroOrMore>
400
409
  </element>
401
410
  </define>
@@ -948,9 +957,7 @@
948
957
  <optional>
949
958
  <attribute name="type"/>
950
959
  </optional>
951
- <zeroOrMore>
952
- <ref name="TextElement"/>
953
- </zeroOrMore>
960
+ <ref name="LocalizedMarkedUpString"/>
954
961
  </define>
955
962
  <!-- TitleType = ( "alternative" | "original" | "unofficial" | "subtitle" | "main" ) -->
956
963
  <define name="TypedUri">
@@ -1041,18 +1048,7 @@
1041
1048
  <data type="boolean"/>
1042
1049
  </attribute>
1043
1050
  </optional>
1044
- <optional>
1045
- <attribute name="language"/>
1046
- </optional>
1047
- <optional>
1048
- <attribute name="locale"/>
1049
- </optional>
1050
- <optional>
1051
- <attribute name="script"/>
1052
- </optional>
1053
- <oneOrMore>
1054
- <ref name="TextElement"/>
1055
- </oneOrMore>
1051
+ <ref name="LocalizedMarkedUpString"/>
1056
1052
  </element>
1057
1053
  </define>
1058
1054
  <define name="docnumber">
@@ -1277,16 +1273,20 @@
1277
1273
  <optional>
1278
1274
  <attribute name="type"/>
1279
1275
  </optional>
1280
- <oneOrMore>
1281
- <ref name="TextElement"/>
1282
- </oneOrMore>
1276
+ <ref name="LocalizedMarkedUpString"/>
1283
1277
  </element>
1284
1278
  </define>
1285
1279
  <define name="bibabstract">
1286
1280
  <element name="abstract">
1287
- <oneOrMore>
1288
- <ref name="TextElement"/>
1289
- </oneOrMore>
1281
+ <ref name="LocalizedStringAttrs"/>
1282
+ <choice>
1283
+ <oneOrMore>
1284
+ <ref name="BasicBlockNoId"/>
1285
+ </oneOrMore>
1286
+ <oneOrMore>
1287
+ <ref name="TextElement"/>
1288
+ </oneOrMore>
1289
+ </choice>
1290
1290
  </element>
1291
1291
  </define>
1292
1292
  <define name="copyright">
@@ -1391,9 +1391,7 @@
1391
1391
  </attribute>
1392
1392
  <optional>
1393
1393
  <element name="description">
1394
- <oneOrMore>
1395
- <ref name="TextElement"/>
1396
- </oneOrMore>
1394
+ <ref name="LocalizedMarkedUpString"/>
1397
1395
  </element>
1398
1396
  </optional>
1399
1397
  <element name="bibitem">
data/lib/metanorma/csa/csa.rng CHANGED
@@ -11,36 +11,32 @@
11
11
  <start>
12
12
  <ref name="csand-standard"/>
13
13
  </start>
14
- <define name="figure">
15
- <element name="figure">
16
- <ref name="FigureAttributes"/>
17
- <ref name="BlockAttributes"/>
18
- <optional>
19
- <ref name="source"/>
20
- </optional>
21
- <optional>
22
- <ref name="tname"/>
23
- </optional>
24
- <choice>
25
- <oneOrMore>
26
- <ref name="figure"/>
27
- </oneOrMore>
28
- <group>
29
- <choice>
30
- <zeroOrMore>
31
- <ref name="TextElement"/>
32
- </zeroOrMore>
33
- <ref name="pre"/>
34
- </choice>
14
+ <define name="FigureBody">
15
+ <optional>
16
+ <ref name="source"/>
17
+ </optional>
18
+ <optional>
19
+ <ref name="tname"/>
20
+ </optional>
21
+ <choice>
22
+ <oneOrMore>
23
+ <ref name="figure"/>
24
+ </oneOrMore>
25
+ <group>
26
+ <choice>
35
27
  <zeroOrMore>
36
- <ref name="note"/>
28
+ <ref name="TextElement"/>
37
29
  </zeroOrMore>
38
- <optional>
39
- <ref name="dl"/>
40
- </optional>
41
- </group>
42
- </choice>
43
- </element>
30
+ <ref name="pre"/>
31
+ </choice>
32
+ <zeroOrMore>
33
+ <ref name="note"/>
34
+ </zeroOrMore>
35
+ <optional>
36
+ <ref name="dl"/>
37
+ </optional>
38
+ </group>
39
+ </choice>
44
40
  </define>
45
41
  </include>
46
42
  <define name="csand-standard">