scripref 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e8a5707b59a787a2c9d153d5664dc7089962afb7f301f381d340a54aa382fe2
-  data.tar.gz: 1b443da4486f615355a7eb98906228a6be744c1470396e731cb30c4ad4774189
+  metadata.gz: 1b86988fd1527cd91715024994bc47a03f0b564a74c5ebf11781e00a7a9ebe82
+  data.tar.gz: cf809a65188207a7688dfe150af32d90acb038a871c93e9e250e8a200945f68c
 SHA512:
-  metadata.gz: 91c1e585d9e956434b4806e227bd8bbc5dc1eaf1ca6f101966175bcedcdc3d4b071614c3b9e78e17ae3abc5437decc5b8e5d8978ee63a93247b923e255e71dad
-  data.tar.gz: 3715eee536614b2f359bd3e0ca5bf40e0d32d5d113881e1351002d91535829aa374f2115ac6f69b35e543e87e794b80fe826882fe40b41deb41cd0efd68882e4
+  metadata.gz: b00eee0bf3b0126a320f1908e2312e4fbe86c99fa504ffc598fa709d887bc51fff6ecb140a16f25dc8897276f2717c28baa738e35dbb9869c31c2d44953154f9
+  data.tar.gz: aec528ec46bb8e7470c7ef06fac6411d4c36ccf3e3595541d07a611309a545e91404eb28c8de8e3189039a2b4be7ff04e437c023f170163a2558433a72f3bee6

data/Changelog

@@ -1,3 +1,6 @@
+2.1.1
+Use the verse separator between addon and verse when formatting.
+
 2.1.0
 Implement correct sorting for passages with addons.
 

data/lib/scripref/formatter.rb

@@ -103,7 +103,7 @@ module Scripref
       if v1 && (@changed || @last_v != v1)
         if ! book_has_only_one_chapter?(@pass.b1)
           case last_token
-          when Verse
+          when Verse, Addon
             push_sep verse_separator
           when Token
             push_sep cv_separator

data/lib/scripref.rb

@@ -5,7 +5,7 @@ require 'delegate'
 
 module Scripref
 
-  VERSION = '2.1.0'
+  VERSION = '2.1.1'
 
   require_relative 'scripref/bookname'
   require_relative 'scripref/bookorder'

data/test/test_formatter.rb

@@ -238,6 +238,21 @@ class TestFormatter < Test::Unit::TestCase
     assert_formated_text_for_ast text, [pass(text: t1, b1: :Matt, c1: 3, v1: 4, b2: :Matt, c2: 3, v2: 4), semi, pass(text: t2, b1: :Matt, c1: 8, b2: :Matt, c2: 8), semi, pass(text: t3, b1: :John, c1: 3, v1: 16, b2: :John, c2: 3, v2: 16)]
   end
 
+  def test_verse_after_addon
+    text = 'Johannes 1,1-3.1-3a.1-3b.1a-3.1b-3.1a-3a.1a-3b'
+    ast = [
+      pass(b1: :John, c1: 1, v1: 1, b2: :John, c2: 1, v2: 3), dot,
+      pass(b1: :John, c1: 1, v1: 1, b2: :John, c2: 1, v2: 3, a2: :a), dot,
+      pass(b1: :John, c1: 1, v1: 1, b2: :John, c2: 1, v2: 3, a2: :b), dot,
+      pass(b1: :John, c1: 1, v1: 1, b2: :John, c2: 1, v2: 3, a1: :a), dot,
+      pass(b1: :John, c1: 1, v1: 1, b2: :John, c2: 1, v2: 3, a1: :b), dot,
+      pass(b1: :John, c1: 1, v1: 1, b2: :John, c2: 1, v2: 3, a1: :a, a2: :a), dot,
+      pass(b1: :John, c1: 1, v1: 1, b2: :John, c2: 1, v2: 3, a1: :a, a2: :b)
+    ]
+    assert_formated_text_for_ast text, ast
+  end
+
+
   ######################################################################
   # complex variants of references
   ######################################################################

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scripref
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Jan Friedrich