release: 1.3.50

[lilypond.git] / lily / collision.cc

diff --git a/lily/collision.cc b/lily/collision.cc
index f1691792c64754faccc7d43f2a79c7179c0a065d..32ee0d69f685e985e038cfd6fde8e51ba3f30d39 100644 (file)
--- a/lily/collision.cc
+++ b/lily/collision.cc
@@ -3,48 +3,52 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 #include "debug.hh"
 #include "collision.hh"
 #include "note-column.hh"
 #include "note-head.hh"
 #include "paper-def.hh"
+#include "axis-group-interface.hh"
+
 
 Collision::Collision()
 {
-  set_axes (X_AXIS, Y_AXIS);
+  Axis_group_interface (this).set_interface ();
+  Axis_group_interface (this).set_axes (X_AXIS, Y_AXIS);
 }
 
 void
 Collision::add_column (Note_column* ncol_l)
 {
-  add_element (ncol_l);
+  Axis_group_interface (this).add_element (ncol_l);
   add_dependency (ncol_l);
 }
 
-/*
-  UGH.  junk Shift_tup .
- */
-
 void
-Collision::do_pre_processing()
+Collision::before_line_breaking ()
 {
-  Array<Shift_tup> autos (automatic_shift ());
-  Array<Shift_tup> hand (forced_shift ());
+  SCM autos (automatic_shift ());
+  SCM hand (forced_shift ());
   Link_array<Score_element> done;
   
   Real wid = paper_l ()->get_var ("collision_note_width");
-  for (int i=0; i < hand.size (); i++)
+  for (; gh_pair_p (hand); hand =gh_cdr (hand))
     {
-      hand[i].e1_->translate_axis (hand[i].e2_ *wid, X_AXIS);
-      done.push (hand[i].e1_);
+      Score_element * s = unsmob_element (gh_caar (hand));
+      Real amount = gh_scm2double (gh_cdar (hand));
+      
+      s->translate_axis (amount *wid, X_AXIS);
+      done.push (s);
     }
-
-  for (int i=0; i < autos.size (); i++)
+  for (; gh_pair_p (autos); autos =gh_cdr (autos))
     {
-      if (!done.find_l (autos[i].e1_))
-       autos[i].e1_->translate_axis (autos[i].e2_ * wid, X_AXIS);
+      Score_element * s = unsmob_element (gh_caar (autos));
+      Real amount = gh_scm2double (gh_cdar (autos));
+      
+      if (!done.find_l (s))
+       s->translate_axis (amount * wid, X_AXIS);
     }
 }
 
@@ -54,13 +58,12 @@ Collision::do_pre_processing()
   This should be done better, probably.
 
   */
-Array< Shift_tup >
+SCM
 Collision::automatic_shift ()
 {
   Drul_array<Link_array<Note_column> > clash_groups;
   Drul_array<Array<int> > shifts;
-  Array<Shift_tup>  tups;
-
+  SCM  tups = SCM_EOL;
 
   SCM s = get_elt_property ("elements");
   for (; gh_pair_p (s); s = gh_cdr (s))
@@ -145,18 +148,19 @@ Collision::automatic_shift ()
       /*
        TODO.
        */
-      Note_head * nu_l= cu_l->first_head();  // cu_l->head_l_arr_[0];
-      Note_head * nd_l = cd_l->first_head(); // cd_l->head_l_arr_.top();
-
-
+      Note_head * nu_l= cu_l->first_head();
+      Note_head * nd_l = cd_l->first_head();
       
-      int downpos =    cd_l->head_positions_interval ()[BIGGER];
-      int uppos =      cu_l->head_positions_interval ()[SMALLER];      
+      int downpos = cd_l->head_positions_interval ()[BIGGER];
+      int uppos = cu_l->head_positions_interval ()[SMALLER];      
       
       bool merge  =
        downpos == uppos
-       && nu_l->balltype_i_ == nd_l->balltype_i_
-       && nu_l->dots_i () == nd_l->dots_i ();
+       && nu_l->balltype_i () == nd_l->balltype_i ();
+
+
+      if (!to_boolean (get_elt_property ("merge-differently-dotted")))
+       merge = merge && nu_l->dot_count () == nd_l->dot_count ();
 
       /*
        notes are close, but can not be merged.  Shift
@@ -172,21 +176,21 @@ Collision::automatic_shift ()
          while ((flip (&d))!= UP);
     }
 
-
   do
     {
       for (int i=0; i < clash_groups[d].size (); i++)
-       tups.push (Shift_tup (clash_groups[d][i], offsets[d][i]));
+       tups = gh_cons (gh_cons (clash_groups[d][i]->self_scm_, gh_double2scm (offsets[d][i])),
+                                tups);
     }
   while (flip (&d) != UP);
   return tups;
 }
 
 
-Array <Shift_tup>
+SCM
 Collision::forced_shift ()
 {
-  Array<Shift_tup> tups;
+  SCM tups = SCM_EOL;
   
   SCM s = get_elt_property ("elements");
   for (; gh_pair_p (s); s = gh_cdr (s))
@@ -194,9 +198,10 @@ Collision::forced_shift ()
       Score_element * se = unsmob_element ( gh_car (s));
 
       SCM force =  se->remove_elt_property ("force-hshift");
-      if (force != SCM_UNDEFINED)
+      if (gh_number_p (force))
        {
-         tups. push (Shift_tup (se, gh_scm2double (force)));
+         tups = gh_cons (gh_cons (se->self_scm_, force),
+                         tups);
        }
     }
   return tups;