Set horizon_padding by default for tie formatting, vertical staff distance

[lilypond.git] / lily / accidental.cc

diff --git a/lily/accidental.cc b/lily/accidental.cc
index d79c17a9e9af2f1e70de4726723e6c4bca0548df..060c97849dcc6dc7ad37924368580512b8c3c8c2 100644 (file)
--- a/lily/accidental.cc
+++ b/lily/accidental.cc
@@ -47,8 +47,12 @@ Accidental_interface::after_line_breaking (SCM smob)
   Grob *me = unsmob_grob (smob);
   Grob *tie = unsmob_grob (me->get_object ("tie"));
 
-  if (tie && !tie->original ())
-    me->suicide ();
+  if (tie && !tie->original ()
+      && !to_boolean (me->get_property ("forced")))
+    {
+      me->suicide ();
+    }
+ 
   return SCM_UNSPECIFIED;
 }
 
@@ -250,12 +254,13 @@ Accidental_interface::print (SCM smob)
 /*
   TODO: should move avoid-slur into item?
 */
-ADD_INTERFACE (Accidental_interface, "accidental-interface",
+ADD_INTERFACE (Accidental_interface,
               "a single accidental",
               "accidentals "
               "avoid-slur "
               "cautionary "
               "cautionary-style "
+              "forced "
               "style "
               "tie "
               );