* lily/include/main.hh: rename format to backend.

[lilypond.git] / lily / rod.cc

diff --git a/lily/rod.cc b/lily/rod.cc
index 0db3c858857ebb49e9f09e71497c6ef032545dd1..88baddb71e9bba8ff90389b1c77fbb617b459e5e 100644 (file)
--- a/lily/rod.cc
+++ b/lily/rod.cc
@@ -3,59 +3,49 @@
   
   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 "single-malt-grouping-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;
 }
 
-void
-Column_rod::print () const
-{
-#ifndef NDEBUG
-  DEBUG_OUT << "Column_rod { rank = "
-       << other_l_->rank_i () << ", dist = " << distance_f_ << "}\n";   
-#endif
-}
 
-Column_rod::Column_rod ()
+
+void
+Rod::columnize ()
 {
-  distance_f_ = 0;
-  other_l_ = 0;
-}
+  if (!item_l_drul_[LEFT]
+      || !item_l_drul_[RIGHT])
+    return ;
   
-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_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);
+
 }
 
 void
 Rod::add_to_cols ()
 {
-  Direction d = LEFT;
-  Drul_array<Paper_column*> cols;
-  Real extra_dist = 0.0;
-  do {
-    cols[d] = item_l_drul_[d]->column_l ();
-    extra_dist += item_l_drul_[d]->relative_coordinate (cols[d], X_AXIS);
-  } while ((flip (&d))!=LEFT);
-
-  if (cols[LEFT] != cols[RIGHT])
-    do
-      {
-       cols[-d]->add_rod(cols[d], distance_f_ + extra_dist);
-      }
-    while ((flip (&d))!=LEFT);
+  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_);
 }