Merge commit 'origin/dev/jneeman' into systems-per-page

[lilypond.git] / lily / accidental-placement.cc

diff --git a/lily/accidental-placement.cc b/lily/accidental-placement.cc
index bb1419977ef262fb9ef7a4fada49be8362c15e87..f383a3ecc718c1b958c23ddbb4e47ea0fd59fbae 100644 (file)
--- a/lily/accidental-placement.cc
+++ b/lily/accidental-placement.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2002--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 
@@ -68,7 +68,8 @@ 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);
@@ -425,6 +426,7 @@ ADD_INTERFACE (Accidental_placement,
 
               /* properties */
               "accidental-grobs "
+              "direction "
               "left-padding "
               "padding "
               "positioning-done "