scripref 0.13.0 → 0.14.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. checksums.yaml +4 -4
  2. data/Changelog +3 -0
  3. data/lib/scripref.rb +1 -1
  4. data/lib/scripref/english.rb +1 -1
  5. data/lib/scripref/german.rb +1 -1
  6. data/regtest/parser.rb +1 -1
  7. data/regtest/parser.yml +59 -59
  8. data/regtest/processor.rb +1 -1
  9. data/regtest/processor.yml +66 -66
  10. data/scripref.gemspec +3 -3
  11. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: aa9e6be87d748d3bd5a78a583cd7cffe7785548debe997f15478da1d19454b2d
4
- data.tar.gz: c1cd0125bf8fdee4befaf21409746f1f71bbcc7931e67d91f4abfb68d67dd624
3
+ metadata.gz: c76e0fe6dca4fc5a1eb156fcf059d6b78d1ee9e57305809152e06173de352fb5
4
+ data.tar.gz: 76cf169841ed7aa6ff5bfee18c90c675ca189ceaae113780c6404184e4cce20e
5
5
  SHA512:
6
- metadata.gz: 813b10551e8a03e2c8cf0419316372a304d080b987adaaa0f5fe8e8ab80edb67c150a49abeea26db81a10a8b6e72f7a873674ff4773ac3368cb5c1c5d03007a2
7
- data.tar.gz: a336bb178df986af14dc04e90619680c9853dd8e12433cd0b6c070486d3a565e50394c3d069421eb1d5a2db82974b0da8cea70016525c48da09825453e4619df
6
+ metadata.gz: 3f074daea6bacfc597166ffe2b7c52f1046e58d88131cb016beef77e8097acc407940571ba8e798db7f8a3aee3bc56c2e255b4732b97e7fc430d0440364dec3a
7
+ data.tar.gz: 412f3376fc21a7c6cad686b94807073a44fabe0eb381b6c591a58ca7c179a522bdfcea34c19ac4d3448130cf3dab54bcdc9d00ebac1c5a6c2d0664564256b28e
data/Changelog CHANGED
@@ -1,3 +1,6 @@
1
+ 0.14.0
2
+ Allow 'c' as verse add-on.
3
+
1
4
  0.13.0
2
5
  Use keyword arguments for Passage.
3
6
  Adapt regular expression to match multiple lines.
data/lib/scripref.rb CHANGED
@@ -3,7 +3,7 @@ require 'delegate'
3
3
 
4
4
  module Scripref
5
5
 
6
- VERSION = '0.13.0'
6
+ VERSION = '0.14.0'
7
7
 
8
8
  autoload :Bookname, 'scripref/bookname'
9
9
  autoload :English, 'scripref/english'
data/lib/scripref/english.rb CHANGED
@@ -58,7 +58,7 @@ module Scripref
58
58
  VERSE_SEPARATOR = ','
59
59
 
60
60
  # Regular expression to match addons for a verse.
61
- VERSE_ADDON_RE = /[ab]\s*/o
61
+ VERSE_ADDON_RE = /[abc]\s*/o
62
62
 
63
63
  # Postfix for one following verse
64
64
  POSTFIX_ONE_FOLLOWING_VERSE = 'f'
data/lib/scripref/german.rb CHANGED
@@ -54,7 +54,7 @@ module Scripref
54
54
  VERSE_SEPARATOR = '.'
55
55
 
56
56
  # Regular expression to match addons for a verse.
57
- VERSE_ADDON_RE = /[ab]\b\s*/o
57
+ VERSE_ADDON_RE = /[abc]\b\s*/o
58
58
 
59
59
  # Postfix for one following verse
60
60
  POSTFIX_ONE_FOLLOWING_VERSE = 'f'
data/regtest/parser.rb CHANGED
@@ -10,7 +10,7 @@ def s text
10
10
  end
11
11
  end
12
12
 
13
- text = 'Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a'
13
+ text = 'Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3c.18b-21a'
14
14
 
15
15
  s text
16
16
 
data/regtest/parser.yml CHANGED
@@ -1,5 +1,5 @@
1
1
  ---
2
- sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
2
+ sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3c.18b-21a
3
3
  result:
4
4
  - :text: Ruth 2,1a-11
5
5
  :b1: 8
@@ -51,14 +51,14 @@ result:
51
51
  :a1:
52
52
  :a2:
53
53
  - "; "
54
- - :text: 5,3a
54
+ - :text: 5,3c
55
55
  :b1: 41
56
56
  :c1: 5
57
57
  :v1: 3
58
58
  :b2: 41
59
59
  :c2: 5
60
60
  :v2: 3
61
- :a1: :a
61
+ :a1: :c
62
62
  :a2:
63
63
  - "."
64
64
  - :text: 18b-21a
@@ -71,43 +71,43 @@ result:
71
71
  :a1: :b
72
72
  :a2: :a
73
73
  ---
74
- sample: " 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a"
74
+ sample: " 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3c.18b-21a"
75
75
  exception: |-
76
76
  Book expected!
