* lily/vaticana-ligature-engraver.cc: bugfix: another few

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

diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc
index 83354c3a50541462b02e2145061699bbeef55e84..7dd7c4cc3e5a2392365610ce4e27991a2a0bb263 100644 (file)
--- a/lily/rest-collision.cc
+++ b/lily/rest-collision.cc
@@ -3,13 +3,14 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
+#include "rest-collision.hh"
+
 #include <math.h>              // ceil.
 
 #include "warn.hh"
-#include "rest-collision.hh"
 #include "note-column.hh"
 #include "stem.hh"
 #include "rhythmic-head.hh"
@@ -20,30 +21,45 @@
 #include "duration.hh"
 #include "directional-element-interface.hh"
 
-MAKE_SCHEME_CALLBACK (Rest_collision,force_shift_callback,2);
+MAKE_SCHEME_CALLBACK (Rest_collision, force_shift_callback, 2);
 SCM
 Rest_collision::force_shift_callback (SCM element_smob, SCM axis)
 {
   Grob *them = unsmob_grob (element_smob);
-  Axis a = (Axis) ly_scm2int (axis);
+  Axis a = (Axis) scm_to_int (axis);
   assert (a == Y_AXIS);
 
-  Grob * rc = unsmob_grob (them->get_property ("rest-collision"));
+  if (Note_column::has_rests (them))
+    {  
+      Grob * rc = unsmob_grob (them->get_property ("rest-collision"));
 
-  if (rc && !to_boolean (rc->get_property ("positioning-done")))
-    {
-      rc->set_property ("positioning-done", SCM_BOOL_T);
-
-      do_shift (rc);
-    }
-  
+      if (rc && !to_boolean (rc->get_property ("positioning-done")))
+       {
+         rc->set_property ("positioning-done", SCM_BOOL_T);
+         do_shift (rc);
+       }
+    }  
   return scm_make_real (0.0);
 }
 
 
+MAKE_SCHEME_CALLBACK (Rest_collision, force_shift_callback_rest, 2);
+SCM
+Rest_collision::force_shift_callback_rest (SCM rest, SCM axis)
+{
+  Grob *rest_grob = unsmob_grob (rest);
+  assert ((Axis) scm_to_int (axis) == Y_AXIS);
+
+  Grob *parent = rest_grob->get_parent (X_AXIS);
+  if (Note_column::has_interface (parent))
+    return force_shift_callback (parent->self_scm(), axis);
+  else
+    return scm_make_real (0.0);
+}
+
 
 void
-Rest_collision::add_column (Grob*me,Grob *p)
+Rest_collision::add_column (Grob*me, Grob *p)
 {
   me->add_dependency (p);
   Pointer_group_interface::add_grob (me, ly_symbol2scm ("elements"), p);
@@ -56,22 +72,13 @@ Rest_collision::add_column (Grob*me,Grob *p)
   */
   p->add_offset_callback (Rest_collision::force_shift_callback_proc, Y_AXIS);
   p->set_property ("rest-collision", me->self_scm ());
-}
-
-
-/*
-  Combination of dot-count and duration-log.
- */
-static SCM
-head_characteristic (Grob * col)
-{
-  Grob * s = unsmob_grob (col->get_property ("rest"));
 
-  if (!s)
-    return SCM_BOOL_F;
-  else
-    return scm_cons (s->get_property ("duration-log"),
-                   scm_int2num (Rhythmic_head::dot_count (s)));
+  Grob *rest = unsmob_grob (p->get_property ("rest"));
+  if (rest)
+    {
+      rest->add_offset_callback (Rest_collision::force_shift_callback_rest_proc,
+                                Y_AXIS);
+    }
 }
 
 /*
@@ -87,9 +94,9 @@ Rest_collision::do_shift (Grob *me)
   Link_array<Grob> rests;
   Link_array<Grob> notes;
 
-  for (SCM s = elts; ly_c_pair_p (s); s = ly_cdr (s))
+  for (SCM s = elts; scm_is_pair (s); s = scm_cdr (s))
     {
-      Grob * e = unsmob_grob (ly_car (s));
+      Grob * e = unsmob_grob (scm_car (s));
       if (unsmob_grob (e->get_property ("rest")))
        {
          /*
@@ -132,7 +139,7 @@ Rest_collision::do_shift (Grob *me)
        center one should be centered on the staff.
        */
       Drul_array< Link_array <Grob > > ordered_rests;
-      for (int i= 0; i < rests.size (); i++)
+      for (int i = 0; i < rests.size (); i++)
        {
          Grob * r = Note_column::get_rest (rests[i]);
          
@@ -154,7 +161,7 @@ Rest_collision::do_shift (Grob *me)
        if (ordered_rests[d].size () < 1)
          {
            if (ordered_rests[-d].size() > 1)
-             ordered_rests[-d][0]->warning (_("Too many colliding rests."));
+             ordered_rests[-d][0]->warning (_ ("too many colliding rests"));
          
            return SCM_UNSPECIFIED;
          }
@@ -165,7 +172,7 @@ Rest_collision::do_shift (Grob *me)
 
       Real diff = 
        (ordered_rests[DOWN].top ()->extent (common, Y_AXIS)[UP]
-        - ordered_rests[UP].top ()->extent (common, Y_AXIS)[DOWN]) /staff_space;
+        - ordered_rests[UP].top ()->extent (common, Y_AXIS)[DOWN]) / staff_space;
 
       if (diff > 0)
        {
@@ -186,7 +193,7 @@ Rest_collision::do_shift (Grob *me)
 
            Real diff = d * ((last_y - y) /staff_space);
            if (diff > 0)
-             Note_column::translate_rests (ordered_rests[d][i],d * (int) ceil (diff) * 2);
+             Note_column::translate_rests (ordered_rests[d][i], d * (int) ceil (diff) * 2);
          }
       } while (flip (&d) != LEFT);
     }
@@ -202,7 +209,7 @@ Rest_collision::do_shift (Grob *me)
       Grob * rcol = 0;
       Direction dir = CENTER;
 
-      for (int i= rests.size (); !rcol && i--;)
+      for (int i = rests.size (); !rcol && i--;)
        if (Note_column::dir (rests[i]))
          {
            dir = Note_column::dir (rests[i]);
@@ -244,13 +251,13 @@ Rest_collision::do_shift (Grob *me)
       if (discrete_dist < stafflines+1)
        discrete_dist = int (ceil (discrete_dist / 2.0)* 2.0);
 
-      Note_column::translate_rests (rcol,dir * discrete_dist);
+      Note_column::translate_rests (rcol, dir * discrete_dist);
     }
   return SCM_UNSPECIFIED;
 }
 
 
-ADD_INTERFACE (Rest_collision,"rest-collision-interface",
+ADD_INTERFACE (Rest_collision, "rest-collision-interface",
               "Move around ordinary rests (not multi-measure-rests) to avoid "
               "conflicts.",
               "minimum-distance positioning-done elements");