scripref 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa9e6be87d748d3bd5a78a583cd7cffe7785548debe997f15478da1d19454b2d
-  data.tar.gz: c1cd0125bf8fdee4befaf21409746f1f71bbcc7931e67d91f4abfb68d67dd624
+  metadata.gz: c76e0fe6dca4fc5a1eb156fcf059d6b78d1ee9e57305809152e06173de352fb5
+  data.tar.gz: 76cf169841ed7aa6ff5bfee18c90c675ca189ceaae113780c6404184e4cce20e
 SHA512:
-  metadata.gz: 813b10551e8a03e2c8cf0419316372a304d080b987adaaa0f5fe8e8ab80edb67c150a49abeea26db81a10a8b6e72f7a873674ff4773ac3368cb5c1c5d03007a2
-  data.tar.gz: a336bb178df986af14dc04e90619680c9853dd8e12433cd0b6c070486d3a565e50394c3d069421eb1d5a2db82974b0da8cea70016525c48da09825453e4619df
+  metadata.gz: 3f074daea6bacfc597166ffe2b7c52f1046e58d88131cb016beef77e8097acc407940571ba8e798db7f8a3aee3bc56c2e255b4732b97e7fc430d0440364dec3a
+  data.tar.gz: 412f3376fc21a7c6cad686b94807073a44fabe0eb381b6c591a58ca7c179a522bdfcea34c19ac4d3448130cf3dab54bcdc9d00ebac1c5a6c2d0664564256b28e

data/Changelog

@@ -1,3 +1,6 @@
+0.14.0
+Allow 'c' as verse add-on.
+
 0.13.0
 Use keyword arguments for Passage.
 Adapt regular expression to match multiple lines.

data/lib/scripref.rb

@@ -3,7 +3,7 @@ require 'delegate'
 
 module Scripref
 
-  VERSION = '0.13.0'
+  VERSION = '0.14.0'
 
   autoload :Bookname, 'scripref/bookname'
   autoload :English, 'scripref/english'

data/lib/scripref/english.rb

@@ -58,7 +58,7 @@ module Scripref
     VERSE_SEPARATOR = ','
 
     # Regular expression to match addons for a verse.
-    VERSE_ADDON_RE = /[ab]\s*/o
+    VERSE_ADDON_RE = /[abc]\s*/o
 
     # Postfix for one following verse
     POSTFIX_ONE_FOLLOWING_VERSE = 'f'

data/lib/scripref/german.rb

@@ -54,7 +54,7 @@ module Scripref
     VERSE_SEPARATOR = '.'
 
     # Regular expression to match addons for a verse.
-    VERSE_ADDON_RE = /[ab]\b\s*/o
+    VERSE_ADDON_RE = /[abc]\b\s*/o
 
     # Postfix for one following verse
     POSTFIX_ONE_FOLLOWING_VERSE = 'f'

data/regtest/parser.rb

@@ -10,7 +10,7 @@ def s text
   end
 end
 
-text = 'Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a'
+text = 'Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3c.18b-21a'
 
 s text
 

data/regtest/parser.yml

@@ -1,5 +1,5 @@
 ---
-sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
+sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3c.18b-21a
 result:
 - :text: Ruth 2,1a-11
   :b1: 8
@@ -51,14 +51,14 @@ result:
   :a1: 
   :a2: 
 - "; "
-- :text: 5,3a
+- :text: 5,3c
   :b1: 41
   :c1: 5
   :v1: 3
   :b2: 41
   :c2: 5
   :v2: 3
-  :a1: :a
+  :a1: :c
   :a2: 
 - "."
 - :text: 18b-21a
@@ -71,43 +71,43 @@ result:
   :a1: :b
   :a2: :a
 ---
-sample: " 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a"
+sample: " 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3c.18b-21a"
 exception: |-
   Book expected!
-   2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
+   2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3c.18b-21a
   ^
 ---
-sample: Ruth ,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
+sample: Ruth ,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3c.18b-21a
 exception: |-
   EOS or hyphen and book or chapter expected!
