source file of the GNU LilyPond music typesetter
- (c) 1996--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1996--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "paper-column.hh"
#include "break-algorithm.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
#include "system.hh"
#include "paper-score.hh"
#include "paper-column.hh"
Array<int> retval;
for (int i=0; i < all.size (); i++)
- if (Item::breakable_b (all[i]))
+ if (Item::is_breakable (all[i]))
retval.push (i);
if (linewidth_ <=0)
Link_array<Grob> retval;
for (int i=0; i < all.size (); i++)
- if (Item::breakable_b (all[i]))
+ if (Item::is_breakable (all[i]))
retval.push (all[i]);
if (linewidth_ <=0)
}
-Simple_spacer*
+Simple_spacer_wrapper*
Break_algorithm::generate_spacing_problem (Link_array<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 ())
+ 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 ()
Break_algorithm::set_pscore (Paper_score*s)
{
pscore_ = s;
- linewidth_ = s->paper_->get_var ("linewidth");
+ linewidth_ = s->paper_->get_dimension (ly_symbol2scm ("linewidth"));
}
Array<Column_x_positions>