From: Joe Neeman <joeneeman@gmail.com>
Date: Sun, 14 Jan 2007 11:02:36 +0000 (+0200)
Subject: Use between-system-padding as a default for
X-Git-Tag: release/2.11.12-1~36
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=9ec9ed150f9f9841d058afb3e30746fc1b89b954;p=lilypond.git

Use between-system-padding as a default for
page-breaking-between-system-padding.
---

diff --git a/lily/constrained-breaking.cc b/lily/constrained-breaking.cc
index 1a03c6b324..08ec2934eb 100644
--- a/lily/constrained-breaking.cc
+++ b/lily/constrained-breaking.cc
@@ -322,8 +322,11 @@ Constrained_breaking::initialize ()
       
   Output_def *l = pscore_->layout ();
   System *sys = pscore_->root_system ();
-  Real padding = robust_scm2double (l->c_variable ("page-breaking-between-system-padding"), 0);
   Real space = robust_scm2double (l->c_variable ("ideal-system-space"), 0);
+  SCM padding_scm = l->c_variable ("page-breaking-between-system-padding");
+  if (!scm_is_number (padding_scm))
+    padding_scm = l->c_variable ("between-system-padding");
+  Real padding = robust_scm2double (padding_scm, 0.0);
 
   Interval first_line = line_dimensions_int (pscore_->layout (), 0);
   Interval other_lines = line_dimensions_int (pscore_->layout (), 1);
diff --git a/scm/layout-page-layout.scm b/scm/layout-page-layout.scm
index 9e8971ac7e..d2d06b0331 100644
--- a/scm/layout-page-layout.scm
+++ b/scm/layout-page-layout.scm
@@ -215,7 +215,9 @@
 					    page lines paper))
 			   (spacing (space-systems space-to-fill lines ragged paper #f)))
 		      (if (or (not (car spacing)) (inf? (car spacing)))
-			  (cdr (space-systems space-to-fill lines ragged paper #t))
+			  (begin
+			    (ly:warning (_ "Can't fit systems on page -- ignoring between-system-padding"))
+			    (cdr (space-systems space-to-fill lines ragged paper #t)))
 			  (cdr spacing))))))
     (page-set-property! page 'configuration posns)
     page))