-  Ruth ,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
+  Ruth ,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3c.18b-21a
        ^
 ---
-sample: Ruth 21a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
+sample: Ruth 21a-11.15a; 3,7b.9-12b; Markus 4; 5,3c.18b-21a
 exception: |-
   EOS or chapter verse separator or hyphen and book or hyphen and chapter or passage separator and book or passage separator and chapter expected!
-  Ruth 21a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
+  Ruth 21a-11.15a; 3,7b.9-12b; Markus 4; 5,3c.18b-21a
          ^
 ---
-sample: Ruth 2,-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
+sample: Ruth 2,-11.15a; 3,7b.9-12b; Markus 4; 5,3c.18b-21a
 exception: |-
   Verse expected!
-  Ruth 2,-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
+  Ruth 2,-11.15a; 3,7b.9-12b; Markus 4; 5,3c.18b-21a
          ^
 ---
-sample: Ruth 2,1a11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
+sample: Ruth 2,1a11.15a; 3,7b.9-12b; Markus 4; 5,3c.18b-21a
 exception: |-
   EOS or passage separator or verse separator or hyphen expected!
-  Ruth 2,1a11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
+  Ruth 2,1a11.15a; 3,7b.9-12b; Markus 4; 5,3c.18b-21a
           ^
 ---
-sample: Ruth 2,1a-.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
+sample: Ruth 2,1a-.15a; 3,7b.9-12b; Markus 4; 5,3c.18b-21a
 exception: |-
   Chapter or verse expected!
-  Ruth 2,1a-.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
+  Ruth 2,1a-.15a; 3,7b.9-12b; Markus 4; 5,3c.18b-21a
             ^
 ---
-sample: Ruth 2,1a-1115a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
+sample: Ruth 2,1a-1115a; 3,7b.9-12b; Markus 4; 5,3c.18b-21a
 result:
 - :text: Ruth 2,1a-1115a
   :b1: 8
@@ -149,14 +149,14 @@ result:
   :a1: 
   :a2: 
 - "; "
-- :text: 5,3a
+- :text: 5,3c
   :b1: 41
   :c1: 5
   :v1: 3
   :b2: 41
   :c2: 5
   :v2: 3
-  :a1: :a
+  :a1: :c
   :a2: 
 - "."
 - :text: 18b-21a
@@ -169,49 +169,49 @@ result:
   :a1: :b
   :a2: :a
 ---
-sample: Ruth 2,1a-11.; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
+sample: Ruth 2,1a-11.; 3,7b.9-12b; Markus 4; 5,3c.18b-21a
 exception: |-
   Verse expected!
-  Ruth 2,1a-11.; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
+  Ruth 2,1a-11.; 3,7b.9-12b; Markus 4; 5,3c.18b-21a
                ^
 ---
-sample: Ruth 2,1a-11.15a3,7b.9-12b; Markus 4; 5,3a.18b-21a
+sample: Ruth 2,1a-11.15a3,7b.9-12b; Markus 4; 5,3c.18b-21a
 exception: |-
   EOS or passage separator or verse separator or hyphen expected!
-  Ruth 2,1a-11.15a3,7b.9-12b; Markus 4; 5,3a.18b-21a
+  Ruth 2,1a-11.15a3,7b.9-12b; Markus 4; 5,3c.18b-21a
                  ^
 ---
-sample: Ruth 2,1a-11.15a; ,7b.9-12b; Markus 4; 5,3a.18b-21a
+sample: Ruth 2,1a-11.15a; ,7b.9-12b; Markus 4; 5,3c.18b-21a
 exception: |-
   Book or chapter expected!
-  Ruth 2,1a-11.15a; ,7b.9-12b; Markus 4; 5,3a.18b-21a
+  Ruth 2,1a-11.15a; ,7b.9-12b; Markus 4; 5,3c.18b-21a
                     ^
 ---
