X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frod.cc;h=9d9b6520fc640a46ab6bd07132aa5e0c63e96987;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=4801eb3cbe5d57c1ed3bd8296c2bc01cc32b67b8;hpb=75eebcb49e52d296b1da3e1074e0825d2c780db4;p=lilypond.git

diff --git a/lily/rod.cc b/lily/rod.cc
index 4801eb3cbe..9d9b6520fc 100644
--- a/lily/rod.cc
+++ b/lily/rod.cc
@@ -1,9 +1,20 @@
 /*
-  rod.cc -- implement Rod, Column_rod
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1998--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1998--2006 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"
@@ -26,14 +37,12 @@ Rod::columnize ()
       || !item_drul_[RIGHT])
     return;
 
-  Direction d = LEFT;
-  do
+  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;
     }
-  while ((flip (&d)) != LEFT);
 }
 
 void
@@ -43,7 +52,7 @@ Rod::add_to_cols ()
   if (item_drul_[LEFT] != item_drul_[RIGHT]
       && item_drul_[LEFT] && item_drul_[RIGHT])
     Spaceable_grob::add_rod (item_drul_[LEFT],
-			     item_drul_[RIGHT],
-			     distance_);
+                             item_drul_[RIGHT],
+                             distance_);
 }