Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond

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

diff --git a/lily/paper-score.cc b/lily/paper-score.cc
index 0142ef3b926698e68cc90b4a9078935d8eb12910..db0258328232ee30cec1a199bd7862c0e51f8f61 100644 (file)
--- a/lily/paper-score.cc
+++ b/lily/paper-score.cc
@@ -106,9 +106,9 @@ Paper_score::calc_breaking ()
 
   int system_count = robust_scm2int (layout ()->c_variable ("system-count"), 0);
   if (system_count)
-    algorithm.resize (system_count);
+    return algorithm.solve (0, VPOS, system_count);
 
-  return algorithm.solve ();
+  return algorithm.best_solution (0, VPOS);
 }
 
 void
@@ -158,3 +158,9 @@ Paper_score::get_paper_systems ()
   return paper_systems_;
 }
 
+
+Paper_score *
+unsmob_paper_score (SCM x)
+{
+  return dynamic_cast<Paper_score*> (unsmob_music_output (x));
+}