X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frod.cc;h=bcba357247b43084b21c2c4213a1b245f792556f;hb=ca20eaa74e7e762c0611de26cc2267909ae27e02;hp=229af033c2d243bcbb526cecc247b19c5c5ec58c;hpb=068b30ff4bfe81e6dd41ac3736bbc52980e79a1f;p=lilypond.git

diff --git a/lily/rod.cc b/lily/rod.cc
index 229af033c2..bcba357247 100644
--- a/lily/rod.cc
+++ b/lily/rod.cc
@@ -3,60 +3,49 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2005 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"
 
+#include "paper-column.hh"
+#include "warn.hh"
+#include "dimensions.hh"
+#include "spaceable-grob.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] + 1.5 PT; // ugh
-}
-	  
 Rod::Rod ()
 {
-  distance_f_ = 0.0;
-  item_l_drul_[LEFT] = item_l_drul_[RIGHT] =0;
+  distance_ = 0.0;
+  item_l_drul_[LEFT] = item_l_drul_[RIGHT] = 0;
 }
 
-void
-Column_rod::print () const
-{
-#ifndef NDEBUG
-  DOUT << "Column_rod { rank = "
-       << other_l_->rank_i () << ", dist = " << distance_f_ << "}\n";   
-#endif
-}
 
-Column_rod::Column_rod ()
+
+void
+Rod::columnize ()
 {
-  distance_f_ = 0;
-  other_l_ = 0;
-}
+  if (!item_l_drul_[LEFT]
+      || !item_l_drul_[RIGHT])
+    return ;
   
-int
-Column_rod::compare (const Column_rod &r1, const Column_rod &r2)
-{
-  return r1.other_l_->rank_i() - r2.other_l_->rank_i();
+  Direction d = LEFT;
+  do {
+    Paper_column * pc = item_l_drul_[d]->get_column ();
+    distance_ += - d * item_l_drul_[d]->relative_coordinate (pc, X_AXIS);
+    item_l_drul_[d] = pc;
+  } while ((flip (&d))!= LEFT);
+
 }
+
 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_);
+  columnize ();
+  if (item_l_drul_[LEFT] != item_l_drul_[RIGHT]
+      && item_l_drul_[LEFT] && item_l_drul_[RIGHT])
+    Spaceable_grob::add_rod (item_l_drul_[LEFT],
+			     item_l_drul_[RIGHT],
+			     distance_);
 }
+