77
- 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
77
+ 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3c.18b-21a
78
78
  ^
79
79
  ---
80
- sample: Ruth ,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
80
+ sample: Ruth ,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3c.18b-21a
81
81
  exception: |-
82
82
  EOS or hyphen and book or chapter expected!
83
- Ruth ,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
83
+ Ruth ,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3c.18b-21a
84
84
  ^
85
85
  ---
86
- sample: Ruth 21a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
86
+ sample: Ruth 21a-11.15a; 3,7b.9-12b; Markus 4; 5,3c.18b-21a
87
87
  exception: |-
88
88
  EOS or chapter verse separator or hyphen and book or hyphen and chapter or passage separator and book or passage separator and chapter expected!
89
- Ruth 21a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
89
+ Ruth 21a-11.15a; 3,7b.9-12b; Markus 4; 5,3c.18b-21a
90
90
  ^
91
91
  ---
92
- sample: Ruth 2,-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
92
+ sample: Ruth 2,-11.15a; 3,7b.9-12b; Markus 4; 5,3c.18b-21a
93
93
  exception: |-
94
94
  Verse expected!
95
- Ruth 2,-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
95
+ Ruth 2,-11.15a; 3,7b.9-12b; Markus 4; 5,3c.18b-21a
96
96
  ^
97
97
  ---
98
- sample: Ruth 2,1a11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
98
+ sample: Ruth 2,1a11.15a; 3,7b.9-12b; Markus 4; 5,3c.18b-21a
99
99
  exception: |-
100
100
  EOS or passage separator or verse separator or hyphen expected!
101
- Ruth 2,1a11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
101
+ Ruth 2,1a11.15a; 3,7b.9-12b; Markus 4; 5,3c.18b-21a
102
102
  ^
103
103
  ---
104
- sample: Ruth 2,1a-.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
104
+ sample: Ruth 2,1a-.15a; 3,7b.9-12b; Markus 4; 5,3c.18b-21a
105
105
  exception: |-
106
106
  Chapter or verse expected!
107
- Ruth 2,1a-.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
107
+ Ruth 2,1a-.15a; 3,7b.9-12b; Markus 4; 5,3c.18b-21a
108
108
  ^
109
109
  ---
110
- sample: Ruth 2,1a-1115a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
110
+ sample: Ruth 2,1a-1115a; 3,7b.9-12b; Markus 4; 5,3c.18b-21a
111
111
  result:
112
112
  - :text: Ruth 2,1a-1115a
113
113
  :b1: 8
@@ -149,14 +149,14 @@ result:
149
149
  :a1:
150
150
  :a2:
151
151
  - "; "
152
- - :text: 5,3a
152
+ - :text: 5,3c
153
153
  :b1: 41
154
154
  :c1: 5
155
155
  :v1: 3
156
156
  :b2: 41
157
157
  :c2: 5
158
158
  :v2: 3
159
- :a1: :a
159
+ :a1: :c
160
160
  :a2:
161
161
  - "."
162
162
  - :text: 18b-21a
@@ -169,49 +169,49 @@ result:
169
169
  :a1: :b
170
170
  :a2: :a
171
171
  ---
172
- sample: Ruth 2,1a-11.; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
172
+ sample: Ruth 2,1a-11.; 3,7b.9-12b; Markus 4; 5,3c.18b-21a
173
173
  exception: |-
174
174
  Verse expected!
175
- Ruth 2,1a-11.; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
175
+ Ruth 2,1a-11.; 3,7b.9-12b; Markus 4; 5,3c.18b-21a
176
176
  ^
177
177
  ---
178
- sample: Ruth 2,1a-11.15a3,7b.9-12b; Markus 4; 5,3a.18b-21a
178
+ sample: Ruth 2,1a-11.15a3,7b.9-12b; Markus 4; 5,3c.18b-21a
179
179
  exception: |-
180
180
  EOS or passage separator or verse separator or hyphen expected!
181
- Ruth 2,1a-11.15a3,7b.9-12b; Markus 4; 5,3a.18b-21a
181
+ Ruth 2,1a-11.15a3,7b.9-12b; Markus 4; 5,3c.18b-21a
182
182
  ^
183
183
  ---
184
- sample: Ruth 2,1a-11.15a; ,7b.9-12b; Markus 4; 5,3a.18b-21a
184
+ sample: Ruth 2,1a-11.15a; ,7b.9-12b; Markus 4; 5,3c.18b-21a
185
185
  exception: |-
186
186
  Book or chapter expected!
187
- Ruth 2,1a-11.15a; ,7b.9-12b; Markus 4; 5,3a.18b-21a
187
+ Ruth 2,1a-11.15a; ,7b.9-12b; Markus 4; 5,3c.18b-21a
188
188
  ^
189
189
  ---
190
- sample: Ruth 2,1a-11.15a; 37b.9-12b; Markus 4; 5,3a.18b-21a
190
+ sample: Ruth 2,1a-11.15a; 37b.9-12b; Markus 4; 5,3c.18b-21a
191
191
  exception: |-
