X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Foptimal-page-breaking.cc;h=46105f7255bf842c9144e9f413e1c3ef90c844ca;hb=666c669990584a38b18cd00f50f22d93959d4f18;hp=90bc685f06c31c2afce499ddba51d9691aaba845;hpb=3920b02188c3c6b0190626a936c586fe687a4a2d;p=lilypond.git diff --git a/lily/optimal-page-breaking.cc b/lily/optimal-page-breaking.cc index 90bc685f06..46105f7255 100644 --- a/lily/optimal-page-breaking.cc +++ b/lily/optimal-page-breaking.cc @@ -60,11 +60,7 @@ Optimal_page_breaking::try_page_spacing (Line_division const &line_count) ret.demerits_ = ret.force_[0] * ret.force_[0] * page_weighting; for (vsize i = 1; i < ret.force_.size (); i++) - { - Real uniformity = fabs (ret.force_[i] - ret.force_[i-1]); - ret.demerits_ += (ret.force_[i] * ret.force_[i] - + uniformity * uniformity) * page_weighting; - } + ret.demerits_ += ret.force_[i] * ret.force_[i] * page_weighting; /* for a while we tried averaging page and line forces instead of summing them, but it caused the following problem. If there is a single page