merge

diff --git a/GNUmakefile.in b/GNUmakefile.in
index ffab58bd76996ba55cfdb697aac0430e9086b6c3..8ecc6f65bfc3993bbdfe0ea02ad2a9569a124cc8 100644 (file)
--- 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 95c45592c901b62d15645cdd6def475043f6db5d..b788f5118cf2a80439c72245fc4877685037953c 100644 (file)
--- 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 21fb841d6635b80477f8dc863ec50b24f5b70931..90bc685f06c31c2afce499ddba51d9691aaba845 100644 (file)
--- 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;
 }