Merge branch 'master' into dev/jmandereau

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

diff --git a/lily/note-collision.cc b/lily/note-collision.cc
index bce6d08a60c52dfdb3da8eb4590b6169ae51872c..5ba8fe4872ad9c27f3e70db15aa863a3845a3a5e 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--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "note-collision.hh"
@@ -15,6 +15,7 @@
 #include "note-head.hh"
 #include "output-def.hh"
 #include "pointer-group-interface.hh"
+#include "item.hh"
 #include "rhythmic-head.hh"
 #include "staff-symbol-referencer.hh"
 #include "side-position-interface.hh"
@@ -39,6 +40,9 @@ check_meshing_chords (Grob *me,
   if (!Note_column::get_stem (cu) || !Note_column::get_stem (cd))
     return;
 
+  Drul_array<Grob*> stems (Note_column::get_stem (cd),
+                          Note_column::get_stem (cu));
+  
   Grob *nu = Note_column::first_head (cu);
   Grob *nd = Note_column::first_head (cd);
 
@@ -90,10 +94,10 @@ check_meshing_chords (Grob *me,
   /* Should never merge quarter and half notes, as this would make
      them indistinguishable.  */
   if (merge_possible
-      && ((Rhythmic_head::duration_log (nu) == 1
-          && Rhythmic_head::duration_log (nd) == 2)
-         || (Rhythmic_head::duration_log (nu) == 2
-             && Rhythmic_head::duration_log (nd) == 1)))
+      && ((Stem::duration_log (stems[UP]) == 1
+          && Stem::duration_log (stems[DOWN]) == 2)
+         || (Stem::duration_log (stems[UP]) == 2
+             && Stem::duration_log (stems[DOWN]) == 1)))
     merge_possible = false;
 
   /*
@@ -243,6 +247,22 @@ check_meshing_chords (Grob *me,
   else
     shift_amount *= 0.17;
 
+  /*
+    
+  */
+  if (full_collide
+      && dnball_type * upball_type == 0)
+    {
+      if (upball_type == 0 && dnball_type == 1)
+       shift_amount *= 1.25;
+      else if (upball_type == 0 && dnball_type == 2)
+       shift_amount *= 1.35;
+      else if (dnball_type == 0 && upball_type == 1)
+       shift_amount *= 0.7;
+      else if (dnball_type == 0 && upball_type == 2)
+       shift_amount *= 0.75;
+    }
+  
   /*
    * Fix issue #44:
    *
@@ -286,7 +306,12 @@ check_meshing_chords (Grob *me,
        far to the right.
       */
       if (Dot_column::has_interface (parent))
-       Side_position_interface::add_support (parent, nu);
+       {
+         Grob *stem = unsmob_grob (nu->get_object ("stem"));
+         extract_grob_set (stem, "note-heads", heads);
+         for (vsize i = 0; i < heads.size (); i++)
+           Side_position_interface::add_support (parent, heads[i]);
+       }
     }
 
   Direction d = UP;
@@ -299,17 +324,19 @@ check_meshing_chords (Grob *me,
 }
 
 
-MAKE_SCHEME_CALLBACK(Note_collision_interface, calc_positioning_done, 1) 
+MAKE_SCHEME_CALLBACK (Note_collision_interface, calc_positioning_done, 1) 
 SCM
 Note_collision_interface::calc_positioning_done (SCM smob)
 {
-  Grob *me = unsmob_grob (smob);  
+  Grob *me = unsmob_grob (smob);
+  me->set_property ("positioning-done", SCM_BOOL_T);
+  
   Drul_array<vector<Grob*> > cg = get_clash_groups (me);
 
   Direction d = UP;
   do
     {
-      for (vsize i = cg[d].size(); i--; )
+      for (vsize i = cg[d].size (); i--; )
        {
          /*
            Trigger positioning
@@ -404,12 +431,10 @@ Note_collision_interface::get_clash_groups (Grob *me)
 /** This complicated routine moves note columns around horizontally to
     ensure that notes don't clash.
 
-    This should be put into Scheme.
 */
 SCM
 Note_collision_interface::automatic_shift (Grob *me,
-                                          Drul_array < vector<Grob*>
-                                          > clash_groups)
+                                          Drul_array<vector<Grob*> > clash_groups)
 {
   Drul_array < vector<int> > shifts;
   SCM tups = SCM_EOL;
@@ -481,6 +506,23 @@ Note_collision_interface::automatic_shift (Grob *me,
     }
   while ((flip (&d)) != UP);
 
+
+  /*
+    see input/regression/dot-up-voice-collision.ly
+   */
+  for (vsize i = 0; i < clash_groups[UP].size (); i++)
+    {
+      Grob *g = clash_groups[UP][i];
+      Grob *dc = Note_column::dot_column (g);
+      
+      if (dc)
+       for (vsize j = i + 1;  j < clash_groups[UP].size (); j++)
+         {
+           Grob *stem = Note_column::get_stem (clash_groups[UP][j]);
+           Side_position_interface::add_support (dc, stem);
+         }
+    }
+  
   /*
     Check if chords are meshing
   */
@@ -526,7 +568,7 @@ Note_collision_interface::add_column (Grob *me, Grob *ncol)
   Axis_group_interface::add_element (me, ncol);
 }
 
-ADD_INTERFACE (Note_collision_interface, "note-collision-interface",
+ADD_INTERFACE (Note_collision_interface,
               "An object that handles collisions between notes with different stem "
               "directions and horizontal shifts. Most of the interesting properties "
               "are to be set in @ref{note-column-interface}: these are "
@@ -535,4 +577,4 @@ ADD_INTERFACE (Note_collision_interface, "note-collision-interface",
               /* properties */
               "merge-differently-dotted "
               "merge-differently-headed "
-              "positioning-done");
+              "positioning-done ");