192
192
  EOS or chapter verse separator or hyphen and book or hyphen and chapter or passage separator and book or passage separator and chapter expected!
193
- Ruth 2,1a-11.15a; 37b.9-12b; Markus 4; 5,3a.18b-21a
193
+ Ruth 2,1a-11.15a; 37b.9-12b; Markus 4; 5,3c.18b-21a
194
194
  ^
195
195
  ---
196
- sample: Ruth 2,1a-11.15a; 3,.9-12b; Markus 4; 5,3a.18b-21a
196
+ sample: Ruth 2,1a-11.15a; 3,.9-12b; Markus 4; 5,3c.18b-21a
197
197
  exception: |-
198
198
  Verse expected!
199
- Ruth 2,1a-11.15a; 3,.9-12b; Markus 4; 5,3a.18b-21a
199
+ Ruth 2,1a-11.15a; 3,.9-12b; Markus 4; 5,3c.18b-21a
200
200
  ^
201
201
  ---
202
- sample: Ruth 2,1a-11.15a; 3,7b9-12b; Markus 4; 5,3a.18b-21a
202
+ sample: Ruth 2,1a-11.15a; 3,7b9-12b; Markus 4; 5,3c.18b-21a
203
203
  exception: |-
204
204
  EOS or passage separator or verse separator or hyphen expected!
205
- Ruth 2,1a-11.15a; 3,7b9-12b; Markus 4; 5,3a.18b-21a
205
+ Ruth 2,1a-11.15a; 3,7b9-12b; Markus 4; 5,3c.18b-21a
206
206
  ^
207
207
  ---
208
- sample: Ruth 2,1a-11.15a; 3,7b.-12b; Markus 4; 5,3a.18b-21a
208
+ sample: Ruth 2,1a-11.15a; 3,7b.-12b; Markus 4; 5,3c.18b-21a
209
209
  exception: |-
210
210
  Verse expected!
211
- Ruth 2,1a-11.15a; 3,7b.-12b; Markus 4; 5,3a.18b-21a
211
+ Ruth 2,1a-11.15a; 3,7b.-12b; Markus 4; 5,3c.18b-21a
212
212
  ^
213
213
  ---
214
- sample: Ruth 2,1a-11.15a; 3,7b.912b; Markus 4; 5,3a.18b-21a
214
+ sample: Ruth 2,1a-11.15a; 3,7b.912b; Markus 4; 5,3c.18b-21a
215
215
  result:
216
216
  - :text: Ruth 2,1a-11
217
217
  :b1: 8
@@ -263,14 +263,14 @@ result:
263
263
  :a1:
264
264
  :a2:
265
265
  - "; "
266
- - :text: 5,3a
266
+ - :text: 5,3c
267
267
  :b1: 41
268
268
  :c1: 5
269
269
  :v1: 3
270
270
  :b2: 41
271
271
  :c2: 5
272
272
  :v2: 3
273
- :a1: :a
273
+ :a1: :c
274
274
  :a2:
275
275
  - "."
276
276
  - :text: 18b-21a
@@ -283,19 +283,19 @@ result:
283
283
  :a1: :b
284
284
  :a2: :a
285
285
  ---
286
- sample: Ruth 2,1a-11.15a; 3,7b.9-; Markus 4; 5,3a.18b-21a
286
+ sample: Ruth 2,1a-11.15a; 3,7b.9-; Markus 4; 5,3c.18b-21a
287
287
  exception: |-
288
288
  Chapter or verse expected!
289
- Ruth 2,1a-11.15a; 3,7b.9-; Markus 4; 5,3a.18b-21a
289
+ Ruth 2,1a-11.15a; 3,7b.9-; Markus 4; 5,3c.18b-21a
290
290
  ^
291
291
  ---
292
- sample: Ruth 2,1a-11.15a; 3,7b.9-12bMarkus 4; 5,3a.18b-21a
292
+ sample: Ruth 2,1a-11.15a; 3,7b.9-12bMarkus 4; 5,3c.18b-21a
293
293
  exception: |-
294
294
  EOS or verse separator or passage separator expected!
295
- Ruth 2,1a-11.15a; 3,7b.9-12bMarkus 4; 5,3a.18b-21a
295
+ Ruth 2,1a-11.15a; 3,7b.9-12bMarkus 4; 5,3c.18b-21a
296
296
  ^
297
297
  ---
298
- sample: Ruth 2,1a-11.15a; 3,7b.9-12b; 4; 5,3a.18b-21a
298
+ sample: Ruth 2,1a-11.15a; 3,7b.9-12b; 4; 5,3c.18b-21a
299
299
  result:
300
300
  - :text: Ruth 2,1a-11
301
301
  :b1: 8
@@ -347,14 +347,14 @@ result:
347
347
  :a1:
348
348
  :a2:
349
349
  - "; "
350
- - :text: 5,3a
350
+ - :text: 5,3c
351
351
  :b1: 8
352
352
  :c1: 5
353
353
  :v1: 3
354
354
  :b2: 8
355
355
  :c2: 5
