*** empty log message ***

[lilypond.git] / lily / rod.cc

diff --git a/lily/rod.cc b/lily/rod.cc
index 7d287f84bad9d942d1734ca85773ba0beb7d33b0..bcba357247b43084b21c2c4213a1b245f792556f 100644 (file)
--- a/lily/rod.cc
+++ b/lily/rod.cc
@@ -3,54 +3,49 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2005 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;
-  item_l_drul_[LEFT] = item_l_drul_[RIGHT] =0;
+  distance_ = 0.0;
+  item_l_drul_[LEFT] = item_l_drul_[RIGHT] = 0;
 }
 
 
-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::columnize ()
 {
+  if (!item_l_drul_[LEFT]
+      || !item_l_drul_[RIGHT])
+    return ;
+  
   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);
+  } while ((flip (&d))!= LEFT);
 
 }
 
 void
 Rod::add_to_cols ()
 {
-  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_ );
+  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_);
 }