(default-page-make-stencil): don't stretch

if there is too few systems on a page.

diff --git a/ChangeLog b/ChangeLog
index 1dccd69fecf70da991f2966d926a5444af067591..0eb16128a993eaf3df57c23b75d58033774ee9b2 100644 (file)
--- 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 86df95ebcde703ac1c47d0d991dcdff6059db97b..f4ab0c0d91d3d118eb5bfe1916f2933827f5235f 100644 (file)
--- 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 969ee73bf1283a555252ee028d3a023b03e48af8..71e92820eb5c3c625809526406034efe3de2885b 100644 (file)
--- 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 6f56886465ea96e04f8f8b519ec00e468b2f4dae..1f94d74af833960c3154716264352278e81e3a34 100644 (file)
--- 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))))