356
356
  :v2: 3
357
- :a1: :a
357
+ :a1: :c
358
358
  :a2:
359
359
  - "."
360
360
  - :text: 18b-21a
@@ -367,13 +367,13 @@ result:
367
367
  :a1: :b
368
368
  :a2: :a
369
369
  ---
370
- sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus ; 5,3a.18b-21a
370
+ sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus ; 5,3c.18b-21a
371
371
  exception: |-
372
372
  EOS or book expected!
373
- Ruth 2,1a-11.15a; 3,7b.9-12b; Markus ; 5,3a.18b-21a
373
+ Ruth 2,1a-11.15a; 3,7b.9-12b; Markus ; 5,3c.18b-21a
374
374
  ^
375
375
  ---
376
- sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 45,3a.18b-21a
376
+ sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 45,3c.18b-21a
377
377
  result:
378
378
  - :text: Ruth 2,1a-11
379
379
  :b1: 8
@@ -415,14 +415,14 @@ result:
415
415
  :a1:
416
416
  :a2: :b
417
417
  - "; "
418
- - :text: Markus 45,3a
418
+ - :text: Markus 45,3c
419
419
  :b1: 41
420
420
  :c1: 45
421
421
  :v1: 3
422
422
  :b2: 41
423
423
  :c2: 45
424
424
  :v2: 3
425
- :a1: :a
425
+ :a1: :c
426
426
  :a2:
427
427
  - "."
428
428
  - :text: 18b-21a
@@ -435,16 +435,16 @@ result:
435
435
  :a1: :b
436
436
  :a2: :a
437
437
  ---
438
- sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; ,3a.18b-21a
438
+ sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; ,3c.18b-21a
439
439
  exception: |-
440
440
  Book or chapter expected!
441
- Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; ,3a.18b-21a
441
+ Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; ,3c.18b-21a
442
442
  ^
443
443
  ---
444
- sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 53a.18b-21a
444
+ sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 53c.18b-21a
445
445
  exception: |-
446
446
  EOS or chapter verse separator or hyphen and book or hyphen and chapter or passage separator and book or passage separator and chapter expected!
447
- Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 53a.18b-21a
447
+ Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 53c.18b-21a
448
448
  ^
449
449
  ---
450
450
  sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,.18b-21a
@@ -453,26 +453,26 @@ exception: |-
453
453
  Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,.18b-21a
454
454
  ^
455
455
  ---
456
- sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a18b-21a
456
+ sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3c18b-21a
457
457
  exception: |-
458
458
  EOS or passage separator or verse separator or hyphen expected!
459
- Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a18b-21a
459
+ Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3c18b-21a
460
460
  ^
461
461
  ---
462
- sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.-21a
462
+ sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3c.-21a
463
463
  exception: |-
464
464
  Verse expected!
465
- Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.-21a
465
+ Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3c.-21a
466
466
  ^
467
467
  ---
468
- sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b21a
468
+ sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3c.18b21a
469
469
  exception: |-
470
470
  EOS or passage separator or verse separator or hyphen expected!
471
- Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b21a
471
+ Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3c.18b21a
472
472
  ^
473
473
  ---
474
- sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-
474
+ sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3c.18b-
475
475
  exception: |-
476
476
  Chapter or verse expected!
477
- Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-
477
+ Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3c.18b-
478
478
  ^
data/regtest/processor.rb CHANGED
@@ -10,7 +10,7 @@ def s text
10
10
  end
11
11
  end
12
12
 
13
- text = 'Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a'
13
+ text = 'Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3c.18b-21a'
14
14
 
15
15
  s text
16
16
 
data/regtest/processor.yml CHANGED
@@ -1,5 +1,5 @@
1
1
  ---
2
- sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
2
+ sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3c.18b-21a
3
3
  result:
4
4
  - - !ruby/struct:Scripref::Passage
5
5
  text: Ruth 2,1a-11
@@ -62,14 +62,14 @@ result:
62
62
  - !ruby/object:Scripref::PassSep
63
63
  delegate_dc_obj: "; "
64
64
  - !ruby/struct:Scripref::Passage
65
- text: 5,3a
65
+ text: 5,3c
66
66
  b1: 41
67
67
  c1: 5
68
68
  v1: 3
69
69
  b2: 41
70
70
  c2: 5
71
71
  v2: 3
72
- a1: :a
72
+ a1: :c
73
73
  a2:
74
74
  - !ruby/object:Scripref::VerseSep
75
75
  delegate_dc_obj: "."
@@ -84,7 +84,7 @@ result:
84
84
  a1: :b
85
85
  a2: :a
86
86
  ---
87
- sample: " 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a"
87
+ sample: " 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3c.18b-21a"
88
88
  result:
89
89
  - " 2,1a-11.15a; 3,7b.9-12b; "
90
90
  - - !ruby/struct:Scripref::Passage
@@ -100,14 +100,14 @@ result:
100
100
  - !ruby/object:Scripref::PassSep
101
101
  delegate_dc_obj: "; "
102
102
  - !ruby/struct:Scripref::Passage
