2003 -> 2004

[lilypond.git] / lily / rod.cc

diff --git a/lily/rod.cc b/lily/rod.cc
index 15b4c7a8085bb13eb097178375d042e2aff5d622..d79fd7f772e7774ab14f8653078a2b0670fdddc2 100644 (file)
--- a/lily/rod.cc
+++ b/lily/rod.cc
@@ -3,36 +3,30 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include "rod.hh"
 #include "paper-column.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "dimensions.hh"
-#include "separation-item.hh"
-
+#include "spaceable-grob.hh"
 
 Rod::Rod ()
 {
-  distance_f_ = 0.0;
+  distance_ = 0.0;
   item_l_drul_[LEFT] = item_l_drul_[RIGHT] =0;
 }
 
 
-Column_rod::Column_rod ()
-{
-  distance_f_ = 0;
-  other_l_ = 0;
-}
 
 void
 Rod::columnize ()
 {
   Direction d = LEFT;
   do {
-    Paper_column * pc = item_l_drul_[d]->column_l ();
-    distance_f_ += - d * item_l_drul_[d]->relative_coordinate (pc, X_AXIS);
+    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);
 
@@ -41,9 +35,10 @@ Rod::columnize ()
 void
 Rod::add_to_cols ()
 {
-  columnize();
+  columnize ();
   if (item_l_drul_[LEFT] != item_l_drul_[RIGHT])
-    dynamic_cast<Paper_column*> (item_l_drul_[LEFT])->
-      add_rod(dynamic_cast<Paper_column*>(item_l_drul_[RIGHT]), distance_f_ );
+    Spaceable_grob::add_rod (item_l_drul_[LEFT],
+                               item_l_drul_[RIGHT],
+                               distance_);
 }