From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sun, 13 Jun 2004 15:33:33 +0000 (+0000)
Subject: (default-page-make-stencil): don't stretch
X-Git-Tag: release/2.3.4~6
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=4112dbffc6ef73318b761bf4ec1c799d42eb2876;p=lilypond.git

(default-page-make-stencil): don't stretch
if there is too few systems on a page.
---

diff --git a/ChangeLog b/ChangeLog
index 1dccd69fec..0eb16128a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-06-13  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+	* scm/page-layout.scm (default-page-make-stencil): don't stretch
+	if there is too few systems on a page.
+
 	* lily/parser.yy (relative_music): start at middle C without pitch
 	argument.
 
diff --git a/lily/paper-book.cc b/lily/paper-book.cc
index 86df95ebcd..f4ab0c0d91 100644
--- a/lily/paper-book.cc
+++ b/lily/paper-book.cc
@@ -8,21 +8,15 @@
 
 #include "ly-module.hh"
 #include "main.hh"
-#include "paper-book.hh"
 #include "output-def.hh"
+#include "paper-book.hh"
 #include "paper-outputter.hh"
-#include "paper-system.hh"
 #include "paper-score.hh"
+#include "paper-system.hh"
 #include "stencil.hh"
 #include "warn.hh"
 
-
-/*
-  Ugh. the Function of the Paper_book class is unclear. Trim this
-  file.
-  
- */
-
+#include "ly-smobs.icc"
 
 Paper_book::Paper_book ()
 {
@@ -38,8 +32,6 @@ Paper_book::~Paper_book ()
 {
 }
 
-#include "ly-smobs.icc"
-
 IMPLEMENT_DEFAULT_EQUAL_P (Paper_book);
 IMPLEMENT_SMOBS (Paper_book)
 IMPLEMENT_TYPE_P (Paper_book, "ly:paper-book?")
diff --git a/scm/output-gnome.scm b/scm/output-gnome.scm
index 969ee73bf1..71e92820eb 100644
--- a/scm/output-gnome.scm
+++ b/scm/output-gnome.scm
@@ -144,7 +144,7 @@ export PKG_CONFIG_PATH=$HOME/usr/pkg/g-wrap/lib/pkgconfig:$PKG_CONFIG_PATH
 
 # requires 800mb RAM with -O2
 (cd libgnomecanvas/gnome/gw; perl  -i~  -pe 's/-O2//g' Makefile)
-    
+
 G_WRAP_MODULE_DIR=$HOME/usr/pkg/g-wrap/share/guile/site make install
 
 export GUILE_LOAD_PATH=$HOME/usr/pkg/guile-gnome/share/guile:$GUILE_LOAD_PATH
diff --git a/scm/page-layout.scm b/scm/page-layout.scm
index 6f56886465..1f94d74af8 100644
--- a/scm/page-layout.scm
+++ b/scm/page-layout.scm
@@ -140,7 +140,9 @@
 				   (interval-length (ly:stencil-extent x Y)))
 			line-stencils))))
       (stretchable-lines (remove ly:paper-system-title? (cdr lines)))
-      (stretch (if (null? stretchable-lines)
+      (stretch (if (or (null? stretchable-lines)
+		       (> spc-left (/ music-height 2)))
+		   
 		   0.0
 		   (/ spc-left (length stretchable-lines))))