103
- text: 5,3a
103
+ text: 5,3c
104
104
  b1: 41
105
105
  c1: 5
106
106
  v1: 3
107
107
  b2: 41
108
108
  c2: 5
109
109
  v2: 3
110
- a1: :a
110
+ a1: :c
111
111
  a2:
112
112
  - !ruby/object:Scripref::VerseSep
113
113
  delegate_dc_obj: "."
@@ -122,7 +122,7 @@ result:
122
122
  a1: :b
123
123
  a2: :a
124
124
  ---
125
- sample: Ruth ,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
125
+ sample: Ruth ,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3c.18b-21a
126
126
  result:
127
127
  - 'Ruth ,1a-11.15a; 3,7b.9-12b; '
128
128
  - - !ruby/struct:Scripref::Passage
@@ -138,14 +138,14 @@ result:
138
138
  - !ruby/object:Scripref::PassSep
139
139
  delegate_dc_obj: "; "
140
140
  - !ruby/struct:Scripref::Passage
141
- text: 5,3a
141
+ text: 5,3c
142
142
  b1: 41
143
143
  c1: 5
144
144
  v1: 3
145
145
  b2: 41
146
146
  c2: 5
147
147
  v2: 3
148
- a1: :a
148
+ a1: :c
149
149
  a2:
150
150
  - !ruby/object:Scripref::VerseSep
151
151
  delegate_dc_obj: "."
@@ -160,19 +160,19 @@ result:
160
160
  a1: :b
161
161
  a2: :a
162
162
  ---
163
- sample: Ruth 21a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
163
+ sample: Ruth 21a-11.15a; 3,7b.9-12b; Markus 4; 5,3c.18b-21a
164
164
  exception: |-
165
165
  EOS or chapter verse separator or hyphen and book or hyphen and chapter or passage separator and book or passage separator and chapter expected!
166
- Ruth 21a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
166
+ Ruth 21a-11.15a; 3,7b.9-12b; Markus 4; 5,3c.18b-21a
167
167
  ^
168
168
  ---
169
- sample: Ruth 2,-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
169
+ sample: Ruth 2,-11.15a; 3,7b.9-12b; Markus 4; 5,3c.18b-21a
170
170
  exception: |-
171
171
  Verse expected!
172
- Ruth 2,-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
172
+ Ruth 2,-11.15a; 3,7b.9-12b; Markus 4; 5,3c.18b-21a
173
173
  ^
174
174
  ---
175
- sample: Ruth 2,1a11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
175
+ sample: Ruth 2,1a11.15a; 3,7b.9-12b; Markus 4; 5,3c.18b-21a
176
176
  result:
177
177
  - - !ruby/struct:Scripref::Passage
178
178
  text: Ruth 2,1
@@ -198,14 +198,14 @@ result:
198
198
  - !ruby/object:Scripref::PassSep
199
199
  delegate_dc_obj: "; "
200
200
  - !ruby/struct:Scripref::Passage
201
- text: 5,3a
201
+ text: 5,3c
202
202
  b1: 41
203
203
  c1: 5
204
204
  v1: 3
205
205
  b2: 41
206
206
  c2: 5
207
207
  v2: 3
208
- a1: :a
208
+ a1: :c
209
209
  a2:
210
210
  - !ruby/object:Scripref::VerseSep
211
211
  delegate_dc_obj: "."
@@ -220,13 +220,13 @@ result:
220
220
  a1: :b
221
221
  a2: :a
222
222
  ---
223
- sample: Ruth 2,1a-.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
223
+ sample: Ruth 2,1a-.15a; 3,7b.9-12b; Markus 4; 5,3c.18b-21a
224
224
  exception: |-
225
225
  Chapter or verse expected!
226
- Ruth 2,1a-.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
226
+ Ruth 2,1a-.15a; 3,7b.9-12b; Markus 4; 5,3c.18b-21a
227
227
  ^
228
228
  ---
229
- sample: Ruth 2,1a-1115a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
229
+ sample: Ruth 2,1a-1115a; 3,7b.9-12b; Markus 4; 5,3c.18b-21a
230
230
  result:
231
231
  - - !ruby/struct:Scripref::Passage
232
232
  text: Ruth 2,1a-1115a
@@ -277,14 +277,14 @@ result:
277
277
  - !ruby/object:Scripref::PassSep
278
278
  delegate_dc_obj: "; "
279
279
  - !ruby/struct:Scripref::Passage
280
- text: 5,3a
280
+ text: 5,3c
281
281
  b1: 41
282
282
  c1: 5
283
283
  v1: 3
284
284
  b2: 41
285
285
  c2: 5
286
286
  v2: 3
287
- a1: :a
287
+ a1: :c
288
288
  a2:
289
289
  - !ruby/object:Scripref::VerseSep
290
290
  delegate_dc_obj: "."
@@ -299,13 +299,13 @@ result:
299
299
  a1: :b
300
300
  a2: :a
301
301
  ---
302
- sample: Ruth 2,1a-11.; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
302
+ sample: Ruth 2,1a-11.; 3,7b.9-12b; Markus 4; 5,3c.18b-21a
303
303
  exception: |-
