Imported Upstream version 2.18.0

[lilypond.git] / lily / page-spacing.cc

diff --git a/lily/page-spacing.cc b/lily/page-spacing.cc
index 9434fb910aab7705be46630374f25a5bc4e51cd6..a705827d2274df700b56503bc8b60bb06d58dcb8 100644 (file)
--- a/lily/page-spacing.cc
+++ b/lily/page-spacing.cc
@@ -102,8 +102,8 @@ Page_spacing::account_for_footnotes (Line_details const &line)
              : 0.0))
          +
          (footnote_height
-          - (has_footnotes_
-             ? breaker_->footnote_padding () + breaker_->footnote_footer_padding ()
+          + (has_footnotes_
+             ? - breaker_->footnote_padding () + breaker_->footnote_footer_padding ()
              : 0.0));
 }
 
@@ -155,6 +155,9 @@ Page_spacer::solve ()
     }
 
   Page_spacing_result ret;
+  if (simple_state_.empty ())
+    return ret;
+
   ret.penalty_ = simple_state_.back ().penalty_
                  + lines_.back ().page_penalty_ + lines_.back ().turn_penalty_;
   ret.system_count_status_ = simple_state_.back ().system_count_status_;