release: 1.3.53

[lilypond.git] / lily / rod.cc

diff --git a/lily/rod.cc b/lily/rod.cc
index 129d9bb3c63545c35880991228fe92b758784331..90af9edf1b67c577cdbd9ef2f3be5aa970a116d7 100644 (file)
--- a/lily/rod.cc
+++ b/lily/rod.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include "rod.hh"
@@ -19,14 +19,6 @@ Rod::Rod ()
   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 ()
 {
@@ -39,13 +31,26 @@ 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 ()
+Rod::columnize ()
 {
   Direction d = LEFT;
   do {
-    item_l_drul_[-d]->column_l ()->add_rod
-      (item_l_drul_[d]->column_l (), distance_f_);
-  }while ((flip (&d))!=LEFT);
+    Paper_column * pc = item_l_drul_[d]->column_l ();
+    distance_f_ += - d * item_l_drul_[d]->relative_coordinate (pc, X_AXIS);
+    item_l_drul_[d] = pc;
+  } 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_ );
 }