304
304
  Verse expected!
305
- Ruth 2,1a-11.; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
305
+ Ruth 2,1a-11.; 3,7b.9-12b; Markus 4; 5,3c.18b-21a
306
306
  ^
307
307
  ---
308
- sample: Ruth 2,1a-11.15a3,7b.9-12b; Markus 4; 5,3a.18b-21a
308
+ sample: Ruth 2,1a-11.15a3,7b.9-12b; Markus 4; 5,3c.18b-21a
309
309
  result:
310
310
  - - !ruby/struct:Scripref::Passage
311
311
  text: Ruth 2,1a-11
@@ -343,14 +343,14 @@ result:
343
343
  - !ruby/object:Scripref::PassSep
344
344
  delegate_dc_obj: "; "
345
345
  - !ruby/struct:Scripref::Passage
346
- text: 5,3a
346
+ text: 5,3c
347
347
  b1: 41
348
348
  c1: 5
349
349
  v1: 3
350
350
  b2: 41
351
351
  c2: 5
352
352
  v2: 3
353
- a1: :a
353
+ a1: :c
354
354
  a2:
355
355
  - !ruby/object:Scripref::VerseSep
356
356
  delegate_dc_obj: "."
@@ -365,25 +365,25 @@ result:
365
365
  a1: :b
366
366
  a2: :a
367
367
  ---
368
- sample: Ruth 2,1a-11.15a; ,7b.9-12b; Markus 4; 5,3a.18b-21a
368
+ sample: Ruth 2,1a-11.15a; ,7b.9-12b; Markus 4; 5,3c.18b-21a
369
369
  exception: |-
370
370
  Book or chapter expected!
371
- Ruth 2,1a-11.15a; ,7b.9-12b; Markus 4; 5,3a.18b-21a
371
+ Ruth 2,1a-11.15a; ,7b.9-12b; Markus 4; 5,3c.18b-21a
372
372
  ^
373
373
  ---
374
- sample: Ruth 2,1a-11.15a; 37b.9-12b; Markus 4; 5,3a.18b-21a
374
+ sample: Ruth 2,1a-11.15a; 37b.9-12b; Markus 4; 5,3c.18b-21a
375
375
  exception: |-
376
376
  EOS or chapter verse separator or hyphen and book or hyphen and chapter or passage separator and book or passage separator and chapter expected!
377
- Ruth 2,1a-11.15a; 37b.9-12b; Markus 4; 5,3a.18b-21a
377
+ Ruth 2,1a-11.15a; 37b.9-12b; Markus 4; 5,3c.18b-21a
378
378
  ^
379
379
  ---
380
- sample: Ruth 2,1a-11.15a; 3,.9-12b; Markus 4; 5,3a.18b-21a
380
+ sample: Ruth 2,1a-11.15a; 3,.9-12b; Markus 4; 5,3c.18b-21a
381
381
  exception: |-
382
382
  Verse expected!
383
- Ruth 2,1a-11.15a; 3,.9-12b; Markus 4; 5,3a.18b-21a
383
+ Ruth 2,1a-11.15a; 3,.9-12b; Markus 4; 5,3c.18b-21a
384
384
  ^
385
385
  ---
386
- sample: Ruth 2,1a-11.15a; 3,7b9-12b; Markus 4; 5,3a.18b-21a
386
+ sample: Ruth 2,1a-11.15a; 3,7b9-12b; Markus 4; 5,3c.18b-21a
387
387
  result:
388
388
  - - !ruby/struct:Scripref::Passage
389
389
  text: Ruth 2,1a-11
@@ -433,14 +433,14 @@ result:
433
433
  - !ruby/object:Scripref::PassSep
434
434
  delegate_dc_obj: "; "
435
435
  - !ruby/struct:Scripref::Passage
436
- text: 5,3a
436
+ text: 5,3c
437
437
  b1: 41
438
438
  c1: 5
439
439
  v1: 3
440
440
  b2: 41
441
441
  c2: 5
442
442
  v2: 3
443
- a1: :a
443
+ a1: :c
444
444
  a2:
445
445
  - !ruby/object:Scripref::VerseSep
446
446
  delegate_dc_obj: "."
@@ -455,13 +455,13 @@ result:
455
455
  a1: :b
456
456
  a2: :a
457
457
  ---
458
- sample: Ruth 2,1a-11.15a; 3,7b.-12b; Markus 4; 5,3a.18b-21a
458
+ sample: Ruth 2,1a-11.15a; 3,7b.-12b; Markus 4; 5,3c.18b-21a
459
459
  exception: |-
460
460
  Verse expected!
461
- Ruth 2,1a-11.15a; 3,7b.-12b; Markus 4; 5,3a.18b-21a
461
+ Ruth 2,1a-11.15a; 3,7b.-12b; Markus 4; 5,3c.18b-21a
462
462
  ^
463
463
  ---
