From: Mike Solomon <mike@apollinemike.com>
Date: Fri, 9 Dec 2011 09:11:47 +0000 (+0100)
Subject: Removes excess padding from BarLine extra-spacing-height function.
X-Git-Tag: release/2.15.22-1~20^2~2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=6c08d4b3c610e036257dab031a3ea7fe93c553ef;p=lilypond.git

Removes excess padding from BarLine extra-spacing-height function.
---

diff --git a/scm/output-lib.scm b/scm/output-lib.scm
index 048e84db30..3e2d5ff520 100644
--- a/scm/output-lib.scm
+++ b/scm/output-lib.scm
@@ -406,20 +406,15 @@ and duration-log @var{log}."
     (coord-operation - from-neighbors height)))
 
 (define-public (pure-from-neighbor-interface::account-for-span-bar grob)
-  (define (other-op x) (x (cons cdr car)))
   (let* ((esh (pure-from-neighbor-interface::extra-spacing-height grob))
-         (hsb (ly:grob-property grob 'has-span-bar)))
+         (hsb (ly:grob-property grob 'has-span-bar))
+         (ii (interval-intersection esh (cons -1.01 1.01))))
     (if (pair? hsb)
-      (cons-map
-        (lambda (x)
-          (if (and ((other-op x) hsb)
-                   (not (and (eq? x car)
-                             (not (ly:grob-property grob 'allow-span-bar)))))
-              (x esh)
-              (x (cons -1.01 1.01))))
-        (cons car cdr))
-      ;; sufficient height to prevent ledger lines from moving over/under
-      '(-1.01 . 1.01))))
+        (cons (car (if (and (cdr hsb)
+                       (ly:grob-property grob 'allow-span-bar))
+                       esh ii))
+              (cdr (if (car hsb) esh ii)))
+        ii)))
 
 (define-public (pure-from-neighbor-interface::extra-spacing-height-including-staff grob)
   (let ((esh (pure-from-neighbor-interface::extra-spacing-height grob))