Make sure there is enough space for a tied accidental on a new line.

diff --git a/input/regression/accidental-broken-tie-spacing.ly b/input/regression/accidental-broken-tie-spacing.ly
new file mode 100644 (file)
index 0000000..f333f76
--- /dev/null
+++ b/input/regression/accidental-broken-tie-spacing.ly
@@ -0,0 +1,11 @@
+\version "2.11.37"
+
+\header {
+  texidoc = "When a tie is broken, the spacing engine must consider the
+accidental after the line break, to prevent a collision from occurring."
+}
+
+{ \key g \major gis''1~ \break gis''4
+\repeat unfold 43 {d4 \noBreak} }
+
+

diff --git a/lily/accidental.cc b/lily/accidental.cc
index afca79720e976390d13ca9beb9d61a44a6a07502..402a17e99d0d5a0326e9160d218dfc36591522eb 100644 (file)
--- a/lily/accidental.cc
+++ b/lily/accidental.cc
@@ -67,7 +67,7 @@ Accidental_interface::pure_height (SCM smob, SCM start_scm, SCM)
 
   if (to_boolean (me->get_property ("forced"))
       || !unsmob_grob (me->get_object ("tie"))
-      || rank != start + 1) /* we are in the middle of a line */
+      || rank == start + 1) /* we are at the start of a line */
     {
       Stencil *s = unsmob_stencil (get_stencil (me));
       if (s)