release: 1.1.44

[lilypond.git] / lily / rod.cc

diff --git a/lily/rod.cc b/lily/rod.cc
index 3e87138669d8b97ec1726fe21889c5e552acc3f0..0bb861423271231cb8eddaf2a069b52b5080b51f 100644 (file)
--- a/lily/rod.cc
+++ b/lily/rod.cc
@@ -3,27 +3,16 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998 Han-Wen Nienhuys <hanwen@cs.ruu.nl>
+  (c) 1998--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include "rod.hh"
 #include "p-col.hh"
 #include "debug.hh"
+#include "dimensions.hh"
 #include "single-malt-grouping-item.hh"
 
-Rod::Rod (Single_malt_grouping_item *l, Single_malt_grouping_item *r)
-{
-  item_l_drul_[LEFT] =l;
-  item_l_drul_[RIGHT]=r;
 
-  Interval li (l->my_width ());
-  Interval ri (r->my_width ());
-  if (li.empty_b () || ri.empty_b ())
-    distance_f_ = 0;
-  else
-    distance_f_ = li[RIGHT] - ri[LEFT];
-}
-         
 Rod::Rod ()
 {
   distance_f_ = 0.0;
@@ -53,8 +42,10 @@ Column_rod::compare (const Column_rod &r1, const Column_rod &r2)
 void
 Rod::add_to_cols ()
 {
-  item_l_drul_[RIGHT]->column_l ()->add_rod
-    (item_l_drul_[LEFT]->column_l (), distance_f_);
-  item_l_drul_[LEFT]->column_l ()->add_rod
-    (item_l_drul_[RIGHT]->column_l (), distance_f_);
+  Direction d = LEFT;
+  do {
+    item_l_drul_[-d]->column_l ()->add_rod
+      (item_l_drul_[d]->column_l (), distance_f_);
+  }while ((flip (&d))!=LEFT);
 }
+