-sample: Ruth 2,1a-11.15a; 37b.9-12b; Markus 4; 5,3a.18b-21a
+sample: Ruth 2,1a-11.15a; 37b.9-12b; Markus 4; 5,3c.18b-21a
 exception: |-
   EOS or chapter verse separator or hyphen and book or hyphen and chapter or passage separator and book or passage separator and chapter expected!
-  Ruth 2,1a-11.15a; 37b.9-12b; Markus 4; 5,3a.18b-21a
+  Ruth 2,1a-11.15a; 37b.9-12b; Markus 4; 5,3c.18b-21a
                       ^
 ---
-sample: Ruth 2,1a-11.15a; 3,.9-12b; Markus 4; 5,3a.18b-21a
+sample: Ruth 2,1a-11.15a; 3,.9-12b; Markus 4; 5,3c.18b-21a
 exception: |-
   Verse expected!
-  Ruth 2,1a-11.15a; 3,.9-12b; Markus 4; 5,3a.18b-21a
+  Ruth 2,1a-11.15a; 3,.9-12b; Markus 4; 5,3c.18b-21a
                       ^
 ---
-sample: Ruth 2,1a-11.15a; 3,7b9-12b; Markus 4; 5,3a.18b-21a
+sample: Ruth 2,1a-11.15a; 3,7b9-12b; Markus 4; 5,3c.18b-21a
 exception: |-
   EOS or passage separator or verse separator or hyphen expected!
-  Ruth 2,1a-11.15a; 3,7b9-12b; Markus 4; 5,3a.18b-21a
+  Ruth 2,1a-11.15a; 3,7b9-12b; Markus 4; 5,3c.18b-21a
                        ^
 ---
-sample: Ruth 2,1a-11.15a; 3,7b.-12b; Markus 4; 5,3a.18b-21a
+sample: Ruth 2,1a-11.15a; 3,7b.-12b; Markus 4; 5,3c.18b-21a
 exception: |-
   Verse expected!
-  Ruth 2,1a-11.15a; 3,7b.-12b; Markus 4; 5,3a.18b-21a
+  Ruth 2,1a-11.15a; 3,7b.-12b; Markus 4; 5,3c.18b-21a
                          ^
 ---
-sample: Ruth 2,1a-11.15a; 3,7b.912b; Markus 4; 5,3a.18b-21a
+sample: Ruth 2,1a-11.15a; 3,7b.912b; Markus 4; 5,3c.18b-21a
 result:
 - :text: Ruth 2,1a-11
   :b1: 8
@@ -263,14 +263,14 @@ result:
   :a1: 
   :a2: 
 - "; "
-- :text: 5,3a
+- :text: 5,3c
   :b1: 41
   :c1: 5
   :v1: 3
   :b2: 41
   :c2: 5
   :v2: 3
-  :a1: :a
+  :a1: :c
   :a2: 
 - "."
 - :text: 18b-21a
@@ -283,19 +283,19 @@ result:
   :a1: :b
   :a2: :a
 ---
-sample: Ruth 2,1a-11.15a; 3,7b.9-; Markus 4; 5,3a.18b-21a
+sample: Ruth 2,1a-11.15a; 3,7b.9-; Markus 4; 5,3c.18b-21a
 exception: |-
   Chapter or verse expected!
-  Ruth 2,1a-11.15a; 3,7b.9-; Markus 4; 5,3a.18b-21a
+  Ruth 2,1a-11.15a; 3,7b.9-; Markus 4; 5,3c.18b-21a
                            ^
 ---
-sample: Ruth 2,1a-11.15a; 3,7b.9-12bMarkus 4; 5,3a.18b-21a
+sample: Ruth 2,1a-11.15a; 3,7b.9-12bMarkus 4; 5,3c.18b-21a
 exception: |-
   EOS or verse separator or passage separator expected!
-  Ruth 2,1a-11.15a; 3,7b.9-12bMarkus 4; 5,3a.18b-21a
+  Ruth 2,1a-11.15a; 3,7b.9-12bMarkus 4; 5,3c.18b-21a
                              ^
 ---
