* lily/include/transposed-music.hh (class Transposed_music): remove.

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

diff --git a/lily/note-collision.cc b/lily/note-collision.cc
index ee3f53c8883fa9f72fe0cc63ac5360057e5b3ea1..a37cf3063fe8c83983ec39be0b7593f0bf862a8c 100644 (file)
--- a/lily/note-collision.cc
+++ b/lily/note-collision.cc
@@ -6,16 +6,16 @@
   (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
+#include "note-collision.hh"
+
 #include <math.h>
 
 #include "warn.hh"
-#include "note-collision.hh"
 #include "note-column.hh"
 #include "note-head.hh"
 #include "rhythmic-head.hh"
 #include "output-def.hh"
 #include "axis-group-interface.hh"
-#include "item.hh"
 #include "stem.hh"
 #include "side-position-interface.hh"
 #include "dot-column.hh"
@@ -26,7 +26,7 @@ SCM
 Note_collision_interface::force_shift_callback (SCM element_smob, SCM axis)
 {
   Grob *me = unsmob_grob (element_smob);
-  Axis a = (Axis) ly_scm2int (axis);
+  Axis a = (Axis) scm_to_int (axis);
   assert (a == X_AXIS);
   
    me = me->get_parent (a);
@@ -140,7 +140,7 @@ check_meshing_chords (Grob *me,
   bool distant_half_collide = false;  
   bool full_collide = false;  
 
-  int i = 0, j=0;
+  int i = 0, j = 0;
   while (i < ups.size () && j < dps.size ())
   {
     if (abs (ups[i] - dps[j]) == 1)
@@ -151,7 +151,7 @@ check_meshing_chords (Grob *me,
        else
          distant_half_collide = true;
       }
-    else if (ups[i]==dps[j])
+    else if (ups[i]== dps[j])
       full_collide = true;
     else if (ups[i] >dps[0] && ups[i] < dps.top ())
       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);
@@ -268,6 +268,19 @@ check_meshing_chords (Grob *me,
     {
       Grob *d = unsmob_grob (nd->get_property ("dot"));
       Grob *parent = d->get_parent (X_AXIS);
+
+
+      /*
+       FIXME:
+        
+              |
+        x . o
+       |
+
+       
+       the . is put right of o which is erroneous o force-shifted
+       far to the right.
+      */
       if (Dot_column::has_interface (parent))
        Side_position_interface::add_support (parent, nu);
     }
@@ -275,7 +288,7 @@ check_meshing_chords (Grob *me,
   Direction d = UP;
   do
     {
-      for (int i=0; i < clash_groups[d].size (); i++)
+      for (int i = 0; i < clash_groups[d].size (); i++)
        (*offsets)[d][i] += d * shift_amount;
     }
   while ((flip (&d))!= UP);
@@ -302,21 +315,37 @@ Note_collision_interface::do_shifts (Grob* me)
   while (flip (&d) != UP);
   
   Link_array<Grob> done;
-  for (; ly_c_pair_p (hand); hand =ly_cdr (hand))
+  Real left_most = 1e6;
+  
+  Array<Real> amounts;
+  for (; scm_is_pair (hand); hand = scm_cdr (hand))
     {
-      Grob * s = unsmob_grob (ly_caar (hand));
-      Real amount = ly_scm2double (ly_cdar (hand));
-      
-      s->translate_axis (amount *wid, X_AXIS);
+      Grob * s = unsmob_grob (scm_caar (hand));
+      Real amount = scm_to_double (scm_cdar (hand)) * wid;
+
       done.push (s);
+      amounts.push (amount);
+      if (amount < left_most)
+       left_most = amount;
+      
     }
-  for (; ly_c_pair_p (autos); autos =ly_cdr (autos))
+  for (; scm_is_pair (autos); autos = scm_cdr (autos))
     {
-      Grob * s = unsmob_grob (ly_caar (autos));
-      Real amount = ly_scm2double (ly_cdar (autos));
+      Grob * s = unsmob_grob (scm_caar (autos));
+      Real amount = scm_to_double (scm_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,9 +355,9 @@ Note_collision_interface::get_clash_groups (Grob *me)
   Drul_array<Link_array<Grob> > clash_groups;
  
   SCM s = me->get_property ("elements");
-  for (; ly_c_pair_p (s); s = ly_cdr (s))
+  for (; scm_is_pair (s); s = scm_cdr (s))
     {
-      SCM car = ly_car (s);
+      SCM car = scm_car (s);
 
       Grob * se = unsmob_grob (car);
       if (Note_column::has_interface (se))
@@ -366,18 +395,18 @@ Note_collision_interface::automatic_shift (Grob *me,
       Array<int> & shift (shifts[d]);
       Link_array<Grob> & clashes (clash_groups[d]);
 
-      for (int i=0; i < clashes.size (); i++)
+      for (int i = 0; i < clashes.size (); i++)
        {
          SCM sh
            = clashes[i]->get_property ("horizontal-shift");
 
-         if (ly_c_number_p (sh))
-           shift.push (ly_scm2int (sh));
+         if (scm_is_number (sh))
+           shift.push (scm_to_int (sh));
          else
            shift.push (0);
        }
       
-      for (int i=1; i < shift.size (); i++)
+      for (int i =1; i < shift.size (); i++)
        {
          if (shift[i-1] == shift[i])
            {
@@ -393,7 +422,7 @@ Note_collision_interface::automatic_shift (Grob *me,
   d = UP;
   do
     {
-      for (int i=0; i < clash_groups[d].size (); i++)
+      for (int i = 0; i < clash_groups[d].size (); i++)
        {
          Slice s (Note_column::head_positions_interval (clash_groups[d][i]));
          s[LEFT] --;
@@ -415,9 +444,9 @@ Note_collision_interface::automatic_shift (Grob *me,
   
   do
     {
-      for (int i=1; i < clash_groups[d].size (); i++)
+      for (int i =1; i < clash_groups[d].size (); i++)
        {
-         Slice prev =extents[d][i-1];
+         Slice prev = extents[d][i-1];
          prev.intersect (extents[d][i]);
          if (prev.length ()> 0 ||
  (extents[-d].size () && d * (extents[d][i][-d] - extents[-d][0][d]) < 0))
@@ -436,7 +465,7 @@ Note_collision_interface::automatic_shift (Grob *me,
   
   do
     {
-      for (int i=0; i < clash_groups[d].size (); i++)
+      for (int i = 0; i < clash_groups[d].size (); i++)
        tups = scm_cons (scm_cons (clash_groups[d][i]->self_scm (),
                                 scm_make_real (offsets[d][i])),
                        tups);
@@ -452,12 +481,12 @@ Note_collision_interface::forced_shift (Grob *me)
   SCM tups = SCM_EOL;
   
   SCM s = me->get_property ("elements");
-  for (; ly_c_pair_p (s); s = ly_cdr (s))
+  for (; scm_is_pair (s); s = scm_cdr (s))
     {
-      Grob * se = unsmob_grob (ly_car (s));
+      Grob * se = unsmob_grob (scm_car (s));
 
       SCM force =  se->get_property ("force-hshift");
-      if (ly_c_number_p (force))
+      if (scm_is_number (force))
        {
          tups = scm_cons (scm_cons (se->self_scm (), force),
                          tups);