From: Joe Neeman <joeneeman@gmail.com>
Date: Wed, 6 Feb 2008 19:43:09 +0000 (+0100)
Subject: Make sure there is enough space for a tied accidental on a new line.
X-Git-Tag: release/2.11.40-1~3^2~26
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=9fe7859a8592a080413b744e3768db41059dbfe3;p=lilypond.git

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
index 0000000000..f333f7671e
--- /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 afca79720e..402a17e99d 100644
--- 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)