From: David Kastrup <dak@gnu.org>
Date: Thu, 4 Apr 2013 07:32:06 +0000 (+0200)
Subject: Issue 3305: footnote-footer-padding is not considered correctly
X-Git-Tag: release/2.17.16-1~4
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=2e81934245e6d59020e7f4412ed532d3f330074e;p=lilypond.git

Issue 3305: footnote-footer-padding is not considered correctly

Sign error because of self-defeatingly clever use of ?: operator.
This patch does not cure the obfuscation, merely fixes the resulting
error.
---

diff --git a/lily/page-spacing.cc b/lily/page-spacing.cc
index c2988d8502..a705827d22 100644
--- 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));
 }