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

diff --cc lily/constrained-breaking.cc
Simple merge

diff --cc lily/page-breaking.cc
index 5c81dc392caf1a789255ac9f594b45d8bc296bf7,e531b7f4addd8de689e58e797c66e6d02a0d59f1..76a874d4e38f1aac87035c9c09016234fc8b5f23
--- 1/lily/page-breaking.cc
--- 2/lily/page-breaking.cc
+++ b/lily/page-breaking.cc
@@@ -75,15 -75,9 +75,15 @@@ voi
  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 < chunks.size () - 1; i++)
+   for (vsize i = 0; i + 1 < chunks.size (); i++)
      {
        vsize sys = next_system (chunks[i]);
        if (all_[sys].pscore_)