Configure only pristine build tree or on user

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

diff --git a/lily/note-collision.cc b/lily/note-collision.cc
index c7d8886eb7dbaf895a813d3fefff8421fe6b4a71..31d084b31ffc153bb6607a45b7692e509a59b5ff 100644 (file)
--- a/lily/note-collision.cc
+++ b/lily/note-collision.cc
@@ -13,7 +13,7 @@
 #include "note-column.hh"
 #include "note-head.hh"
 #include "rhythmic-head.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 #include "axis-group-interface.hh"
 #include "item.hh"
 #include "stem.hh"
@@ -74,7 +74,7 @@ check_meshing_chords (Grob *me,
 
 
   /* Do not merge notes typeset in different style. */
-  if ( !ly_equal_p (nu->get_property ("style"),
+  if ( !ly_c_equal_p (nu->get_property ("style"),
                     nd->get_property ("style") ) )
     merge_possible = false;
   
@@ -237,7 +237,7 @@ check_meshing_chords (Grob *me,
            d->suicide ();
        }
       
-      if (wipe_ball && wipe_ball->live ())
+      if (wipe_ball && wipe_ball->is_live ())
        {
          wipe_ball->set_property ("transparent", SCM_BOOL_T);
          wipe_ball->set_property ("stencil", SCM_EOL);
@@ -302,21 +302,37 @@ Note_collision_interface::do_shifts (Grob* me)
   while (flip (&d) != UP);
   
   Link_array<Grob> done;
-  for (; ly_pair_p (hand); hand =ly_cdr (hand))
+  Real left_most = 1e6;
+  
+  Array<Real> amounts;
+  for (; ly_c_pair_p (hand); hand =ly_cdr (hand))
     {
       Grob * s = unsmob_grob (ly_caar (hand));
-      Real amount = ly_scm2double (ly_cdar (hand));
-      
-      s->translate_axis (amount *wid, X_AXIS);
+      Real amount = ly_scm2double (ly_cdar (hand)) * wid;
+
       done.push (s);
+      amounts.push (amount);
+      if (amount < left_most)
+       left_most = amount;
+      
     }
-  for (; ly_pair_p (autos); autos =ly_cdr (autos))
+  for (; ly_c_pair_p (autos); autos =ly_cdr (autos))
     {
       Grob * s = unsmob_grob (ly_caar (autos));
-      Real amount = ly_scm2double (ly_cdar (autos));
+      Real amount = ly_scm2double (ly_cdar (autos)) *wid;
       
       if (!done.find (s))
-       s->translate_axis (amount * wid, X_AXIS);
+       {
+         done.push (s);
+         amounts.push (amount);
+         if (amount < left_most)
+           left_most = amount;
+       }
+    }
+
+  for (int i = 0; i < amounts.size(); i++)
+    {
+      done[i]->translate_axis (amounts[i] - left_most, X_AXIS);
     }
 }
 
@@ -326,7 +342,7 @@ Note_collision_interface::get_clash_groups (Grob *me)
   Drul_array<Link_array<Grob> > clash_groups;
  
   SCM s = me->get_property ("elements");
-  for (; ly_pair_p (s); s = ly_cdr (s))
+  for (; ly_c_pair_p (s); s = ly_cdr (s))
     {
       SCM car = ly_car (s);
 
@@ -371,7 +387,7 @@ Note_collision_interface::automatic_shift (Grob *me,
          SCM sh
            = clashes[i]->get_property ("horizontal-shift");
 
-         if (ly_number_p (sh))
+         if (ly_c_number_p (sh))
            shift.push (ly_scm2int (sh));
          else
            shift.push (0);
@@ -452,12 +468,12 @@ Note_collision_interface::forced_shift (Grob *me)
   SCM tups = SCM_EOL;
   
   SCM s = me->get_property ("elements");
-  for (; ly_pair_p (s); s = ly_cdr (s))
+  for (; ly_c_pair_p (s); s = ly_cdr (s))
     {
       Grob * se = unsmob_grob (ly_car (s));
 
       SCM force =  se->get_property ("force-hshift");
-      if (ly_number_p (force))
+      if (ly_c_number_p (force))
        {
          tups = scm_cons (scm_cons (se->self_scm (), force),
                          tups);