Fix #106 and problems with 'modern accidental style.

[lilypond.git] / lily / constrained-breaking.cc

diff --git a/lily/constrained-breaking.cc b/lily/constrained-breaking.cc
index b8253ac4e93ce5b0a3970393c29b991938745071..52ed127306de3699aed50107bb1cff0d4ac58ed3 100644 (file)
--- a/lily/constrained-breaking.cc
+++ b/lily/constrained-breaking.cc
@@ -322,7 +322,7 @@ Constrained_breaking::initialize ()
       
   Output_def *l = pscore_->layout ();
   System *sys = pscore_->root_system ();
-  Real padding = robust_scm2double (l->c_variable ("between-system-padding"), 0);
+  Real padding = robust_scm2double (l->c_variable ("page-breaking-between-system-padding"), 0);
   Real space = robust_scm2double (l->c_variable ("ideal-system-space"), 0);
 
   Interval first_line = line_dimensions_int (pscore_->layout (), 0);
@@ -365,7 +365,7 @@ Constrained_breaking::initialize ()
          line.extent_ = extent;
          line.padding_ = padding;
          line.space_ = space;
-         line.inverse_hooke_ = 1;
+         line.inverse_hooke_ = extent.length () + space;
        }
     }