From: Joe Neeman <joeneeman@gmail.com>
Date: Wed, 24 Jan 2007 07:05:14 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond
X-Git-Tag: release/2.11.14-1~43^2
X-Git-Url: https://git.donarmstrong.com/?p=lilypond.git;a=commitdiff_plain;h=f9214bac21e9926dc3248416f58190c98c4167a9

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

f9214bac21e9926dc3248416f58190c98c4167a9
diff --cc lily/page-breaking.cc
index 5c81dc392c,e531b7f4ad..76a874d4e3
--- a/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_)