Fix spacing for forced accidentals with a tie.

2 files changed, 24 insertions, 1 deletions

diff --git a/input/regression/spacing-accidental-tie.ly b/input/regression/spacing-accidental-tie.ly
new file mode 100644
index 0000000000..35c25b9d0a
--- /dev/null
+++ b/input/regression/spacing-accidental-tie.ly
@@ -0,0 +1,23 @@
+\version "2.11.30"
+
+\header {
+  texidoc = "Horizontal spacing works as expected on tied notes with
+accidentals. No space is reserved for accidentals that end up not being printed,
+but accindentals that are printed don't collide with anything."
+}
+
+\paper { ragged-right = ##t }
+
+\relative c'
+{ \time 1/4
+  cis16 cis cis cis~
+  cis cis cis cis
+  c c c c \break
+
+  cis16 cis cis cis~
+  cis! cis cis cis
+  c c c c \break
+
+  cis cis cis cis~ \break
+  cis
+}
\ No newline at end of file
diff --git a/lily/accidental-placement.cc b/lily/accidental-placement.cc
index bb1419977e..2c76062d67 100644
--- a/lily/accidental-placement.cc
+++ b/lily/accidental-placement.cc
@@ -68,7 +68,7 @@ Accidental_placement::split_accidentals (Grob *accs,
       {
 	Grob *a = unsmob_grob (scm_car (s));
 
-	if (unsmob_grob (a->get_object ("tie")))
+	if (unsmob_grob (a->get_object ("tie")) && !to_boolean (a->get_property ("forced")))
 	  break_reminder->push_back (a);
 	else
 	  real_acc->push_back (a);