X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frod.cc;h=84d99e0b11e44fad9e543a719e9adbbbf18273df;hb=aa23e460ca96734a29387c163e75db4f3980d13f;hp=008707bbc1da16aac1a7950aa0c36923734b6e22;hpb=cfb5287829e4c8df689ef42e4367c44e51298dcd;p=lilypond.git

diff --git a/lily/rod.cc b/lily/rod.cc
index 008707bbc1..84d99e0b11 100644
--- a/lily/rod.cc
+++ b/lily/rod.cc
@@ -1,70 +1,49 @@
-/*   
-  rod.cc --  implement Rod, Column_rod
-  
+/*
+  rod.cc -- implement Rod, Column_rod
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1998--2005 Han-Wen Nienhuys <hanwen@xs4all.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 ()
 {
-  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();
-}
-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
+    {
+      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
-Column_spring::print () const
+Rod::add_to_cols ()
 {
-#ifndef NDEBUG
-  DOUT << "Column_spring { rank = "
-       << other_l_->rank_i () << ", dist = " << distance_f_ << "}\n";   
-#endif
+  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_);
 }
 
-Column_spring::Column_spring ()
-{
-  distance_f_ = 0;
-  other_l_ = 0;
-}
-  
-int
-Column_spring::compare (const Column_spring &r1, const Column_spring &r2)
-{
-  return r1.other_l_->rank_i() - r2.other_l_->rank_i();
-}