Merge branch 'master' of git://git.savannah.gnu.org/lilypond.git

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

diff --git a/lily/page-spacing.cc b/lily/page-spacing.cc
index 13c6a0c02a98f45cd0d9208e4a13f2e61fe315c5..bae7ae6fb773d861440184ccf9685d194305eebb 100644 (file)
--- a/lily/page-spacing.cc
+++ b/lily/page-spacing.cc
@@ -77,14 +77,19 @@ Page_spacing::account_for_footnotes (Line_details const &line)
       footnote_height += (has_footnotes_
                           ? 0.0
                           : (breaker_->footnote_separator_stencil_height ()
-                             + breaker_->footnote_padding ()));
+                             + breaker_->footnote_padding ()
+                             + breaker_->footnote_number_raise ()));
 
       has_footnotes_ = true;
       Interval extent = line.footnotes_[i]->extent (Y_AXIS);
       footnote_height += extent[UP] - extent[DOWN];
       footnote_height += breaker_->footnote_padding ();
-    }  
-  return footnote_height;
+    }
+
+  return (footnote_height
+         - (has_footnotes_
+           ? breaker_->footnote_padding () + breaker_->footnote_footer_padding ()
+           : 0.0));
 }
 
 void