source file of the GNU LilyPond music typesetter
- (c) 1998 Han-Wen Nienhuys <hanwen@cs.ruu.nl>
+ (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "rod.hh"
-#include "p-col.hh"
+#include "paper-column.hh"
#include "debug.hh"
+#include "dimensions.hh"
#include "single-malt-grouping-item.hh"
-#include "dimen.hh"
-Rod::Rod (Single_malt_grouping_item *l, Single_malt_grouping_item *r)
-{
- item_l_drul_[LEFT] =l;
- item_l_drul_[RIGHT]=r;
-
- Interval li (l->my_width ());
- Interval ri (r->my_width ());
- if (li.empty_b () || ri.empty_b ())
- distance_f_ = 0;
- else
- distance_f_ = li[RIGHT] - ri[LEFT] + 1.5 PT; // ugh
-}
-
Rod::Rod ()
{
distance_f_ = 0.0;
item_l_drul_[LEFT] = item_l_drul_[RIGHT] =0;
}
-void
-Column_rod::print () const
-{
-#ifndef NDEBUG
- DOUT << "Column_rod { rank = "
- << other_l_->rank_i () << ", dist = " << distance_f_ << "}\n";
-#endif
-}
Column_rod::Column_rod ()
{
{
return r1.other_l_->rank_i() - r2.other_l_->rank_i();
}
+
+
+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);
+
+}
+
void
Rod::add_to_cols ()
{
- item_l_drul_[RIGHT]->column_l ()->add_rod
- (item_l_drul_[LEFT]->column_l (), distance_f_);
- item_l_drul_[LEFT]->column_l ()->add_rod
- (item_l_drul_[RIGHT]->column_l (), distance_f_);
+ columnize();
+ if (item_l_drul_[LEFT] != item_l_drul_[RIGHT])
+ dynamic_cast<Paper_column*> (item_l_drul_[LEFT])->
+ add_rod(dynamic_cast<Paper_column*>(item_l_drul_[RIGHT]), distance_f_ );
}
+