-sample: Ruth 2,1a-11.15a; 3,7b.9-12b;  4; 5,3a.18b-21a
+sample: Ruth 2,1a-11.15a; 3,7b.9-12b;  4; 5,3c.18b-21a
 result:
 - :text: Ruth 2,1a-11
   :b1: 8
@@ -347,14 +347,14 @@ result:
   :a1: 
   :a2: 
 - "; "
-- :text: 5,3a
+- :text: 5,3c
   :b1: 8
   :c1: 5
   :v1: 3
   :b2: 8
   :c2: 5
   :v2: 3
-  :a1: :a
+  :a1: :c
   :a2: 
 - "."
 - :text: 18b-21a
@@ -367,13 +367,13 @@ result:
   :a1: :b
   :a2: :a
 ---
-sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus ; 5,3a.18b-21a
+sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus ; 5,3c.18b-21a
 exception: |-
   EOS or book expected!
-  Ruth 2,1a-11.15a; 3,7b.9-12b; Markus ; 5,3a.18b-21a
+  Ruth 2,1a-11.15a; 3,7b.9-12b; Markus ; 5,3c.18b-21a
                                          ^
 ---
-sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 45,3a.18b-21a
+sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 45,3c.18b-21a
 result:
 - :text: Ruth 2,1a-11
   :b1: 8
@@ -415,14 +415,14 @@ result:
   :a1: 
   :a2: :b
 - "; "
-- :text: Markus 45,3a
+- :text: Markus 45,3c
   :b1: 41
   :c1: 45
   :v1: 3
   :b2: 41
   :c2: 45
   :v2: 3
-  :a1: :a
+  :a1: :c
   :a2: 
 - "."
 - :text: 18b-21a
@@ -435,16 +435,16 @@ result:
   :a1: :b
   :a2: :a
 ---
-sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; ,3a.18b-21a
+sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; ,3c.18b-21a
 exception: |-
   Book or chapter expected!
-  Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; ,3a.18b-21a
+  Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; ,3c.18b-21a
                                           ^
 ---
-sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 53a.18b-21a
+sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 53c.18b-21a
 exception: |-
   EOS or chapter verse separator or hyphen and book or hyphen and chapter or passage separator and book or passage separator and chapter expected!
-  Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 53a.18b-21a
+  Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 53c.18b-21a
                                             ^
 ---
 sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,.18b-21a
@@ -453,26 +453,26 @@ exception: |-
   Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,.18b-21a
                                             ^
 ---
-sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a18b-21a
+sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3c18b-21a
 exception: |-
   EOS or passage separator or verse separator or hyphen expected!
-  Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a18b-21a
+  Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3c18b-21a
                                              ^
 ---
-sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.-21a
+sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3c.-21a
 exception: |-
   Verse expected!
-  Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.-21a
+  Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3c.-21a
                                                ^
 ---
-sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b21a
+sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3c.18b21a
 exception: |-
   EOS or passage separator or verse separator or hyphen expected!
-  Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b21a
+  Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3c.18b21a
                                                  ^
 ---
-sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-
+sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3c.18b-
 exception: |-
   Chapter or verse expected!
-  Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-
+  Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3c.18b-
                                                    ^

data/regtest/processor.rb

@@ -10,7 +10,7 @@ def s text
   end
 end
 
-text = 'Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a'
+text = 'Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3c.18b-21a'
 
 s text
 

data/regtest/processor.yml

@@ -1,5 +1,5 @@
 ---
-sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
+sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3c.18b-21a
 result:
 - - !ruby/struct:Scripref::Passage
     text: Ruth 2,1a-11
@@ -62,14 +62,14 @@ result:
   - !ruby/object:Scripref::PassSep
     delegate_dc_obj: "; "
   - !ruby/struct:Scripref::Passage
-    text: 5,3a
+    text: 5,3c
     b1: 41
     c1: 5
     v1: 3
     b2: 41
     c2: 5
     v2: 3
-    a1: :a
+    a1: :c
     a2: 
   - !ruby/object:Scripref::VerseSep
     delegate_dc_obj: "."
@@ -84,7 +84,7 @@ result:
     a1: :b
     a2: :a
 ---
