metanorma-csa 2.4.7 → 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 +26 -27
  6. data/lib/metanorma/csa/csa.rng +24 -28
  7. data/lib/metanorma/csa/isodoc.rng +351 -510
  8. data/lib/metanorma/csa/version.rb +1 -1
  9. metadata +3 -3
data/lib/metanorma/csa/biblio.rng CHANGED
@@ -122,6 +122,23 @@
122
122
  </oneOrMore>
123
123
  </choice>
124
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>
125
142
  <!--
126
143
  Unlike UML, change type to format: type is overloaded
127
144
  Would be need if plain were default value and could omit the attribute
@@ -204,10 +221,7 @@
204
221
  </define>
205
222
  <define name="roledescription">
206
223
  <element name="description">
207
- <ref name="LocalizedStringAttrs"/>
208
- <oneOrMore>
209
- <ref name="TextElement"/>
210
- </oneOrMore>
224
+ <ref name="LocalizedMarkedUpString"/>
211
225
  </element>
212
226
  </define>
213
227
  <define name="person">
@@ -332,10 +346,7 @@
332
346
  </define>
333
347
  <define name="affiliationdescription">
334
348
  <element name="description">
335
- <ref name="LocalizedStringAttrs"/>
336
- <oneOrMore>
337
- <ref name="TextElement"/>
338
- </oneOrMore>
349
+ <ref name="LocalizedMarkedUpString"/>
339
350
  </element>
340
351
  </define>
341
352
  <define name="organization">
@@ -384,7 +395,7 @@
384
395
  </define>
385
396
  <define name="logo">
386
397
  <element name="logo">
387
- <ref name="image"/>
398
+ <ref name="image-no-id"/>
388
399
  </element>
389
400
  </define>
390
401
  <define name="depiction">
@@ -393,7 +404,7 @@
393
404
  <attribute name="scope"/>
394
405
  </optional>
395
406
  <zeroOrMore>
396
- <ref name="image"/>
407
+ <ref name="image-no-id"/>
397
408
  </zeroOrMore>
398
409
  </element>
399
410
  </define>
@@ -946,10 +957,7 @@
946
957
  <optional>
947
958
  <attribute name="type"/>
948
959
  </optional>
949
- <ref name="LocalizedStringAttrs"/>
950
- <zeroOrMore>
951
- <ref name="TextElement"/>
952
- </zeroOrMore>
960
+ <ref name="LocalizedMarkedUpString"/>
953
961
  </define>
954
962
  <!-- TitleType = ( "alternative" | "original" | "unofficial" | "subtitle" | "main" ) -->
955
963
  <define name="TypedUri">
@@ -1040,10 +1048,7 @@
1040
1048
  <data type="boolean"/>
1041
1049
  </attribute>
1042
1050
  </optional>
1043
- <ref name="LocalizedStringAttrs"/>
1044
- <oneOrMore>
1045
- <ref name="TextElement"/>
1046
- </oneOrMore>
1051
+ <ref name="LocalizedMarkedUpString"/>
1047
1052
  </element>
1048
1053
  </define>
1049
1054
  <define name="docnumber">
@@ -1268,10 +1273,7 @@
1268
1273
  <optional>
1269
1274
  <attribute name="type"/>
1270
1275
  </optional>
1271
- <ref name="LocalizedStringAttrs"/>
1272
- <oneOrMore>
1273
- <ref name="TextElement"/>
1274
- </oneOrMore>
1276
+ <ref name="LocalizedMarkedUpString"/>
1275
1277
  </element>
1276
1278
  </define>
1277
1279
  <define name="bibabstract">
@@ -1279,7 +1281,7 @@
1279
1281
  <ref name="LocalizedStringAttrs"/>
1280
1282
  <choice>
1281
1283
  <oneOrMore>
1282
- <ref name="BasicBlock"/>
1284
+ <ref name="BasicBlockNoId"/>
1283
1285
  </oneOrMore>
1284
1286
  <oneOrMore>
1285
1287
  <ref name="TextElement"/>
@@ -1389,10 +1391,7 @@
1389
1391
  </attribute>
1390
1392
  <optional>
1391
1393
  <element name="description">
1392
- <ref name="LocalizedStringAttrs"/>
1393
- <oneOrMore>
1394
- <ref name="TextElement"/>
1395
- </oneOrMore>
1394
+ <ref name="LocalizedMarkedUpString"/>
1396
1395
  </element>
1397
1396
  </optional>
1398
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">