* input/regression/accidental-clef-change.ly: new file.

[lilypond.git] / lily / note-collision.cc

diff --git a/lily/note-collision.cc b/lily/note-collision.cc
index 709a7d01923f286687374dd1c315b9e1e8aeefad..31c9d41cc369bacf3daaae472a2dfcbe00af3a05 100644 (file)
--- a/lily/note-collision.cc
+++ b/lily/note-collision.cc
@@ -76,6 +76,11 @@ check_meshing_chords (Grob *me,
       && !to_boolean (me->get_property ("merge-differently-headed")))
     merge_possible = false;
 
+  merge_possible = merge_possible &&
+    !(nu->get_property ("style") == ly_symbol2scm ("fa")
+      && nd->get_property ("style") == ly_symbol2scm ("fa"));
+  
+  
   /* Should never merge quarter and half notes, as this would make
      them indistinguishable.  */
   if (merge_possible