Merge branch 'master' of git+ssh://repo.or.cz/srv/git/lilypond

[lilypond.git] / lily / paper-score.cc

diff --git a/lily/paper-score.cc b/lily/paper-score.cc
index e7a5f51247a9ac69ae1c6ffa603881255cc22c9f..028fb37a146e080a988ef63756fb50176054d3f6 100644 (file)
--- a/lily/paper-score.cc
+++ b/lily/paper-score.cc
@@ -99,7 +99,7 @@ Paper_score::get_columns () const
 vector<Column_x_positions>
 Paper_score::calc_breaking ()
 {
-  Constrained_breaking algorithm;
+  Constrained_breaking algorithm (this);
   vector<Column_x_positions> sol;
 
   message (_ ("Calculating line breaks...") + " ");
@@ -107,11 +107,8 @@ Paper_score::calc_breaking ()
   int system_count = robust_scm2int (layout ()->c_variable ("system-count"), 0);
   if (system_count)
     algorithm.resize (system_count);
-  
-  algorithm.set_pscore (this);
-  sol = algorithm.solve ();
 
-  return sol;
+  return algorithm.solve ();
 }
 
 void