Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

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

diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc
index aebdf84cf841925b98ece9b30483ad6b89b382a3..3e823288378faa780767edfbebe2ababb19326f5 100644 (file)
--- a/lily/rest-collision.cc
+++ b/lily/rest-collision.cc
@@ -21,6 +21,7 @@ using namespace std;
 #include "rhythmic-head.hh"
 #include "staff-symbol-referencer.hh"
 #include "stem.hh"
+#include "grob.hh"
 #include "warn.hh"
 
 MAKE_SCHEME_CALLBACK (Rest_collision, force_shift_callback, 1);
@@ -40,7 +41,7 @@ Rest_collision::force_shift_callback (SCM smob)
   return scm_from_double (0.0);
 }
 
-MAKE_SCHEME_CALLBACK (Rest_collision, force_shift_callback_rest, 2);
+MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Rest_collision, force_shift_callback_rest, 2, 1);
 SCM
 Rest_collision::force_shift_callback_rest (SCM rest, SCM offset)
 {
@@ -51,7 +52,8 @@ Rest_collision::force_shift_callback_rest (SCM rest, SCM offset)
     translate REST; we need the result of this translation later on,
     while the offset probably still is 0/calculation-in-progress.
    */
-  rest_grob->translate_axis (scm_to_double (offset), Y_AXIS);
+  if (scm_is_number (offset))
+    rest_grob->translate_axis (scm_to_double (offset), Y_AXIS);
   
   if (Note_column::has_interface (parent))
     force_shift_callback (parent->self_scm ());
@@ -92,8 +94,8 @@ Rest_collision::calc_positioning_done (SCM smob)
   Grob *me = unsmob_grob (smob);
   extract_grob_set (me, "elements", elts);
 
-  Link_array__Grob_ rests;
-  Link_array__Grob_ notes;
+  vector<Grob*> rests;
+  vector<Grob*> notes;
 
   for (vsize i = 0; i < elts.size (); i++)
     {
@@ -137,7 +139,7 @@ Rest_collision::calc_positioning_done (SCM smob)
        This is incomplete: in case of an uneven number of rests, the
        center one should be centered on the staff.
       */
-      Drul_array<Link_array__Grob_ > ordered_rests;
+      Drul_array<vector<Grob*> > ordered_rests;
       for (vsize i = 0; i < rests.size (); i++)
        {
          Grob *r = Note_column::get_rest (rests[i]);
@@ -151,7 +153,7 @@ Rest_collision::calc_positioning_done (SCM smob)
 
       Direction d = LEFT;
       do
-       vector_sort (ordered_rests[d], Note_column::shift_compare);
+       vector_sort (ordered_rests[d], Note_column::shift_less);
       while (flip (&d) != LEFT)
        ;
 
@@ -212,13 +214,14 @@ Rest_collision::calc_positioning_done (SCM smob)
       for (vsize i = rests.size (); !rcol && i--;)
        if (Note_column::dir (rests[i]))
          {
-           dir = Note_column::dir (rests[i]);
            rcol = rests[i];
+           dir = Note_column::dir (rcol);
          }
 
       if (!rcol)
        return SCM_UNSPECIFIED;
 
+      Grob *rest = Note_column::get_rest (rcol);
       Grob *common = common_refpoint_of_array (notes, rcol, Y_AXIS);
 
       Interval restdim = rcol->extent (common, Y_AXIS);
@@ -232,9 +235,10 @@ Rest_collision::calc_positioning_done (SCM smob)
       for (vsize i = 0; i < notes.size (); i++)
        notedim.unite (notes[i]->extent (common, Y_AXIS));
 
-      Real dist
-       = minimum_dist + dir * max (notedim[dir] - restdim[-dir], 0.0);
 
+      Real y = dir * max (0.0,
+                         -dir * restdim[-dir] + dir * notedim[dir]  + minimum_dist);
+      
       int stafflines = Staff_symbol_referencer::line_count (me);
       if (!stafflines)
        {
@@ -243,18 +247,21 @@ Rest_collision::calc_positioning_done (SCM smob)
        }
 
       // move discretely by half spaces.
-      int discrete_dist = int (ceil (dist / (0.5 * staff_space)));
+      int discrete_y = dir * int (ceil (y / (0.5 * dir * staff_space)));
 
       // move by whole spaces inside the staff.
-      if (discrete_dist < stafflines + 1)
-       discrete_dist = int (ceil (discrete_dist / 2.0) * 2.0);
+      if (fabs (Staff_symbol_referencer::get_position (rest)
+               + discrete_y) < stafflines + 1)
+       {
+         discrete_y = dir * int (ceil (dir * discrete_y / 2.0) * 2.0);
+       }
 
-      Note_column::translate_rests (rcol, dir * discrete_dist);
+      Note_column::translate_rests (rcol, discrete_y);
     }
   return SCM_UNSPECIFIED;
 }
 
-ADD_INTERFACE (Rest_collision, "rest-collision-interface",
+ADD_INTERFACE (Rest_collision,
               "Move around ordinary rests (not multi-measure-rests) to avoid "
               "conflicts.",