#include "all-font-metrics.hh"
#include "book.hh"
-#include "gourlay-breaking.hh"
#include "international.hh"
#include "main.hh"
#include "misc.hh"
vector<Column_x_positions>
Paper_score::calc_breaking ()
{
- Break_algorithm *algorithm = 0;
+ Constrained_breaking algorithm (this);
vector<Column_x_positions> sol;
message (_ ("Calculating line breaks...") + " ");
int system_count = robust_scm2int (layout ()->c_variable ("system-count"), 0);
if (system_count)
- {
- Constrained_breaking *b = new Constrained_breaking;
- b->resize (system_count);
- algorithm = b;
- }
- else
- algorithm = new Gourlay_breaking;
-
- algorithm->set_pscore (this);
- sol = algorithm->solve ();
- delete algorithm;
-
- return sol;
+ algorithm.resize (system_count);
+
+ return algorithm.solve ();
}
void
system_->element_count (),
system_->spanner_count ()));
- message (_ ("Preprocessing graphical objects...") + " ");
+ message (_ ("Preprocessing graphical objects..."));
/* FIXME: Check out why we need this - removing gives assertion failures
down the road.