Issue 5167/6: Changes: show \markup xxx = ... \etc assignments

[lilypond.git] / lily / rod.cc

diff --git a/lily/rod.cc b/lily/rod.cc
index 1577baa310eec1b9711a0fd47c0aaece4c84e07e..9d9b6520fc640a46ab6bd07132aa5e0c63e96987 100644 (file)
--- a/lily/rod.cc
+++ b/lily/rod.cc
@@ -1,44 +1,58 @@
-/*   
-  rod.cc --  implement Rod, Column_rod
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2002 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 "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
 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);
-    item_l_drul_[d] = pc;
-  } while ((flip (&d))!=LEFT);
+  if (!item_drul_[LEFT]
+      || !item_drul_[RIGHT])
+    return;
 
+  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 ()
 {
   columnize ();
-  if (item_l_drul_[LEFT] != item_l_drul_[RIGHT])
-    Spaceable_grob::add_rod (item_l_drul_[LEFT],
-                               item_l_drul_[RIGHT],
-                               distance_f_);
+  if (item_drul_[LEFT] != item_drul_[RIGHT]
+      && item_drul_[LEFT] && item_drul_[RIGHT])
+    Spaceable_grob::add_rod (item_drul_[LEFT],
+                             item_drul_[RIGHT],
+                             distance_);
 }