X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpage-spacing.cc;h=af7546f6717cb567245d76405c16fb765e529b0a;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=a705827d2274df700b56503bc8b60bb06d58dcb8;hpb=785441aeb8cc557217d1b0658ef88d058f58eeb4;p=lilypond.git diff --git a/lily/page-spacing.cc b/lily/page-spacing.cc index a705827d22..af7546f671 100644 --- a/lily/page-spacing.cc +++ b/lily/page-spacing.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2006--2012 Joe Neeman + Copyright (C) 2006--2015 Joe Neeman LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -329,7 +329,7 @@ Page_spacer::calc_subproblem (vsize page, vsize line) space.prepend_system (lines_[page_start]); bool overfull = (space.rod_height_ > paper_height - || (ragged + || (ragged_ && (space.rod_height_ + space.spring_len_ > paper_height))); // This 'if' statement is a little hard to parse. It won't consider this configuration // if it is overfull unless the current configuration is the first one with this start