Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond

diff --git a/lily/constrained-breaking.cc b/lily/constrained-breaking.cc
index 0d0733b1e8a4509146beb27da4a7d4da999e1a4c..5fbc3f7fab55e743a7f5977092ec4c55f7986622 100644 (file)
--- 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 9e8971ac7e1df569cdc158305169c777334e71ed..d2d06b0331387bfc4d293c64027b373cb42b0260 100644 (file)
--- 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))