-sample: " 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a"
+sample: " 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3c.18b-21a"
 result:
 - " 2,1a-11.15a; 3,7b.9-12b; "
 - - !ruby/struct:Scripref::Passage
@@ -100,14 +100,14 @@ result:
   - !ruby/object:Scripref::PassSep
     delegate_dc_obj: "; "
   - !ruby/struct:Scripref::Passage
-    text: 5,3a
+    text: 5,3c
     b1: 41
     c1: 5
     v1: 3
     b2: 41
     c2: 5
     v2: 3
-    a1: :a
+    a1: :c
     a2: 
   - !ruby/object:Scripref::VerseSep
     delegate_dc_obj: "."
@@ -122,7 +122,7 @@ result:
     a1: :b
     a2: :a
 ---
-sample: Ruth ,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
+sample: Ruth ,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3c.18b-21a
 result:
 - 'Ruth ,1a-11.15a; 3,7b.9-12b; '
 - - !ruby/struct:Scripref::Passage
@@ -138,14 +138,14 @@ result:
   - !ruby/object:Scripref::PassSep
     delegate_dc_obj: "; "
   - !ruby/struct:Scripref::Passage
-    text: 5,3a
+    text: 5,3c
     b1: 41
     c1: 5
     v1: 3
     b2: 41
     c2: 5
     v2: 3
-    a1: :a
+    a1: :c
     a2: 
   - !ruby/object:Scripref::VerseSep
     delegate_dc_obj: "."
@@ -160,19 +160,19 @@ result:
     a1: :b
     a2: :a
 ---
-sample: Ruth 21a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
+sample: Ruth 21a-11.15a; 3,7b.9-12b; Markus 4; 5,3c.18b-21a
 exception: |-
   EOS or chapter verse separator or hyphen and book or hyphen and chapter or passage separator and book or passage separator and chapter expected!
-  Ruth 21a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
+  Ruth 21a-11.15a; 3,7b.9-12b; Markus 4; 5,3c.18b-21a
          ^
 ---
-sample: Ruth 2,-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
+sample: Ruth 2,-11.15a; 3,7b.9-12b; Markus 4; 5,3c.18b-21a
 exception: |-
   Verse expected!
-  Ruth 2,-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
+  Ruth 2,-11.15a; 3,7b.9-12b; Markus 4; 5,3c.18b-21a
          ^
 ---
-sample: Ruth 2,1a11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
+sample: Ruth 2,1a11.15a; 3,7b.9-12b; Markus 4; 5,3c.18b-21a
 result:
 - - !ruby/struct:Scripref::Passage
     text: Ruth 2,1
@@ -198,14 +198,14 @@ result:
   - !ruby/object:Scripref::PassSep
     delegate_dc_obj: "; "
   - !ruby/struct:Scripref::Passage
-    text: 5,3a
+    text: 5,3c
     b1: 41
     c1: 5
     v1: 3
     b2: 41
     c2: 5
     v2: 3
-    a1: :a
+    a1: :c
     a2: 
   - !ruby/object:Scripref::VerseSep
     delegate_dc_obj: "."
@@ -220,13 +220,13 @@ result:
     a1: :b
     a2: :a
 ---
-sample: Ruth 2,1a-.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
+sample: Ruth 2,1a-.15a; 3,7b.9-12b; Markus 4; 5,3c.18b-21a
 exception: |-
   Chapter or verse expected!
-  Ruth 2,1a-.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
+  Ruth 2,1a-.15a; 3,7b.9-12b; Markus 4; 5,3c.18b-21a
             ^
 ---
-sample: Ruth 2,1a-1115a; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
+sample: Ruth 2,1a-1115a; 3,7b.9-12b; Markus 4; 5,3c.18b-21a
 result:
 - - !ruby/struct:Scripref::Passage
     text: Ruth 2,1a-1115a
@@ -277,14 +277,14 @@ result:
   - !ruby/object:Scripref::PassSep
     delegate_dc_obj: "; "
   - !ruby/struct:Scripref::Passage
