* lily/instrument-name-engraver.cc (start_spanner): new

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

diff --git a/lily/gourlay-breaking.cc b/lily/gourlay-breaking.cc
index 06233738e8889cfecf4933c05bfa1d6d283bf745..f5e29ad18d662463d796070a6a81cae7537f5206 100644 (file)
--- a/lily/gourlay-breaking.cc
+++ b/lily/gourlay-breaking.cc
@@ -114,8 +114,9 @@ Gourlay_breaking::solve ()
 
          Column_x_positions cp = get_line_configuration (line, line_dims[RIGHT] - line_dims[LEFT],
                                                          line_dims[LEFT], ragged);
+
          if (ragged && last_line)
-           cp.force_ = 0.0;
+           cp.force_ = min (cp.force_, 0.0);
 
          if (fabs (cp.force_) > worst_force)
            worst_force = fabs (cp.force_);
@@ -226,7 +227,7 @@ Gourlay_breaking::combine_demerits (Column_x_positions const &prev,
   Grob *pc = this_one.cols_.back ();
   if (pc->original ())
     {
-      SCM pen = pc->get_property ("penalty");
+      SCM pen = pc->get_property ("line-break-penalty");
       if (scm_is_number (pen) && fabs (scm_to_double (pen)) < 10000)
        break_penalties += scm_to_double (pen);
     }