X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frod.cc;h=9d9b6520fc640a46ab6bd07132aa5e0c63e96987;hb=aafcc4147ae2fea2ba1d95c7a54963c61f21b963;hp=0db3c858857ebb49e9f09e71497c6ef032545dd1;hpb=02ad2d3bb642d9228c4ae69efc71a74bd222575f;p=lilypond.git

diff --git a/lily/rod.cc b/lily/rod.cc
index 0db3c85885..9d9b6520fc 100644
--- a/lily/rod.cc
+++ b/lily/rod.cc
@@ -1,61 +1,58 @@
-/*   
-  rod.cc --  implement Rod, Column_rod
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 1998--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
 #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_drul_[LEFT] = item_drul_[RIGHT] = 0;
 }
 
 void
-Column_rod::print () const
+Rod::columnize ()
 {
-#ifndef NDEBUG
-  DEBUG_OUT << "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();
+  for (LEFT_and_RIGHT (d))
+    {
+      Paper_column *pc = item_drul_[d]->get_column ();
+      distance_ += -d * item_drul_[d]->relative_coordinate (pc, X_AXIS);
+      item_drul_[d] = pc;
+    }
 }
 
 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_drul_[LEFT] != item_drul_[RIGHT]
+      && item_drul_[LEFT] && item_drul_[RIGHT])
+    Spaceable_grob::add_rod (item_drul_[LEFT],
+                             item_drul_[RIGHT],
+                             distance_);
 }