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 b6c539dc40488f435c681084eda7e5f3c0de2614..1715b5567ae3490600b4820d0710eae97ebff7af 100644 (file)
--- 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?)