Merge with master

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

diff --git a/ly/paper-defaults.ly b/ly/paper-defaults.ly
index 41c846feaba445f170dfbea38b6d4bae1bd8084c..8ea1159204f405341fc84ce6487680f28fa1c8fe 100644 (file)
--- a/ly/paper-defaults.ly
+++ b/ly/paper-defaults.ly
@@ -1,5 +1,5 @@
-\version "2.7.39"
-
+\version "2.11.11"
+#(use-modules (scm layout-page-layout))
 \paper {
 
     %%%% WARNING
@@ -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
@@ -76,6 +76,12 @@
     %%
     ragged-last-bottom= ##t
 
+    %%
+    %% settings for the page breaker
+    %%
+    blank-last-page-force = 0
+    blank-page-force = 2
+
     #(define font-defaults
       '((font-encoding . fetaMusic)))
 
@@ -90,7 +96,18 @@
        (baseline-skip . 3)
        (word-space . 0.6)))
 
-    #(define page-breaking optimal-page-breaks)
+    #(define page-breaking ly:optimal-breaking)
+    #(define page-breaking-wrapper page-breaking-wrapper)
+    #(define page-post-process post-process-pages)
+
+    #(define write-page-layout (ly:get-option 'dump-tweaks))
+    #(define system-maximum-stretch-procedure
+       (lambda (line)
+        (if (stretchable-line? line)
+            (let ((height (line-height line)))
+              (/ (* height height) 80.0))
+            0.0)))
+
 %    #(define page-music-height default-page-music-height )
 %    #(define page-make-stencil default-page-make-stencil )
 
@@ -104,9 +121,7 @@
     bottom-margin = 6 \mm
     head-separation = 4 \mm
     foot-separation = 4 \mm
-    right-margin = 10 \mm
 
-    left-margin = ##f
     first-page-number = #1
     print-first-page-number =##f
   }