-    text: 5,3a
+    text: 5,3c
     b1: 41
     c1: 5
     v1: 3
     b2: 41
     c2: 5
     v2: 3
-    a1: :a
+    a1: :c
     a2: 
   - !ruby/object:Scripref::VerseSep
     delegate_dc_obj: "."
@@ -299,13 +299,13 @@ result:
     a1: :b
     a2: :a
 ---
-sample: Ruth 2,1a-11.; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
+sample: Ruth 2,1a-11.; 3,7b.9-12b; Markus 4; 5,3c.18b-21a
 exception: |-
   Verse expected!
-  Ruth 2,1a-11.; 3,7b.9-12b; Markus 4; 5,3a.18b-21a
+  Ruth 2,1a-11.; 3,7b.9-12b; Markus 4; 5,3c.18b-21a
                ^
 ---
-sample: Ruth 2,1a-11.15a3,7b.9-12b; Markus 4; 5,3a.18b-21a
+sample: Ruth 2,1a-11.15a3,7b.9-12b; Markus 4; 5,3c.18b-21a
 result:
 - - !ruby/struct:Scripref::Passage
     text: Ruth 2,1a-11
@@ -343,14 +343,14 @@ result:
   - !ruby/object:Scripref::PassSep
     delegate_dc_obj: "; "
   - !ruby/struct:Scripref::Passage
-    text: 5,3a
+    text: 5,3c
     b1: 41
     c1: 5
     v1: 3
     b2: 41
     c2: 5
     v2: 3
-    a1: :a
+    a1: :c
     a2: 
   - !ruby/object:Scripref::VerseSep
     delegate_dc_obj: "."
@@ -365,25 +365,25 @@ result:
     a1: :b
     a2: :a
 ---
-sample: Ruth 2,1a-11.15a; ,7b.9-12b; Markus 4; 5,3a.18b-21a
+sample: Ruth 2,1a-11.15a; ,7b.9-12b; Markus 4; 5,3c.18b-21a
 exception: |-
   Book or chapter expected!
-  Ruth 2,1a-11.15a; ,7b.9-12b; Markus 4; 5,3a.18b-21a
+  Ruth 2,1a-11.15a; ,7b.9-12b; Markus 4; 5,3c.18b-21a
                     ^
 ---
-sample: Ruth 2,1a-11.15a; 37b.9-12b; Markus 4; 5,3a.18b-21a
+sample: Ruth 2,1a-11.15a; 37b.9-12b; Markus 4; 5,3c.18b-21a
 exception: |-
   EOS or chapter verse separator or hyphen and book or hyphen and chapter or passage separator and book or passage separator and chapter expected!
-  Ruth 2,1a-11.15a; 37b.9-12b; Markus 4; 5,3a.18b-21a
+  Ruth 2,1a-11.15a; 37b.9-12b; Markus 4; 5,3c.18b-21a
                       ^
 ---
-sample: Ruth 2,1a-11.15a; 3,.9-12b; Markus 4; 5,3a.18b-21a
+sample: Ruth 2,1a-11.15a; 3,.9-12b; Markus 4; 5,3c.18b-21a
 exception: |-
   Verse expected!
-  Ruth 2,1a-11.15a; 3,.9-12b; Markus 4; 5,3a.18b-21a
+  Ruth 2,1a-11.15a; 3,.9-12b; Markus 4; 5,3c.18b-21a
                       ^
 ---
-sample: Ruth 2,1a-11.15a; 3,7b9-12b; Markus 4; 5,3a.18b-21a
+sample: Ruth 2,1a-11.15a; 3,7b9-12b; Markus 4; 5,3c.18b-21a
 result:
 - - !ruby/struct:Scripref::Passage
     text: Ruth 2,1a-11
@@ -433,14 +433,14 @@ result:
   - !ruby/object:Scripref::PassSep
     delegate_dc_obj: "; "
   - !ruby/struct:Scripref::Passage
-    text: 5,3a
+    text: 5,3c
     b1: 41
     c1: 5
     v1: 3
     b2: 41
     c2: 5
     v2: 3
