metanorma-un 0.3.5 → 0.3.6

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/lib/asciidoctor/un/biblio.rng +54 -6
  3. data/lib/asciidoctor/un/un.rng +3 -1
  4. data/lib/isodoc/un/html/htmlstyle.scss +5 -1
  5. data/lib/metanorma/un/version.rb +1 -1
  6. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 19c3f9c7ce6ea98f5bf53a78c196245f689cf3dda1aaced7caeb708302198f3d
4
- data.tar.gz: 74545edd7c80ae129866df3a06e9944e230bd6e72d78517a213d774761cd1e01
3
+ metadata.gz: dd4f80384b6c543d056b1205a778b4b6d92d413ff32fb22ab16766a5c8e0ef16
4
+ data.tar.gz: 865a4de4708b9a437e94551606df7ad2bf7edeaaa269071ef93cab9bd44455e5
5
5
  SHA512:
6
- metadata.gz: 6684a220b9cc0820a8fd6a55fe747cfa4975109bb27168115c39822b443bfee112778c81d9261ed9f79e1fcfaae021ee1b667a31a0b34428f4a698d66f3cd536
7
- data.tar.gz: 948b8e07d434eace1e34762b52e5b735861f8107f2c4df259e551077b362054cb5fce4cc80fe7b8fcd3ea2b70c13cb168218c6349a224053fe4f354230803098
6
+ metadata.gz: b3bd067351e32036adbd85dc737707587b33a30d0693d44601add8b49a36c4447c730a704f101d4ed8fadb45dd5e383ebb97f43311aa96834e20b227df3e5ffa
7
+ data.tar.gz: 850793c9413a4fa8e7621c459343bf5ccc8d5c16717a0500a6ac369cfe83ba7933b5c3fc58ba85a61cd45494c3a7bae7d9cba0dbe42e895c3dd932127f4c3aaf
data/lib/asciidoctor/un/biblio.rng CHANGED
@@ -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">
data/lib/asciidoctor/un/un.rng CHANGED
@@ -107,7 +107,9 @@
107
107
  <zeroOrMore>
108
108
  <ref name="submissionlanguage"/>
109
109
  </zeroOrMore>
110
- <ref name="editorialgroup"/>
110
+ <optional>
111
+ <ref name="editorialgroup"/>
112
+ </optional>
111
113
  <zeroOrMore>
112
114
  <ref name="ics"/>
113
115
  </zeroOrMore>
data/lib/isodoc/un/html/htmlstyle.scss CHANGED
@@ -138,7 +138,11 @@ nav {
138
138
  */
139
139
 
140
140
  .document-type-band {
141
- @include docBand(2, 150, 180px);
141
+ @include docBand($order: 2, $offset: 180px);
142
+
143
+ .document-type {
144
+ top: 20px;
145
+ }
142
146
  }
143
147
 
144
148
  .document-stage-band {
data/lib/metanorma/un/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module UN
3
- VERSION = "0.3.5"
3
+ VERSION = "0.3.6"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-un
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.5
4
+ version: 0.3.6
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: htmlentities