Don't remove "empty" stencils in several situations

Removing empty stencils was previously necessary to avoid spurious
spacing in several circumstances that are properly catered for already
by issue 3330.  Consequently, removing those special cases is now
feasible and leads to more consistent results.

diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm
index 253a5cc5a2231acd73906ce072aca63df1f57949..ecbe876ffa6e1a88b8f91d53b391cb5141340c7b 100755 (executable)
--- a/scm/define-markup-commands.scm
+++ b/scm/define-markup-commands.scm
@@ -1266,9 +1266,7 @@ determines the space between markups in @var{args}.
   (let ((stencils (interpret-markup-list layout props args)))
     (if (= text-direction LEFT)
         (set! stencils (reverse stencils)))
-    (stack-stencil-line
-     word-space
-     (remove ly:stencil-empty? stencils))))
+    (stack-stencil-line word-space stencils)))
 
 (define-markup-command (concat layout props args)
   (markup-list?)
@@ -1639,8 +1637,7 @@ in @var{args}.
 }
 @end lilypond"
   (let ((arg-stencils (interpret-markup-list layout props args)))
-    (stack-lines -1 0.0 baseline-skip
-                 (remove ly:stencil-empty? arg-stencils))))
+    (stack-lines -1 0.0 baseline-skip arg-stencils)))
 
 (define-markup-command (dir-column layout props args)
   (markup-list?)