From eb81aa0cf80559fea62e433d298e5a0d669f27e9 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Wed, 1 Nov 2006 17:58:05 +0100 Subject: [PATCH] merge --- GNUmakefile.in | 2 +- buildscripts/git-update-changelog.py | 6 ++++++ lily/optimal-page-breaking.cc | 14 ++++++-------- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/GNUmakefile.in b/GNUmakefile.in index ffab58bd76..8ecc6f65bf 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -9,7 +9,7 @@ SUBDIRS = buildscripts python scripts \ po make \ elisp vim \ input \ - cygwin stepmake $(documentation-dir) + stepmake $(documentation-dir) ## this convoluted construction is necessary, since we don't know the diff --git a/buildscripts/git-update-changelog.py b/buildscripts/git-update-changelog.py index 95c45592c9..b788f5118c 100644 --- a/buildscripts/git-update-changelog.py +++ b/buildscripts/git-update-changelog.py @@ -174,6 +174,12 @@ Run this file from the CVS directory, with commits from the repository in --git- log = log[len (first):] file_adddel = [] +<<<<<<< HEAD/buildscripts/git-update-changelog.py +======= + + collated_log = '' + collated_message = '' +>>>>>>> b1b4484cce6e2fe9d312b7617e801efa00dea57b/buildscripts/git-update-changelog.py collated_log = '' collated_message = '' diff --git a/lily/optimal-page-breaking.cc b/lily/optimal-page-breaking.cc index 21fb841d66..90bc685f06 100644 --- a/lily/optimal-page-breaking.cc +++ b/lily/optimal-page-breaking.cc @@ -63,16 +63,14 @@ Optimal_page_breaking::try_page_spacing (Line_division const &line_count) { Real uniformity = fabs (ret.force_[i] - ret.force_[i-1]); ret.demerits_ += (ret.force_[i] * ret.force_[i] - + uniformity * uniformity) * page_weighting; + + uniformity * uniformity) * page_weighting; } - /* If ragged_last is true, the last page will have - zero force no matter what. In this case, we exclude it from the average or - we will become biased towards scores with less pages (because the force - of zero will affect the average more when there are fewer pages) */ - if (!ragged_last || ret.force_.size () > 1) - ret.demerits_ /= ret.force_.size () - (ragged_last ? 1 : 0); - line_force /= lines.size (); + /* 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 + with a very bad page force (for example because of a forced page break), + the page breaker will put in a _lot_ of pages so that the bad force + becomes averaged out over many pages. */ ret.demerits_ += line_force + line_penalty; return ret; } -- 2.39.5