release: 1.3.101

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

diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc
index 952bded8fa92f265fb3cb262ab8cbac411bfdfc7..efb217c73ea5c1de6a4c0161c1dd918442cf172e 100644 (file)
--- a/lily/rest-collision.cc
+++ b/lily/rest-collision.cc
@@ -19,9 +19,12 @@
 #include "staff-symbol-referencer.hh"
 #include "duration.hh"
 
-Real
-Rest_collision::force_shift_callback (Score_element *them, Axis a)
+MAKE_SCHEME_CALLBACK(Rest_collision,force_shift_callback,2);
+SCM
+Rest_collision::force_shift_callback (SCM element_smob, SCM axis)
 {
+  Score_element *them = unsmob_element (element_smob);
+  Axis a = (Axis) gh_scm2int (axis);
   assert (a == Y_AXIS);
 
   Score_element * rc = unsmob_element (them->get_elt_property ("rest-collision"));
@@ -37,20 +40,23 @@ Rest_collision::force_shift_callback (Score_element *them, Axis a)
       do_shift (rc, elts);
     }
   
-  return 0.0;
+  return gh_double2scm (0.0);
 }
 
 void
 Rest_collision::add_column (Score_element*me,Score_element *p)
 {
   me->add_dependency (p);
-  Pointer_group_interface gi (me);  
-  gi.add_element (p);
+  Pointer_group_interface::add_element (me, "elements", p);
 
-  p->add_offset_callback (&Rest_collision::force_shift_callback, Y_AXIS);
+  p->add_offset_callback (Rest_collision::force_shift_callback_proc, Y_AXIS);
   p->set_elt_property ("rest-collision", me->self_scm ());
 }
 
+
+/*
+  Combination of dot-count and duration-log.
+ */
 static SCM
 head_characteristic (Score_element * col)
 {
@@ -105,11 +111,6 @@ Rest_collision::do_shift (Score_element *me, SCM elts)
   // meisjes met meisjes
   if (!notes.size()) 
     {
-
-      /*
-       FIXME: col2rhythmic_head and rhythmic_head2mom sucks bigtime.
-       
-      */
       SCM characteristic = head_characteristic  (rests[0]);
       int i = 1;
       for (; i < rests.size (); i++)
@@ -142,13 +143,29 @@ Rest_collision::do_shift (Score_element *me, SCM elts)
        display_count = rests.size ();
       
       /*
-       UGH.  Should get dims from table.  Should have minimum dist.
+       Ugh. Should have minimum dist.
+
+       Ugh. What do we do if we have three different rests?
+       
        */
-      int dy = display_count > 2 ? 6 : 4;
+      int dy = display_count > 2 ? 6 : 4; // FIXME Should get dims from table.
       if (display_count > 1)
        {
-         Note_column::translate_rests (rests[0],dy);   
-         Note_column::translate_rests (rests[1], -dy);
+         Direction d0 = Note_column::dir (rests[0]);
+         Direction d1 = Note_column::dir (rests[1]);     
+
+         if (!d0 && !d1)
+           {
+             d0= UP;
+             d1 = DOWN;
+           }
+         else if (!d0)
+           d0 = - d1;
+         else if (!d1)
+           d1 = -d0;
+               
+         Note_column::translate_rests (rests[0],d0 *dy);       
+         Note_column::translate_rests (rests[1], d1 *dy);
        }
     }
   // meisjes met jongetjes
@@ -172,7 +189,7 @@ Rest_collision::do_shift (Score_element *me, SCM elts)
        return SCM_UNSPECIFIED;
       
       // staff ref'd?
-      Real staff_space = me->paper_l()->get_var ("staffspace");
+      Real staff_space = 1.0;
 
        /* FIXME
          staff_space =  rcol->rests[0]->staff_space ();
@@ -185,7 +202,7 @@ Rest_collision::do_shift (Score_element *me, SCM elts)
       Interval notedim;
       for (int i = 0; i < notes.size(); i++) 
        {
-         notedim.unite (notes[i]->extent (Y_AXIS));
+         notedim.unite (notes[i]->extent (notes[i],Y_AXIS)); // refp?
        }
 
       Interval inter (notedim);
@@ -216,7 +233,7 @@ Rest_collision::do_shift (Score_element *me, SCM elts)
 void
 Rest_collision::set_interface (Score_element*me)
 {
-  me->set_extent_callback (0, X_AXIS);
-  me->set_extent_callback (0, Y_AXIS);
+  me->set_extent_callback (SCM_EOL, X_AXIS);
+  me->set_extent_callback (SCM_EOL, Y_AXIS);
 }