relaton-un 1.0.1 → 1.1.0

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: 1d64886141fa17c10e8f8ec8d2c613ef8b0873d7161c0168a1e47af199c91f7c
4
- data.tar.gz: 2ab3789babe8098c187b11a5272a69d9ef7569f6f8964c1bbc21e22f273a180b
3
+ metadata.gz: f71e444700515b65a12a9e78398bbb1f7f130929acbe7970b4314da4db4bc0db
4
+ data.tar.gz: 8b1294644b333cd832b2c725afb73820fd62c3bc16db09acb7b121c91fcb9992
5
5
  SHA512:
6
- metadata.gz: f9e219d127a0a13725ab75d6d2abfefa4e723c2b4a93bae0ab04b3eec44f0ef9a5be6af2485b75cbdc7011460ee1e6d26dc66f2c7557af7ddeea041afd203088
7
- data.tar.gz: d39429a73d6b50638ece5f6317b56bdfa9372104710f4910e89e72ad81313ae10bfebb49d9b0e9dcb051879f59dddb92316f52901103133216aef5a330d1e56c
6
+ metadata.gz: 4eadba3d12ae0111bf66e4c8a1b427b88dc43a3afcc18cf83f36d692c17c0f7f7557d5bb91b482f6e8a88312b80c1995df0736ce82b030bf9313b6dd63200811
7
+ data.tar.gz: bd0c9c8123c157206622ef6eede17f3e5badde27e2746c2487f1bbbae52c3dec6c4da97b32e4c8df3ce1d8289105abd0175b0653578918744ef621f3c1004948
@@ -88,7 +88,7 @@
88
88
  <text/>
89
89
  </element>
90
90
  </define>
91
- <define name="LocalizedString">
91
+ <define name="LocalizedString1">
92
92
  <optional>
93
93
  <!-- multiple languages and scripts possible: comma delimit them if so -->
94
94
  <attribute name="language"/>
@@ -98,6 +98,16 @@
98
98
  </optional>
99
99
  <text/>
100
100
  </define>
101
+ <define name="LocalizedString">
102
+ <choice>
103
+ <ref name="LocalizedString1"/>
104
+ <oneOrMore>
105
+ <element name="variant">
106
+ <ref name="LocalizedString1"/>
107
+ </element>
108
+ </oneOrMore>
109
+ </choice>
110
+ </define>
101
111
  <!--
102
112
  Unlike UML, change type to format: type is overloaded
103
113
  Would be need if plain were default value and could omit the attribute
@@ -121,7 +131,7 @@
121
131
  </optional>
122
132
  <ref name="LocalizedStringOrXsAny"/>
123
133
  </define>
124
- <define name="LocalizedStringOrXsAny">
134
+ <define name="LocalizedStringOrXsAny1">
125
135
  <optional>
126
136
  <!-- multiple languages and scripts possible: comma delimit them if so -->
127
137
  <attribute name="language"/>
@@ -136,6 +146,16 @@
136
146
  </choice>
137
147
  </oneOrMore>
138
148
  </define>
149
+ <define name="LocalizedStringOrXsAny">
150
+ <choice>
151
+ <ref name="LocalizedStringOrXsAny1"/>
152
+ <oneOrMore>
153
+ <element name="variant">
154
+ <ref name="LocalizedStringOrXsAny1"/>
155
+ </element>
156
+ </oneOrMore>
157
+ </choice>
158
+ </define>
139
159
  <define name="contributor">
140
160
  <element name="contributor">
141
161
  <zeroOrMore>
@@ -641,9 +661,9 @@
641
661
  <optional>
642
662
  <ref name="status"/>
643
663
  </optional>
644
- <optional>
664
+ <zeroOrMore>
645
665
  <ref name="copyright"/>
646
- </optional>
666
+ </zeroOrMore>
647
667
  <zeroOrMore>
648
668
  <ref name="docrelation"/>
649
669
  </zeroOrMore>
@@ -1001,7 +1021,17 @@
1001
1021
  <optional>
1002
1022
  <ref name="to"/>
1003
1023
  </optional>
1004
- <ref name="owner"/>
1024
+ <oneOrMore>
1025
+ <ref name="owner"/>
1026
+ </oneOrMore>
1027
+ <optional>
1028
+ <ref name="copyright_scope"/>
1029
+ </optional>
1030
+ </element>
1031
+ </define>
1032
+ <define name="copyright_scope">
1033
+ <element name="scope">
1034
+ <text/>
1005
1035
  </element>
1006
1036
  </define>
1007
1037
  <define name="from">
@@ -53,6 +53,14 @@
53
53
  <optional>
54
54
  <attribute name="alt"/>
55
55
  </optional>
56
+ <optional>
57
+ <attribute name="case">
58
+ <choice>
59
+ <value>capital</value>
60
+ <value>lowercase</value>
61
+ </choice>
62
+ </attribute>
63
+ </optional>
56
64
  <text/>
57
65
  </element>
58
66
  </define>
@@ -902,7 +910,15 @@
902
910
  <attribute name="id">
903
911
  <data type="ID"/>
904
912
  </attribute>
