From: David Kastrup <dak@gnu.org>
Date: Sat, 27 Apr 2013 12:59:48 +0000 (+0200)
Subject: implement stack-stencil-line in terms of stack-stencils
X-Git-Tag: release/2.17.19-1~5^2~10
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a2995707ec4d3225c8aa6b6dbbce582aabab1b7a;p=lilypond.git

implement stack-stencil-line in terms of stack-stencils
---

diff --git a/scm/markup.scm b/scm/markup.scm
index 9253c378db..45652c0a5c 100644
--- a/scm/markup.scm
+++ b/scm/markup.scm
@@ -63,21 +63,11 @@ Example:
   (cons (acons key val (car chain)) (cdr chain)))
 
 (define-public (stack-stencil-line space stencils)
-  "Adjoin a list of STENCILS along the X axis, leaving SPACE between the
-   end of each stencil and the reference point of the following stencil."
-  (if (and (pair? stencils)
-           (ly:stencil? (car stencils)))
-
-      (if (and (pair? (cdr stencils))
-               (ly:stencil? (cadr stencils)))
-          (let* ((tail (stack-stencil-line space (cdr stencils)))
-                 (head (car stencils))
-                 (xoff (+ space (interval-end (ly:stencil-extent head X)))))
-            (ly:stencil-add head
-                            (ly:stencil-translate-axis tail xoff X)))
-          (car stencils))
-      (ly:make-stencil '() '(0 . 0) '(0 . 0))))
-
+  "Adjoin a list of @var{stencils} along the X axis, leaving
+@var{space} between the end of each stencil and the beginning of the
+following stencil.  Stencils with empty Y extent are not given
+@var{space} before them and don't avoid overlapping other stencils."
+  (stack-stencils X RIGHT space (filter ly:stencil? stencils)))
 
 ;;; convert a full markup object to an approximate pure string representation