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

diff --git a/lily/constrained-breaking.cc b/lily/constrained-breaking.cc
index 5fbc3f7fab55e743a7f5977092ec4c55f7986622..a4f3ac4b57a286d514518cb62bbe448f723fc80e 100644 (file)
--- a/lily/constrained-breaking.cc
+++ b/lily/constrained-breaking.cc
@@ -274,7 +274,7 @@ Constrained_breaking::get_min_systems (vsize start, vsize end)
 int
 Constrained_breaking::get_max_systems (vsize start, vsize end)
 {
-  vsize brk = (end >= start_.size ()) ? breaks_.size () - 1 : starting_breakpoints_[end];
+  vsize brk = (end >= start_.size ()) ? breaks_.size () : starting_breakpoints_[end];
   return brk - starting_breakpoints_[start];
 }
 

diff --git a/lily/page-breaking.cc b/lily/page-breaking.cc
index e531b7f4addd8de689e58e797c66e6d02a0d59f1..76a874d4e38f1aac87035c9c09016234fc8b5f23 100644 (file)
--- a/lily/page-breaking.cc
+++ b/lily/page-breaking.cc
@@ -75,7 +75,13 @@ void
 Page_breaking::break_into_pieces (vsize start_break, vsize end_break, Line_division const &div)
 {
   vector<Break_position> chunks = chunk_list (start_break, end_break);
-  assert (chunks.size () == div.size () + 1);
+  bool ignore_div = false;
+  if (chunks.size () != div.size () + 1)
+    {
+      programming_error ("did not find a valid page breaking configuration");
+      ignore_div = true;
+      assert (0);
+    }
 
   for (vsize i = 0; i + 1 < chunks.size (); i++)
     {
@@ -86,7 +92,9 @@ Page_breaking::break_into_pieces (vsize start_break, vsize end_break, Line_divis
          vsize end;
          line_breaker_args (sys, chunks[i], chunks[i+1], &start, &end);
 
-         vector<Column_x_positions> pos = line_breaking_[sys].get_solution (start, end, div[i]);
+         vector<Column_x_positions> pos = ignore_div
+           ? line_breaking_[sys].get_best_solution (start, end)
+           : line_breaking_[sys].get_solution (start, end, div[i]);
          all_[sys].pscore_->root_system ()->break_into_pieces (pos);
        }
     }