905
- <ref name="paragraph"/>
913
+ <oneOrMore>
914
+ <choice>
915
+ <ref name="paragraph"/>
916
+ <ref name="ul"/>
917
+ <ref name="ol"/>
918
+ <ref name="dl"/>
919
+ <ref name="formula"/>
920
+ </choice>
921
+ </oneOrMore>
906
922
  </element>
907
923
  </define>
908
924
  <define name="termexample">
@@ -138,6 +138,109 @@
138
138
  <ref name="Basic-Section"/>
139
139
  </element>
140
140
  </define>
141
+ <define name="Clause-Section">
142
+ <optional>
143
+ <attribute name="id">
144
+ <data type="ID"/>
145
+ </attribute>
146
+ </optional>
147
+ <optional>
148
+ <attribute name="language"/>
149
+ </optional>
150
+ <optional>
151
+ <attribute name="script"/>
152
+ </optional>
153
+ <optional>
154
+ <attribute name="inline-header">
155
+ <data type="boolean"/>
156
+ </attribute>
157
+ </optional>
158
+ <optional>
159
+ <attribute name="obligation">
160
+ <choice>
161
+ <value>normative</value>
162
+ <value>informative</value>
163
+ </choice>
164
+ </attribute>
165
+ </optional>
166
+ <optional>
167
+ <attribute name="unnumbered">
168
+ <data type="boolean"/>
169
+ </attribute>
170
+ </optional>
171
+ <optional>
172
+ <ref name="section-title"/>
173
+ </optional>
174
+ <group>
175
+ <group>
176
+ <zeroOrMore>
177
+ <ref name="BasicBlock"/>
178
+ </zeroOrMore>
179
+ <zeroOrMore>
180
+ <ref name="note"/>
181
+ </zeroOrMore>
182
+ </group>
183
+ <zeroOrMore>
184
+ <choice>
185
+ <ref name="clause-subsection"/>
186
+ <ref name="terms"/>
187
+ <ref name="definitions"/>
188
+ </choice>
189
+ </zeroOrMore>
190
+ </group>
191
+ </define>
192
+ <define name="Annex-Section">
193
+ <optional>
194
+ <attribute name="id">
195
+ <data type="ID"/>
196
+ </attribute>
197
+ </optional>
198
+ <optional>
199
+ <attribute name="language"/>
200
+ </optional>
201
+ <optional>
202
+ <attribute name="script"/>
203
+ </optional>
204
+ <optional>
205
+ <attribute name="inline-header">
206
+ <data type="boolean"/>
207
+ </attribute>
208
+ </optional>
209
+ <optional>
210
+ <attribute name="obligation">
211
+ <choice>
212
+ <value>normative</value>
213
+ <value>informative</value>
214
+ </choice>
215
+ </attribute>
216
+ </optional>
217
+ <optional>
218
+ <attribute name="unnumbered">
219
+ <data type="boolean"/>
220
+ </attribute>
221
+ </optional>
222
+ <optional>
223
+ <ref name="section-title"/>
224
+ </optional>
225
+ <group>
226
+ <group>
227
+ <zeroOrMore>
228
+ <ref name="BasicBlock"/>
229
+ </zeroOrMore>
230
+ <zeroOrMore>
231
+ <ref name="note"/>
232
+ </zeroOrMore>
233
+ </group>
234
+ <zeroOrMore>
235
+ <choice>
236
+ <ref name="annex-subsection"/>
237
+ <ref name="terms"/>
238
+ <ref name="definitions"/>
239
+ <ref name="references"/>
240
+ </choice>
241
+ </zeroOrMore>
242
+ </group>
243
+ </define>
141
244
  </include>
142
245
  <define name="session">
143
246
  <element name="session">
@@ -1,3 +1,3 @@
1
1
  module RelatonUn
2
- VERSION = "1.0.1".freeze
2
+ VERSION = "1.1.0".freeze
3
3
  end
@@ -43,7 +43,7 @@ Gem::Specification.new do |spec|
43
43
 
44
44
  spec.add_dependency "faraday"
45
45
  spec.add_dependency "http-cookie"
46
- spec.add_dependency "relaton-iso-bib", ">= 1.0.1"
46
+ spec.add_dependency "relaton-iso-bib", "~> 1.1.0"
47
47
  spec.add_dependency "unf_ext", ">= 0.0.7.7"
48
48
  end
49
49
  # rubocop:enable Metrics/BlockLength
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: relaton-un
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.1
4
+ version: 1.1.0
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-05-20 00:00:00.000000000 Z
11
+ date: 2020-06-03 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: debase
@@ -154,16 +154,16 @@ dependencies:
154
154
  name: relaton-iso-bib
155
155
  requirement: !ruby/object:Gem::Requirement
156
156
  requirements:
157
- - - ">="
157
+ - - "~>"
158
158
  - !ruby/object:Gem::Version
159
- version: 1.0.1
159
+ version: 1.1.0
160
160
  type: :runtime
161
161
  prerelease: false
162
162
  version_requirements: !ruby/object:Gem::Requirement
163
163
  requirements:
164
- - - ">="
164
+ - - "~>"
165
165
  - !ruby/object:Gem::Version
166
- version: 1.0.1
166
+ version: 1.1.0
167
167
  - !ruby/object:Gem::Dependency
168
168
  name: unf_ext
169
169
  requirement: !ruby/object:Gem::Requirement