464
- sample: Ruth 2,1a-11.15a; 3,7b.912b; Markus 4; 5,3a.18b-21a
464
+ sample: Ruth 2,1a-11.15a; 3,7b.912b; Markus 4; 5,3c.18b-21a
465
465
  result:
466
466
  - - !ruby/struct:Scripref::Passage
467
467
  text: Ruth 2,1a-11
@@ -524,14 +524,14 @@ result:
524
524
  - !ruby/object:Scripref::PassSep
525
525
  delegate_dc_obj: "; "
526
526
  - !ruby/struct:Scripref::Passage
527
- text: 5,3a
527
+ text: 5,3c
528
528
  b1: 41
529
529
  c1: 5
530
530
  v1: 3
531
531
  b2: 41
532
532
  c2: 5
533
533
  v2: 3
534
- a1: :a
534
+ a1: :c
535
535
  a2:
536
536
  - !ruby/object:Scripref::VerseSep
537
537
  delegate_dc_obj: "."
@@ -546,13 +546,13 @@ result:
546
546
  a1: :b
547
547
  a2: :a
548
548
  ---
549
- sample: Ruth 2,1a-11.15a; 3,7b.9-; Markus 4; 5,3a.18b-21a
549
+ sample: Ruth 2,1a-11.15a; 3,7b.9-; Markus 4; 5,3c.18b-21a
550
550
  exception: |-
551
551
  Chapter or verse expected!
552
- Ruth 2,1a-11.15a; 3,7b.9-; Markus 4; 5,3a.18b-21a
552
+ Ruth 2,1a-11.15a; 3,7b.9-; Markus 4; 5,3c.18b-21a
553
553
  ^
554
554
  ---
555
- sample: Ruth 2,1a-11.15a; 3,7b.9-12bMarkus 4; 5,3a.18b-21a
555
+ sample: Ruth 2,1a-11.15a; 3,7b.9-12bMarkus 4; 5,3c.18b-21a
556
556
  result:
557
557
  - - !ruby/struct:Scripref::Passage
558
558
  text: Ruth 2,1a-11
@@ -600,9 +600,9 @@ result:
600
600
  v2: 12
601
601
  a1:
602
602
  a2:
603
- - bMarkus 4; 5,3a.18b-21a
603
+ - bMarkus 4; 5,3c.18b-21a
604
604
  ---
605
- sample: Ruth 2,1a-11.15a; 3,7b.9-12b; 4; 5,3a.18b-21a
605
+ sample: Ruth 2,1a-11.15a; 3,7b.9-12b; 4; 5,3c.18b-21a
606
606
  result:
607
607
  - - !ruby/struct:Scripref::Passage
608
608
  text: Ruth 2,1a-11
@@ -665,14 +665,14 @@ result:
665
665
  - !ruby/object:Scripref::PassSep
666
666
  delegate_dc_obj: "; "
667
667
  - !ruby/struct:Scripref::Passage
668
- text: 5,3a
668
+ text: 5,3c
669
669
  b1: 8
670
670
  c1: 5
671
671
  v1: 3
672
672
  b2: 8
673
673
  c2: 5
674
674
  v2: 3
675
- a1: :a
675
+ a1: :c
676
676
  a2:
677
677
  - !ruby/object:Scripref::VerseSep
678
678
  delegate_dc_obj: "."
@@ -687,13 +687,13 @@ result:
687
687
  a1: :b
688
688
  a2: :a
689
689
  ---
690
- sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus ; 5,3a.18b-21a
690
+ sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus ; 5,3c.18b-21a
691
691
  exception: |-
692
692
  EOS or book expected!
693
- Ruth 2,1a-11.15a; 3,7b.9-12b; Markus ; 5,3a.18b-21a
693
+ Ruth 2,1a-11.15a; 3,7b.9-12b; Markus ; 5,3c.18b-21a
694
694
  ^
695
695
  ---
696
- sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 45,3a.18b-21a
696
+ sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 45,3c.18b-21a
697
697
  result:
698
698
  - - !ruby/struct:Scripref::Passage
699
699
  text: Ruth 2,1a-11
@@ -744,14 +744,14 @@ result:
744
744
  - !ruby/object:Scripref::PassSep
745
745
  delegate_dc_obj: "; "
746
746
  - !ruby/struct:Scripref::Passage
747
- text: Markus 45,3a
747
+ text: Markus 45,3c
748
748
  b1: 41
749
749
  c1: 45
750
750
  v1: 3
751
751
  b2: 41
752
752
  c2: 45
753
753
  v2: 3
754
- a1: :a
754
+ a1: :c
755
755
  a2:
756
756
  - !ruby/object:Scripref::VerseSep
757
757
  delegate_dc_obj: "."
@@ -766,16 +766,16 @@ result:
766
766
  a1: :b
767
767
  a2: :a
768
768
  ---
769
- sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; ,3a.18b-21a
769
+ sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; ,3c.18b-21a
770
770
  exception: |-
771
771
  Book or chapter expected!
772
- Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; ,3a.18b-21a
772
+ Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; ,3c.18b-21a
773
773
  ^
774
774
  ---
