From: Nicolas Sceaux <nicolas.sceaux@free.fr>
Date: Mon, 23 Jun 2008 18:49:10 +0000 (+0200)
Subject: markuplines: really fix vertical spacing of lines when using eg. \justify-lines
X-Git-Tag: release/2.11.50-1~20^2~9
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c77abde53599e65314962d7402eeee9a16693a1e;p=lilypond.git

markuplines: really fix vertical spacing of lines when using eg. \justify-lines
---

diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm
index b6c539dc40..1715b5567a 100644
--- a/scm/define-markup-commands.scm
+++ b/scm/define-markup-commands.scm
@@ -2198,15 +2198,15 @@ when @var{label} is not found."
 
 (define-public (space-lines baseline stils)
   (let space-stil ((prev-stil #f)
-		   (stil (car stils))
-		   (rest (cdr stils))
+		   (stils stils)
 		   (result (list)))
-    (cond ((null? rest)
+    (cond ((null? stils)
 	   (reverse! result))
 	  ((not prev-stil)
-	   (space-stil stil (car rest) (cdr rest) (list stil)))
+	   (space-stil (car stils) (cdr stils) (list (car stils))))
 	  (else
-	   (let* ((dy (max (- baseline
+	   (let* ((stil (car stils))
+		  (dy (max (- baseline
 			      (+ (- (interval-bound (ly:stencil-extent prev-stil Y) DOWN))
 				 (interval-bound (ly:stencil-extent stil Y) UP)))
 			   0.0))
@@ -2215,7 +2215,7 @@ when @var{label} is not found."
 			     (ly:stencil-extent stil X)
 			     (cons (interval-bound (ly:stencil-extent stil Y) DOWN)
 				   (+ (interval-bound (ly:stencil-extent stil Y) UP) dy)))))
-	     (space-stil stil (car rest) (cdr rest) (cons new-stil result)))))))
+	     (space-stil stil (cdr stils) (cons new-stil result)))))))
 
 (define-builtin-markup-list-command (justified-lines layout props args)
   (markup-list?)