-    a1: :a
+    a1: :c
     a2: 
   - !ruby/object:Scripref::VerseSep
     delegate_dc_obj: "."
@@ -455,13 +455,13 @@ result:
     a1: :b
     a2: :a
 ---
-sample: Ruth 2,1a-11.15a; 3,7b.-12b; Markus 4; 5,3a.18b-21a
+sample: Ruth 2,1a-11.15a; 3,7b.-12b; Markus 4; 5,3c.18b-21a
 exception: |-
   Verse expected!
-  Ruth 2,1a-11.15a; 3,7b.-12b; Markus 4; 5,3a.18b-21a
+  Ruth 2,1a-11.15a; 3,7b.-12b; Markus 4; 5,3c.18b-21a
                          ^
 ---
-sample: Ruth 2,1a-11.15a; 3,7b.912b; Markus 4; 5,3a.18b-21a
+sample: Ruth 2,1a-11.15a; 3,7b.912b; Markus 4; 5,3c.18b-21a
 result:
 - - !ruby/struct:Scripref::Passage
     text: Ruth 2,1a-11
@@ -524,14 +524,14 @@ result:
   - !ruby/object:Scripref::PassSep
     delegate_dc_obj: "; "
   - !ruby/struct:Scripref::Passage
-    text: 5,3a
+    text: 5,3c
     b1: 41
     c1: 5
     v1: 3
     b2: 41
     c2: 5
     v2: 3
-    a1: :a
+    a1: :c
     a2: 
   - !ruby/object:Scripref::VerseSep
     delegate_dc_obj: "."
@@ -546,13 +546,13 @@ result:
     a1: :b
     a2: :a
 ---
-sample: Ruth 2,1a-11.15a; 3,7b.9-; Markus 4; 5,3a.18b-21a
+sample: Ruth 2,1a-11.15a; 3,7b.9-; Markus 4; 5,3c.18b-21a
 exception: |-
   Chapter or verse expected!
-  Ruth 2,1a-11.15a; 3,7b.9-; Markus 4; 5,3a.18b-21a
+  Ruth 2,1a-11.15a; 3,7b.9-; Markus 4; 5,3c.18b-21a
                            ^
 ---
-sample: Ruth 2,1a-11.15a; 3,7b.9-12bMarkus 4; 5,3a.18b-21a
+sample: Ruth 2,1a-11.15a; 3,7b.9-12bMarkus 4; 5,3c.18b-21a
 result:
 - - !ruby/struct:Scripref::Passage
     text: Ruth 2,1a-11
@@ -600,9 +600,9 @@ result:
     v2: 12
     a1: 
     a2: 
-- bMarkus 4; 5,3a.18b-21a
+- bMarkus 4; 5,3c.18b-21a
 ---
-sample: Ruth 2,1a-11.15a; 3,7b.9-12b;  4; 5,3a.18b-21a
+sample: Ruth 2,1a-11.15a; 3,7b.9-12b;  4; 5,3c.18b-21a
 result:
 - - !ruby/struct:Scripref::Passage
     text: Ruth 2,1a-11
@@ -665,14 +665,14 @@ result:
   - !ruby/object:Scripref::PassSep
     delegate_dc_obj: "; "
   - !ruby/struct:Scripref::Passage
-    text: 5,3a
+    text: 5,3c
     b1: 8
     c1: 5
     v1: 3
     b2: 8
     c2: 5
     v2: 3
-    a1: :a
+    a1: :c
     a2: 
   - !ruby/object:Scripref::VerseSep
     delegate_dc_obj: "."
@@ -687,13 +687,13 @@ result:
     a1: :b
     a2: :a
 ---
-sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus ; 5,3a.18b-21a
+sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus ; 5,3c.18b-21a
 exception: |-
   EOS or book expected!
-  Ruth 2,1a-11.15a; 3,7b.9-12b; Markus ; 5,3a.18b-21a
+  Ruth 2,1a-11.15a; 3,7b.9-12b; Markus ; 5,3c.18b-21a
                                          ^
 ---
-sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 45,3a.18b-21a
+sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 45,3c.18b-21a
 result:
 - - !ruby/struct:Scripref::Passage
     text: Ruth 2,1a-11
@@ -744,14 +744,14 @@ result:
   - !ruby/object:Scripref::PassSep
     delegate_dc_obj: "; "
   - !ruby/struct:Scripref::Passage
-    text: Markus 45,3a
+    text: Markus 45,3c
     b1: 41
     c1: 45
     v1: 3
     b2: 41
     c2: 45
     v2: 3
-    a1: :a
+    a1: :c
     a2: 
   - !ruby/object:Scripref::VerseSep
     delegate_dc_obj: "."
@@ -766,16 +766,16 @@ result:
     a1: :b
     a2: :a
 ---
-sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; ,3a.18b-21a
+sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; ,3c.18b-21a
 exception: |-
   Book or chapter expected!
-  Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; ,3a.18b-21a
+  Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; ,3c.18b-21a
                                           ^
 ---
-sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 53a.18b-21a
+sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 53c.18b-21a
 exception: |-
   EOS or chapter verse separator or hyphen and book or hyphen and chapter or passage separator and book or passage separator and chapter expected!
-  Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 53a.18b-21a
+  Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 53c.18b-21a
                                             ^
 ---
 sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,.18b-21a
@@ -784,7 +784,7 @@ exception: |-
   Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,.18b-21a
                                             ^
 ---
-sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a18b-21a
+sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3c18b-21a
 result:
 - - !ruby/struct:Scripref::Passage
     text: Ruth 2,1a-11
@@ -856,15 +856,15 @@ result:
     v2: 3
     a1: 
     a2: 
-- a18b-21a
+- c18b-21a
 ---
-sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.-21a
+sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3c.-21a
 exception: |-
   Verse expected!
-  Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.-21a
+  Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3c.-21a
                                                ^
 ---
-sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b21a
+sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3c.18b21a
 result:
 - - !ruby/struct:Scripref::Passage
     text: Ruth 2,1a-11
@@ -927,14 +927,14 @@ result:
   - !ruby/object:Scripref::PassSep
     delegate_dc_obj: "; "
   - !ruby/struct:Scripref::Passage
-    text: 5,3a
+    text: 5,3c
     b1: 41
     c1: 5
     v1: 3
     b2: 41
     c2: 5
     v2: 3
-    a1: :a
+    a1: :c
     a2: 
   - !ruby/object:Scripref::VerseSep
     delegate_dc_obj: "."
@@ -950,7 +950,7 @@ result:
     a2: 
 - b21a
 ---
-sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3a.18b-
+sample: Ruth 2,1a-11.15a; 3,7b.9-12b; Markus 4; 5,3c.18b-
 result:
 - - !ruby/struct:Scripref::Passage
     text: Ruth 2,1a-11
@@ -1013,14 +1013,14 @@ result:
   - !ruby/object:Scripref::PassSep
     delegate_dc_obj: "; "
   - !ruby/struct:Scripref::Passage
-    text: 5,3a
+    text: 5,3c
     b1: 41
     c1: 5
     v1: 3
     b2: 41
     c2: 5
     v2: 3
-    a1: :a
+    a1: :c
     a2: 
   - !ruby/object:Scripref::VerseSep
     delegate_dc_obj: "."

data/scripref.gemspec

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-# stub: scripref 0.13.0 ruby lib
+# stub: scripref 0.14.0 ruby lib
 #
 # This file is automatically generated by rim.
 # PLEASE DO NOT EDIT IT DIRECTLY!
@@ -7,12 +7,12 @@
 
 Gem::Specification.new do |s|
   s.name = "scripref"
-  s.version = "0.13.0"
+  s.version = "0.14.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Jan Friedrich"]
-  s.date = "2020-04-09"
+  s.date = "2020-04-11"
   s.description = ""
   s.email = "janfri26@gmail.com"
   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

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scripref
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Jan Friedrich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-09 00:00:00.000000000 Z
+date: 2020-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake