final newline

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

diff --git a/lily/constrained-breaking.cc b/lily/constrained-breaking.cc
index c688be6a1b54237b859f52375f086e9e9275da07..4604f5439d0173ae9c048f448ee341a77644190f 100644 (file)
--- a/lily/constrained-breaking.cc
+++ b/lily/constrained-breaking.cc
@@ -342,7 +342,6 @@ Constrained_breaking::initialize ()
                                         ragged_right_);
   for (vsize i = 0; i + 1 < breaks_.size (); i++)
     {
-      Real max_ext = 0;
       for (vsize j = i + 1; j < breaks_.size (); j++)
        {
          int start = Paper_column::get_rank (all_[breaks_[i]]);
@@ -354,7 +353,7 @@ Constrained_breaking::initialize ()
 
          line.force_ = forces[i*breaks_.size () + j];
          if (ragged && last && !isinf (line.force_))
-           line.force_ = (line.force_ < 0) ? infinity_f : 0;
+           line.force_ = (line.force_ < 0 && j > i + 1) ? infinity_f : 0;
          if (isinf (line.force_))
            break;
 
@@ -373,8 +372,7 @@ Constrained_breaking::initialize ()
          line.turn_permission_ = min_permission (line.page_permission_,
                                                  line.turn_permission_);
 
-         max_ext = max (max_ext, extent.length ());
-         line.extent_ = extent;
+         line.extent_ = extent.is_empty () ? Interval (0, 0) : extent;
          line.padding_ = padding;
          line.space_ = space;
          line.inverse_hooke_ = extent.length () + space;