X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frod.cc;h=a94bcb399671f3995b7cde709629862715a47fbb;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=6bbcbd6dcc468b4115a93cc92d4f60cb0514b30c;hpb=95de6911a5cd1f90dfcd72ec798f089f6522f50f;p=lilypond.git

diff --git a/lily/rod.cc b/lily/rod.cc
index 6bbcbd6dcc..a94bcb3996 100644
--- a/lily/rod.cc
+++ b/lily/rod.cc
@@ -1,62 +1,49 @@
-/*   
-  rod.cc --  implement Rod, Column_rod
-  
+/*
+  rod.cc -- implement Rod, Column_rod
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1998 Han-Wen Nienhuys <hanwen@cs.ruu.nl>
-  
- */
+
+  (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
+
 #include "rod.hh"
-#include "p-col.hh"
-#include "debug.hh"
-#include "single-malt-grouping-item.hh"
-#include "dimen.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_drul_[LEFT] = item_drul_[RIGHT] = 0;
 }
 
 void
-Column_rod::print () const
+Rod::columnize ()
 {
-#ifndef NDEBUG
-  DOUT << "Column_rod { rank = "
-       << other_l_->rank_i () << ", dist = " << distance_f_ << "}\n";   
-#endif
-}
+  if (!item_drul_[LEFT]
+      || !item_drul_[RIGHT])
+    return;
 
-Column_rod::Column_rod ()
-{
-  distance_f_ = 0;
-  other_l_ = 0;
-}
-  
-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_drul_[d]->get_column ();
+      distance_ += -d * item_drul_[d]->relative_coordinate (pc, X_AXIS);
+      item_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_drul_[LEFT] != item_drul_[RIGHT]
+      && item_drul_[LEFT] && item_drul_[RIGHT])
+    Spaceable_grob::add_rod (item_drul_[LEFT],
+			     item_drul_[RIGHT],
+			     distance_);
 }
+