775
- sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 53a.18b-21a
775
+ sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 53c.18b-21a
776
776
  exception: |-
777
777
  EOS or chapter verse separator or hyphen and book or hyphen and chapter or passage separator and book or passage separator and chapter expected!
778
- Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 53a.18b-21a
778
+ Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 53c.18b-21a
779
779
  ^
780
780
  ---
781
781
  sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,.18b-21a
@@ -784,7 +784,7 @@ exception: |-
784
784
  Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,.18b-21a
785
785
  ^
786
786
  ---
787
- sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a18b-21a
787
+ sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3c18b-21a
788
788
  result:
789
789
  - - !ruby/struct:Scripref::Passage
790
790
  text: Ruth 2,1a-11
@@ -856,15 +856,15 @@ result:
856
856
  v2: 3
857
857
  a1:
858
858
  a2:
859
- - a18b-21a
859
+ - c18b-21a
860
860
  ---
861
- sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.-21a
861
+ sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3c.-21a
862
862
  exception: |-
863
863
  Verse expected!
864
- Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.-21a
864
+ Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3c.-21a
865
865
  ^
866
866
  ---
867
- sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b21a
867
+ sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3c.18b21a
868
868
  result:
869
869
  - - !ruby/struct:Scripref::Passage
870
870
  text: Ruth 2,1a-11
@@ -927,14 +927,14 @@ result:
927
927
  - !ruby/object:Scripref::PassSep
928
928
  delegate_dc_obj: "; "
929
929
  - !ruby/struct:Scripref::Passage
930
- text: 5,3a
930
+ text: 5,3c
931
931
  b1: 41
932
932
  c1: 5
933
933
  v1: 3
934
934
  b2: 41
935
935
  c2: 5
936
936
  v2: 3
937
- a1: :a
937
+ a1: :c
938
938
  a2:
939
939
  - !ruby/object:Scripref::VerseSep
940
940
  delegate_dc_obj: "."
@@ -950,7 +950,7 @@ result:
950
950
  a2:
951
951
  - b21a
952
952
  ---
953
- sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-
953
+ sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3c.18b-
954
954
  result:
955
955
  - - !ruby/struct:Scripref::Passage
956
956
  text: Ruth 2,1a-11
@@ -1013,14 +1013,14 @@ result:
1013
1013
  - !ruby/object:Scripref::PassSep
1014
1014
  delegate_dc_obj: "; "
1015
1015
  - !ruby/struct:Scripref::Passage
1016
- text: 5,3a
1016
+ text: 5,3c
1017
1017
  b1: 41
1018
1018
  c1: 5
1019
1019
  v1: 3
1020
1020
  b2: 41
1021
1021
  c2: 5
1022
1022
  v2: 3
1023
- a1: :a
1023
+ a1: :c
1024
1024
  a2:
1025
1025
  - !ruby/object:Scripref::VerseSep
1026
1026
  delegate_dc_obj: "."
data/scripref.gemspec CHANGED
@@ -1,5 +1,5 @@
1
1
  # -*- encoding: utf-8 -*-
2
- # stub: scripref 0.13.0 ruby lib
2
+ # stub: scripref 0.14.0 ruby lib
3
3
  #
4
4
  # This file is automatically generated by rim.
5
5
  # PLEASE DO NOT EDIT IT DIRECTLY!
@@ -7,12 +7,12 @@
7
7
 
8
8
  Gem::Specification.new do |s|
9
9
  s.name = "scripref"
10
- s.version = "0.13.0"
10
+ s.version = "0.14.0"
11
11
 
12
12
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
13
13
  s.require_paths = ["lib"]
14
14
  s.authors = ["Jan Friedrich"]
15
- s.date = "2020-04-09"
15
+ s.date = "2020-04-11"
16
16
  s.description = ""
17
17
  s.email = "janfri26@gmail.com"
18
18
  s.files = ["./.aspell.pws", "Changelog", "LICENSE", "README.md", "Rakefile", "lib/scripref", "lib/scripref.rb", "lib/scripref/basic_methods.rb", "lib/scripref/bookname.rb", "lib/scripref/const_reader.rb", "lib/scripref/english.rb", "lib/scripref/formatter.rb", "lib/scripref/german.rb", "lib/scripref/include.rb", "lib/scripref/parser.rb", "lib/scripref/passage.rb", "lib/scripref/pipelining.rb", "lib/scripref/processor.rb", "regtest/formatter.rb", "regtest/formatter.yml", "regtest/parser.rb", "regtest/parser.yml", "regtest/processor.rb", "regtest/processor.yml", "scripref.gemspec", "test/test_bookname.rb", "test/test_english.rb", "test/test_formatter.rb", "test/test_german.rb", "test/test_helper.rb", "test/test_integration.rb", "test/test_parser.rb", "test/test_passage.rb", "test/test_pipelining.rb", "test/test_processor.rb"]
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: scripref
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.13.0
4
+ version: 0.14.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jan Friedrich
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-04-09 00:00:00.000000000 Z
11
+ date: 2020-04-11 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake