relaton-gb 1.10.1 → 1.11.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/grammars/biblio.rng +24 -1
  3. data/grammars/gbstandard.rng +1 -1
  4. data/grammars/isodoc.rng +73 -3
  5. data/lib/relaton_gb/version.rb +1 -1
  6. data/lib/relaton_gb/xml_parser.rb +1 -1
  7. data/relaton_gb.gemspec +1 -1
  8. metadata +4 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 40dd731856bc78b4c9dc2acbae59a5d00f50c40ab3df0eedb6b81d57af01cb4f
4
- data.tar.gz: be2f6c6b2ebbf03262e6126cd4ee839c37baa7083be13ebbcd528e9553014dda
3
+ metadata.gz: 0470cbbe2153e0cc1a2db7896c448ea8e7be493bcecc269d3f41022fdca177f4
4
+ data.tar.gz: 119b0f70211a09d2b887ae84d5c33fd436aa59225fcdadd990ef680aa6046c86
5
5
  SHA512:
6
- metadata.gz: 15c28bc8e285f1a9187f60123cf53a9fd90f1dbbeeb2aa765fb18f22141c472f065e9eb435bdefa7943a01d6022d1969230fabbec76db13ea147c7a98c0cc302
7
- data.tar.gz: f8a7e8da5f9457b677e9dfa39e9046927cbf34c436a1bf73245c0ec1f451dd91e18a5bd838d82748bee750e438cd69c48a94a726b1c0c2e8583ddd78e0d32b10
6
+ metadata.gz: 326808b402ad9761c13694dc2a427ca259e28f76f905aa312a8e7d62d2aaf6c1f85bb679ebcc316559c676c9706ec96f2644b2a70388714ee5556eeab72f9665
7
+ data.tar.gz: ee7f27430114ac8dd44a604e7031fec267170e82e26e160d32525cecc7fae610be0ecc5478fc122f7c0ecc7ff562aeed8cabce6c6370d8a17799295270f95b60
data/grammars/biblio.rng CHANGED
@@ -677,6 +677,9 @@
677
677
  <zeroOrMore>
678
678
  <ref name="extent"/>
679
679
  </zeroOrMore>
680
+ <optional>
681
+ <ref name="bibliographic_size"/>
682
+ </optional>
680
683
  <zeroOrMore>
681
684
  <ref name="accesslocation"/>
682
685
  </zeroOrMore>
@@ -922,9 +925,29 @@
922
925
  <text/>
923
926
  </element>
924
927
  </define>
928
+ <define name="sizevalue">
929
+ <element name="value">
930
+ <attribute name="type"/>
931
+ <text/>
932
+ </element>
933
+ </define>
934
+ <define name="bibliographic_size">
935
+ <element name="size">
936
+ <oneOrMore>
937
+ <ref name="sizevalue"/>
938
+ </oneOrMore>
939
+ </element>
940
+ </define>
925
941
  <define name="extent">
926
942
  <element name="extent">
927
- <ref name="BibItemLocality"/>
943
+ <choice>
944
+ <zeroOrMore>
945
+ <ref name="locality"/>
946
+ </zeroOrMore>
947
+ <zeroOrMore>
948
+ <ref name="localityStack"/>
949
+ </zeroOrMore>
950
+ </choice>
928
951
  </element>
929
952
  </define>
930
953
  <define name="series">
data/grammars/gbstandard.rng CHANGED
@@ -44,7 +44,7 @@
44
44
  <optional>
45
45
  <ref name="termdomain"/>
46
46
  </optional>
47
- <!-- <ref name="definition"/> -->
47
+ <ref name="termdefinition"/>
48
48
  <zeroOrMore>
49
49
  <ref name="termnote"/>
50
50
  </zeroOrMore>
data/grammars/isodoc.rng CHANGED
@@ -152,9 +152,7 @@
152
152
  <data type="boolean"/>
153
153
  </attribute>
154
154
  </optional>
155
- <oneOrMore>
156
- <ref name="PureTextElement"/>
157
- </oneOrMore>
155
+ <ref name="XrefBody"/>
158
156
  </element>
159
157
  </define>
160
158
  <define name="erefType">
@@ -188,6 +186,42 @@
188
186
  <ref name="PureTextElement"/>
189
187
  </oneOrMore>
190
188
  </define>
