Merge branch 'master' into nested-bookparts

[lilypond.git] / ly / paper-defaults.ly

diff --git a/ly/paper-defaults.ly b/ly/paper-defaults.ly
index 14d333c9cb8118bdb2b5c2ee70caa39e5237ef4d..67839f9c6c5695869bc39438f08184b901e03416 100644 (file)
--- a/ly/paper-defaults.ly
+++ b/ly/paper-defaults.ly
@@ -1,4 +1,4 @@
-\version "2.7.39"
+\version "2.11.11"
 #(use-modules (scm layout-page-layout))
 \paper {
 
@@ -33,7 +33,7 @@
     %% ugh. hard coded?
     %%
 
-    #(layout-set-staff-size (* 20.0 pt))
+    #(layout-set-absolute-staff-size (* 20.0 pt))
 
 
     #(define-public score-title-properties
@@ -80,7 +80,14 @@
     %% settings for the page breaker
     %%
     blank-last-page-force = 0
-    blank-page-force = 2
+    blank-after-score-page-force = 2
+    blank-page-force = 5
+
+    %%
+    %% To limit space between systems on a page with a lot of space left
+    %%
+    page-limit-inter-system-space = ##f
+    page-limit-inter-system-space-factor = 1.4
 
     #(define font-defaults
       '((font-encoding . fetaMusic)))