From d3806ac7b97a71f70fe2d6ff7aa5ead7c0a2d328 Mon Sep 17 00:00:00 2001 From: Neil Puttock Date: Tue, 11 Aug 2009 19:50:34 +0100 Subject: [PATCH] Compile fix. * system-start-text::calc-y-offset: return sane value for suicided grobs --- scm/output-lib.scm | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/scm/output-lib.scm b/scm/output-lib.scm index b2d7bea66b..152f35c7cf 100644 --- a/scm/output-lib.scm +++ b/scm/output-lib.scm @@ -786,21 +786,20 @@ (if (and (pair? live-elts) (interval-sane? (ly:grob-extent grob system Y))) - (begin - (let get-extent ((lst live-elts)) - (if (pair? lst) - (let ((axis-group (car lst))) - - (if (and (ly:spanner? axis-group) - (equal? (ly:spanner-bound axis-group LEFT) - left-bound)) - (set! extent (add-point extent - (ly:grob-relative-coordinate - axis-group system Y)))) - (get-extent (cdr lst))))) - (+ - (ly:self-alignment-interface::y-aligned-on-self grob) - (interval-center extent))) + (let get-extent ((lst live-elts)) + (if (pair? lst) + (let ((axis-group (car lst))) + + (if (and (ly:spanner? axis-group) + (equal? (ly:spanner-bound axis-group LEFT) + left-bound)) + (set! extent (add-point extent + (ly:grob-relative-coordinate + axis-group system Y)))) + (get-extent (cdr lst))))) ;; no live axis group(s) for this instrument name -> remove from system - (ly:grob-suicide! grob)))) + (ly:grob-suicide! grob)) + (+ + (ly:self-alignment-interface::y-aligned-on-self grob) + (interval-center extent)))) -- 2.39.5