-/*
- rod.cc -- implement Rod, Column_rod
-
- source file of the GNU LilyPond music typesetter
-
- (c) 1998--2004 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"
Rod::Rod ()
{
distance_ = 0.0;
- item_l_drul_[LEFT] = item_l_drul_[RIGHT] = 0;
+ item_drul_[LEFT] = item_drul_[RIGHT] = 0;
}
-
-
void
Rod::columnize ()
{
- if (!item_l_drul_[LEFT]
- || !item_l_drul_[RIGHT])
- return ;
-
- 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);
-
+ 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]
- && item_l_drul_[LEFT] && item_l_drul_[RIGHT])
- Spaceable_grob::add_rod (item_l_drul_[LEFT],
- item_l_drul_[RIGHT],
- distance_);
+ if (item_drul_[LEFT] != item_drul_[RIGHT]
+ && item_drul_[LEFT] && item_drul_[RIGHT])
+ Spaceable_grob::add_rod (item_drul_[LEFT],
+ item_drul_[RIGHT],
+ distance_);
}