release: 1.1.44

[lilypond.git] / lily / collision.cc

diff --git a/lily/collision.cc b/lily/collision.cc
index 17c57cf3384a34cad2efcf5b44c3c5ac893af2e6..b4136ae520efe85490c286bde43bad70aebd5b11 100644 (file)
--- a/lily/collision.cc
+++ b/lily/collision.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 #include "debug.hh"
 #include "collision.hh"
@@ -13,10 +13,11 @@
 
 Collision::Collision()
 {
+  set_axes (X_AXIS, Y_AXIS);
 }
 
 void
-Collision::add (Note_column* ncol_l)
+Collision::add_column (Note_column* ncol_l)
 {
   clash_l_arr_.push (ncol_l);
   add_element (ncol_l);
@@ -31,7 +32,7 @@ int idx (int dir, bool h_shift_b)
   assert (abs (dir) == 1);
   int j = dir > 0 ? 0 : 3;
   if (h_shift_b)
-       j += dir;
+    j += dir;
   return j;
 }
 
@@ -47,24 +48,26 @@ void
 Collision::do_pre_processing()
 {
   if (clash_l_arr_.size() <= 1)
-       return;
+    return;
 
   /*
     [stem up, stem up shifted, stem down shifted, stem down]
-    */
-  Array<Note_column*> clash_group_arr_a[4];
+  */ 
+  Array<Note_column*> clash_group_arr_a[4]; // TODO: use drul.
 
   for (int i=0; i < clash_l_arr_.size(); i++)
     {
       Note_column* c_l = clash_l_arr_[i];
-      if (! c_l->dir_)
+      Direction d = c_l->dir ();
+      if (!d)
        {
-         warning (_("No stem direction set. Ignoring column in clash. "));
+         warning (_ ("No stem direction set. Ignoring column in clash."));
          continue;
        }
-      int d = (c_l->dir_);
 
-      clash_group_arr_a[idx (d, c_l->h_shift_b_)].push (c_l);
+      SCM shift = c_l->remove_elt_property (horizontal_shift_scm_sym);
+      bool shift_b  = (shift != SCM_BOOL_F);
+      clash_group_arr_a[idx (d, shift_b)].push (c_l);
     }
 
 
@@ -72,11 +75,11 @@ Collision::do_pre_processing()
     {
       if (clash_group_arr_a[j].size() > 1)
        {
-         warning (_("Too many clashing notecolumns. Ignoring them."));
+         warning (_ ("Too many clashing notecolumns. Ignoring them."));
          return;
        }
     }
-  int d = 1;
+  Direction d = UP;
   do
     {
       if (!clash_group_arr_a[idx (d, false)].size())
@@ -85,13 +88,12 @@ Collision::do_pre_processing()
          clash_group_arr_a[idx (d, true)].clear();
        }
     }
-  while ((d *= -1) != 1);
+  while (flip (&d) != UP);
 
 
   Interval_t<int> y_extent[4];
   Note_column * col_l_a[4];
   Real x_off [4];
-  int y_off[4];
 
   for (int j =0 ; j < 4; j++)
     {
@@ -107,64 +109,66 @@ Collision::do_pre_processing()
 
 
       x_off [j] = 0.0;
-      y_off[j] = 0;
     }
 
   do
     {
       x_off[idx (d, true)] = d*0.5;
     }
-  while ((d *= -1) != 1);
+  while (flip (&d) != UP);
 
 
   // y_extent: smallest y-pos noteball interval containing all balls
   // 4 (0..3) groups: stem up/down; shift on/off;
-  Interval_t<int> middle (y_extent[idx (-1,0)].max(),
-                         y_extent[idx (1,0)].min());
-  Interval_t<int> open_middle (y_extent[idx (-1,0)].max()+1, y_extent[idx (1,0)].min ()-1);
+  Interval_t<int> middle (y_extent[idx (-1,0)][BIGGER],
+                         y_extent[idx (1,0)][SMALLER]);
+  Interval_t<int> open_middle (y_extent[idx (-1,0)][BIGGER]+1, y_extent[idx (1,0)][SMALLER]-1);
   do
     {
       if (!open_middle.contains_b (y_extent[idx (d,true)]))
        x_off[idx (d, true)] = d *1.0 ;
     } while ((d *= -1) != 1);
 
+
   if (!middle.empty_b()
-      && middle.length() < 2 && col_l_a[idx (1,0)] && col_l_a[idx (-1,0)]) {
-    // reproduction of bugfix at 3am ?
-    Note_head * nu_l= col_l_a[idx (1,0)]->head_l_arr_[0];
-    Note_head * nd_l = col_l_a[idx (-1,0)]->head_l_arr_.top();
-    if (! (nu_l->balltype_i_ == nd_l->balltype_i_
-          && nu_l->dots_i_ == nd_l->dots_i_  && middle.length() == 0))
-      {
-       x_off[idx (1,0)] -= 0.5;
-       x_off[idx (1,1)] -= 0.5;
-       x_off[idx (-1,1)] += 0.5;
-       x_off[idx (-1,0)] += 0.5;
-      }
-
-  }
-  Real inter_f = paper()->internote_f ();
-  Real wid_f = paper()->note_width ();
+      && middle.length() < 2 && col_l_a[idx (1,0)] && col_l_a[idx (-1,0)])
+    {
+      // reproduction of bugfix at 3am ?
+      Note_head * nu_l= col_l_a[idx (1,0)]->head_l_arr_[0];
+      Note_head * nd_l = col_l_a[idx (-1,0)]->head_l_arr_.top();
+      if (! (nu_l->balltype_i_ == nd_l->balltype_i_
+            && nu_l->dots_i_ == nd_l->dots_i_  && middle.length() == 0))
+       {
+         do
+           {
+             x_off[idx (d, false)] -= d*0.5;
+             x_off[idx (d, true)] -= d*0.5;
+           }
+         while (flip (&d) != UP);
+       }
+    }
+
+  Real wid_f = paper_l ()->note_width ();
   for (int j=0; j < 4; j++)
     {
       if (col_l_a[j])
        {
-         /* collision.cc:138: request for method `translate' is ambiguous
-
-            (shaddup)
-            */
-         Offset o (x_off[j] * wid_f, y_off[j] * inter_f);
-         ((Score_elem*)col_l_a[j])->translate (o);
+         Offset o (x_off[j] * wid_f, 0);
+         col_l_a[j]->translate (o);
        }
     }
 }
 
 
-IMPLEMENT_IS_TYPE_B1(Collision, Item);
+
 
 void
-Collision::do_substitute_dependency (Score_elem*o_l,Score_elem*n_l)
+Collision::do_substitute_element_pointer (Score_element*o_l,Score_element*n_l)
 {
-  clash_l_arr_.substitute ((Note_column*)o_l->item(),
-                          (Note_column*)(n_l?n_l->item():0));
+  if (o_l)
+    {
+      clash_l_arr_.substitute (dynamic_cast<Note_column *> (o_l),
+                              dynamic_cast <Note_column *> (n_l));
+
+    }
 }