Fix GCC 4.3.0 warnings about parentheses and braces

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

diff --git a/lily/note-collision.cc b/lily/note-collision.cc
index cdeb36c667078a50755aff5739c9c717776b3294..591c7bc9945437f886eae2e0dbb45fda8a21a125 100644 (file)
--- a/lily/note-collision.cc
+++ b/lily/note-collision.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "note-collision.hh"
@@ -81,16 +81,6 @@ check_meshing_chords (Grob *me,
       && !to_boolean (me->get_property ("merge-differently-headed")))
     merge_possible = false;
 
-  if (merge_possible
-      && head_up->get_property ("style") == ly_symbol2scm ("fa")
-      && head_down->get_property ("style") == ly_symbol2scm ("fa"))
-    {
-      Interval uphead_size = head_up->extent (head_up, Y_AXIS);
-      Offset att =  Offset (0.0, -1.0);
-      head_up->set_property ("stem-attachment", ly_offset2scm (att));
-      head_up->set_property ("transparent", SCM_BOOL_T); 
-    }
-  
   /* Should never merge quarter and half notes, as this would make
      them indistinguishable.  */
   if (merge_possible
@@ -171,6 +161,13 @@ check_meshing_chords (Grob *me,
   Real shift_amount = 1;
 
   bool touch = (ups[0] >= dps.back ());
+  /* As a special case, if the topmost part of the downstem chord is a second,
+     the top note of which is the same pitch as the lowest upstem note, they
+     shouldn't count as touching.
+  */
+  if (dps.back () == ups[0] && dps.size () > 1 && dps[dps.size() - 2] == ups[0] - 1)
+    touch = false;
+
   if (touch)
     shift_amount *= -1;
 
@@ -184,6 +181,20 @@ check_meshing_chords (Grob *me,
       else if (Rhythmic_head::dot_count (head_up) < Rhythmic_head::dot_count (head_down))
        stem_to_stem = true;
     }
+
+  /* The solfa is a triangle, which is inverted depending on stem
+     direction. In case of a collision, one of them should be removed,
+     so the resulting note does not look like a block.
+  */
+  if (merge_possible
+      && head_up->get_property ("style") == ly_symbol2scm ("fa")
+      && head_down->get_property ("style") == ly_symbol2scm ("fa"))
+    {
+      Interval uphead_size = head_up->extent (head_up, Y_AXIS);
+      Offset att = Offset (0.0, -1.0);
+      head_up->set_property ("stem-attachment", ly_offset2scm (att));
+      head_up->set_property ("transparent", SCM_BOOL_T); 
+    }
   
   if (merge_possible)
     {
@@ -279,20 +290,22 @@ check_meshing_chords (Grob *me,
     {
       Grob *staff = Staff_symbol_referencer::get_staff_symbol (me);
       if (!Staff_symbol_referencer::on_line (staff, ups[0]))
-       /*
-         TODO: consider junking the else body.
-       */
-       if (to_boolean (me->get_property ("prefer-dotted-right")))
-         {
-           shift_amount = 0.5;
-         }
-       else
-         {
-           Grob *d = unsmob_grob (head_up->get_object ("dot"));
-           Grob *parent = d->get_parent (X_AXIS);
-           if (Dot_column::has_interface (parent))
-             Side_position_interface::add_support (parent, head_down);
-         }
+       {
+         /*
+           TODO: consider junking the else body.
+         */
+         if (to_boolean (me->get_property ("prefer-dotted-right")))
+           {
+             shift_amount = 0.5;
+           }
+         else
+           {
+             Grob *d = unsmob_grob (head_up->get_object ("dot"));
+             Grob *parent = d->get_parent (X_AXIS);
+             if (Dot_column::has_interface (parent))
+               Side_position_interface::add_support (parent, head_down);
+           }
+       }
     }
 
   /* For full or close half collisions, the right hand head may