metanorma-m3d 1.3.16 → 1.3.17

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: d9b56ed21933db63363d1c0fb979b5caf9ee665e706cc633b70fc080c002400c
4
- data.tar.gz: 82db79b9d71bebfc7fdfd6ad87fb5bf13cc0773227420c2987ce625f17bb17fc
3
+ metadata.gz: 06d2777cd44148b1013ee17e76fc99c96d1e4e1012f0080f33157abe8bf2f61d
4
+ data.tar.gz: 840704b427a3f2f09daaaddcd53a2d9552e717518b864377c9dccff7165de91a
5
5
  SHA512:
6
- metadata.gz: 6e150a3bc9f661d73dd6edc1c98c3ac0930e3e51325b0a0df933f3257395c350cea00e4ff29aae4379e50f5a75cf9a125a21e0db0cc61b29aff9a539aec78616
7
- data.tar.gz: 15828c59d8b6348aa03544817a50bfdd8da7243e416172f33d39a34692150e80162edde84c3c9eab8006a23926b1045ccab1cad9366ed47ca76d9df04cef1e85
6
+ metadata.gz: b20336265f238b8b4d8aa2d80be6a61aca961693331b86ddad4579c3064664865a9984adac451701cda5b16b10c8b2315129a02f0274bf1e30a4196ebadf9b27
7
+ data.tar.gz: '091eedc6284f633bfd626bea725d43a8df9b4a99c1f7d770f4fa25c6a006cb310265def6e2602b735cb7d8a1930a6e2ad3074d7914359245180f37dfa2b634b5'
@@ -49,11 +49,17 @@
49
49
  </define>
50
50
  <define name="stage">
51
51
  <element name="stage">
52
+ <optional>
53
+ <attribute name="abbreviation"/>
54
+ </optional>
52
55
  <text/>
53
56
  </element>
54
57
  </define>
55
58
  <define name="substage">
56
59
  <element name="substage">
60
+ <optional>
61
+ <attribute name="abbreviation"/>
62
+ </optional>
57
63
  <text/>
58
64
  </element>
59
65
  </define>
@@ -452,9 +458,14 @@
452
458
  <attribute name="bibitemid">
453
459
  <data type="IDREF"/>
454
460
  </attribute>
455
- <zeroOrMore>
456
- <ref name="locality"/>
457
- </zeroOrMore>
461
+ <choice>
462
+ <zeroOrMore>
463
+ <ref name="locality"/>
464
+ </zeroOrMore>
465
+ <zeroOrMore>
466
+ <ref name="localityStack"/>
467
+ </zeroOrMore>
468
+ </choice>
458
469
  <optional>
459
470
  <ref name="date"/>
460
471
  </optional>
@@ -469,6 +480,25 @@
469
480
  <ref name="BibItemLocality"/>
470
481
  </element>
471
482
  </define>
483
+ <define name="localityStack">
484
+ <element name="localityStack">
485
+ <zeroOrMore>
486
+ <ref name="locality"/>
487
+ </zeroOrMore>
488
+ </element>
489
+ </define>
490
+ <define name="sourceLocality">
491
+ <element name="sourceLocality">
492
+ <ref name="BibItemLocality"/>
493
+ </element>
494
+ </define>
495
+ <define name="sourceLocalityStack">
496
+ <element name="sourceLocalityStack">
497
+ <zeroOrMore>
498
+ <ref name="sourceLocality"/>
499
+ </zeroOrMore>
500
+ </element>
501
+ </define>
472
502
  <define name="BibItemLocality">
473
503
  <attribute name="type">
474
504
  <ref name="LocalityType"/>
@@ -1028,12 +1058,30 @@
1028
1058
  <attribute name="type">
1029
1059
  <ref name="DocRelationType"/>
1030
1060
  </attribute>
1061
+ <optional>
1062
+ <element name="description">
1063
+ <ref name="FormattedString"/>
1064
+ </element>
1065
+ </optional>
1031
1066
  <element name="bibitem">
1032
1067
  <ref name="BibliographicItem"/>
1033
1068
  </element>
1034
- <zeroOrMore>
1035
- <ref name="locality"/>
1036
- </zeroOrMore>
1069
+ <choice>
1070
+ <zeroOrMore>
1071
+ <ref name="locality"/>
1072
+ </zeroOrMore>
1073
+ <zeroOrMore>
1074
+ <ref name="localityStack"/>
1075
+ </zeroOrMore>
1076
+ </choice>
1077
+ <choice>
1078
+ <zeroOrMore>
1079
+ <ref name="sourceLocality"/>
1080
+ </zeroOrMore>
1081
+ <zeroOrMore>
1082
+ <ref name="sourceLocalityStack"/>
1083
+ </zeroOrMore>
1084
+ </choice>
1037
1085
  </element>
1038
1086
  </define>
1039
1087
  <define name="version">
@@ -98,14 +98,17 @@ div.figure {
98
98
  */
99
99
 
100
100
  .document-type-band {
101
- @include docBand(2, null, 180px);
101
+ @include docBand($order: 2, $offset: 180px);
102
+
103
+ .document-type {
104
+ top: 20px;
105
+ }
102
106
  }
103
107
 
104
108
  .document-stage-band {
105
109
  @include docBand(1, 150);
106
110
  }
107
111
 
108
- p.document-type,
109
112
  p.document-stage {
110
113
  @include docBandTitle(120);
111
114
  }
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module M3d
3
- VERSION = "1.3.16"
3
+ VERSION = "1.3.17"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-m3d
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.16
4
+ version: 1.3.17
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2020-04-03 00:00:00.000000000 Z
11
+ date: 2020-04-17 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: asciimath