189
+ <define name="localityStack">
190
+ <element name="localityStack">
191
+ <optional>
192
+ <attribute name="connective">
193
+ <choice>
194
+ <value>and</value>
195
+ <value>or</value>
196
+ <value>from</value>
197
+ <value>to</value>
198
+ <value/>
199
+ </choice>
200
+ </attribute>
201
+ </optional>
202
+ <zeroOrMore>
203
+ <ref name="locality"/>
204
+ </zeroOrMore>
205
+ </element>
206
+ </define>
207
+ <define name="sourceLocalityStack">
208
+ <element name="sourceLocalityStack">
209
+ <optional>
210
+ <attribute name="connective">
211
+ <choice>
212
+ <value>and</value>
213
+ <value>or</value>
214
+ <value>from</value>
215
+ <value>to</value>
216
+ <value/>
217
+ </choice>
218
+ </attribute>
219
+ </optional>
220
+ <zeroOrMore>
221
+ <ref name="sourceLocality"/>
222
+ </zeroOrMore>
223
+ </element>
224
+ </define>
191
225
  <define name="ul">
192
226
  <element name="ul">
193
227
  <attribute name="id">
@@ -1098,6 +1132,16 @@
1098
1132
  </define>
1099
1133
  </include>
1100
1134
  <!-- end overrides -->
1135
+ <define name="image" combine="choice">
1136
+ <element name="svg">
1137
+ <oneOrMore>
1138
+ <choice>
1139
+ <text/>
1140
+ <ref name="AnyElement"/>
1141
+ </choice>
1142
+ </oneOrMore>
1143
+ </element>
1144
+ </define>
1101
1145
  <define name="MultilingualRenderingType">
1102
1146
  <choice>
1103
1147
  <value>common</value>
@@ -2631,4 +2675,30 @@
2631
2675
  </zeroOrMore>
2632
2676
  </element>
2633
2677
  </define>
2678
+ <define name="XrefBody">
2679
+ <zeroOrMore>
2680
+ <ref name="XrefTarget"/>
2681
+ </zeroOrMore>
2682
+ <oneOrMore>
2683
+ <ref name="PureTextElement"/>
2684
+ </oneOrMore>
2685
+ </define>
2686
+ <define name="XrefTarget">
2687
+ <element name="location">
2688
+ <attribute name="target">
2689
+ <data type="string">
2690
+ <param name="pattern">\i\c*|\c+#\c+</param>
2691
+ </data>
2692
+ </attribute>
2693
+ <attribute name="connective">
2694
+ <choice>
2695
+ <value>and</value>
2696
+ <value>or</value>
2697
+ <value>from</value>
2698
+ <value>to</value>
2699
+ <value/>
2700
+ </choice>
2701
+ </attribute>
2702
+ </element>
2703
+ </define>
2634
2704
  </grammar>
data/lib/relaton_gb/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module RelatonGb
4
- VERSION = "1.10.1"
4
+ VERSION = "1.11.0"
5
5
  end
data/lib/relaton_gb/xml_parser.rb CHANGED
@@ -9,7 +9,7 @@ module RelatonGb
9
9
  # @param item_hash [Hash]
10
10
  # @return [RelatonGb::GbBibliographicItem]
11
11
  def bib_item(item_hash)
12
- GbBibliographicItem.new **item_hash
12
+ GbBibliographicItem.new(**item_hash)
13
13
  end
14
14
 
15
15
  def item_data(gbitem)
data/relaton_gb.gemspec CHANGED
@@ -35,5 +35,5 @@ Gem::Specification.new do |spec|
35
35
 
36
36
  spec.add_dependency "cnccs", "~> 0.1.1"
37
37
  spec.add_dependency "gb-agencies", "~> 0.0.1"
38
- spec.add_dependency "relaton-iso-bib", "~> 1.10.1"
38
+ spec.add_dependency "relaton-iso-bib", "~> 1.11.0"
39
39
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: relaton-gb
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.10.1
4
+ version: 1.11.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: 2022-02-09 00:00:00.000000000 Z
11
+ date: 2022-04-10 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: equivalent-xml
@@ -156,14 +156,14 @@ dependencies:
156
156
  requirements:
157
157
  - - "~>"
158
158
  - !ruby/object:Gem::Version
159
- version: 1.10.1
159
+ version: 1.11.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.10.1
166
+ version: 1.11.0
167
167
  description: 'RelatonGb: retrieve Chinese GB Standards for bibliographic use using
168
168
  the BibliographicItem model.'
169
169
  email: