source file of the GNU LilyPond music typesetter
- (c) 1996--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1996--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
-#include "paper-column.hh"
#include "break-algorithm.hh"
-#include "paper-def.hh"
+#include "paper-column.hh"
+#include "output-def.hh"
#include "system.hh"
#include "paper-score.hh"
#include "paper-column.hh"
#include "cpu-timer.hh"
-
#include "simple-spacer.hh"
-#include "group-interface.hh"
-
-Array<int>
+vector<int>
Break_algorithm::find_break_indices () const
{
- Link_array<Grob> all = pscore_->system_->columns ();
- Array<int> retval;
+ vector<Grob*> all = pscore_->root_system ()->columns ();
+ vector<int> retval;
- for (int i=0; i < all.size (); i++)
- if (Item::breakable_b (all[i]))
- retval.push (i);
+ for (vsize i = 0; i < all.size (); i++)
+ if (Item::is_breakable (all[i]))
+ retval.push_back (i);
- if (linewidth_ <=0)
- while (retval.size () >2)
- retval.del (1);
+ if (linewidth_ <= 0)
+ while (retval.size () > 2)
+ retval.erase (retval.begin () + 1);
return retval;
}
-
-Link_array<Grob>
+vector<Grob*>
Break_algorithm::find_breaks () const
{
- Link_array<Grob> all = pscore_->system_->columns ();
- Link_array<Grob> retval;
+ vector<Grob*> all = pscore_->root_system ()->columns ();
+ vector<Grob*> retval;
- for (int i=0; i < all.size (); i++)
- if (Item::breakable_b (all[i]))
- retval.push (all[i]);
+ for (vsize i = 0; i < all.size (); i++)
+ if (Item::is_breakable (all[i]))
+ retval.push_back (all[i]);
- if (linewidth_ <=0)
- while (retval.size () >2)
- retval.del (1);
+ if (linewidth_ <= 0)
+ while (retval.size () > 2)
+ retval.erase (retval.begin () + 1);
return retval;
}
-
-Simple_spacer*
-Break_algorithm::generate_spacing_problem (Link_array<Grob> const &curline,
+Simple_spacer_wrapper *
+Break_algorithm::generate_spacing_problem (vector<Grob*> const &curline,
Interval line) const
{
- Simple_spacer * sp = new Simple_spacer;
+ Simple_spacer_wrapper *spw = new Simple_spacer_wrapper;
+ Simple_spacer *sp = spw->spacer_;
/*
this is hardcoded, but this shouldn't happen anyway.
- used to be get_var ("loose_column_distance");
- */
+ used to be get_dimension (ly_symbol2scm ("loose_column_distance"));
+ */
sp->default_space_ = 1.0;
-
-
sp->indent_ = line[LEFT];
/*
sort out how interfacing this should work;
- */
- if (line.empty_b ())
- {
- sp->line_len_ = -1;
- }
+ */
+ if (line.is_empty ())
+ sp->line_len_ = -1;
else
sp->line_len_ = line.length ();
-
- sp->add_columns (curline);
-
- return sp;
+ spw->add_columns (curline);
+ return spw;
}
Break_algorithm::Break_algorithm ()
}
void
-Break_algorithm::set_pscore (Paper_score*s)
+Break_algorithm::set_pscore (Paper_score *s)
{
pscore_ = s;
- linewidth_ = s->paper_->get_var ("linewidth");
+ linewidth_ = s->layout ()->get_dimension (ly_symbol2scm ("line-width"));
}
-Array<Column_x_positions>
+vector<Column_x_positions>
Break_algorithm::solve () const
{
- Array<Column_x_positions> h= do_solve ();
-
+ vector<Column_x_positions> h= do_solve ();
+
return h;
}
+Break_algorithm::~Break_algorithm ()
+{
+}