X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-score.cc;h=d668536341368190308a8ce41eee790ddeca03ab;hb=220cea65f9373eea8795a6c4598d1214919fe79d;hp=4a2eceef12e8e6462da1474efe5f798a537bfdd5;hpb=92918346012f79ef9109ef0c391947af2d3165ca;p=lilypond.git

diff --git a/lily/paper-score.cc b/lily/paper-score.cc
index 4a2eceef12..d668536341 100644
--- 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
@@ -121,14 +121,6 @@ Paper_score::process ()
 
   message (_ ("Preprocessing graphical objects..."));
 
-  /* FIXME: Check out why we need this - removing gives assertion failures
-     down the road.
-
-     doubly, also done in Score_engraver */
-  vector<Grob*> pc (system_->used_columns ());
-  pc[0]->set_property ("line-break-permission", ly_symbol2scm ("allow"));
-  pc.back ()->set_property ("line-break-permission", ly_symbol2scm ("allow"));
-
   system_->pre_processing ();
 }
 
@@ -152,6 +144,7 @@ Paper_score::get_paper_systems ()
       vector<Column_x_positions> breaking = calc_breaking ();
       system_->break_into_pieces (breaking);
       message (_ ("Drawing systems...") + " ");
+      system_->do_break_substitution_and_fixup_refpoints ();
       paper_systems_ = system_->get_paper_systems ();
     }
   return paper_systems_;