]> git.donarmstrong.com Git - lilypond.git/commitdiff
Issue 5146: Don't use \line in the implementation of \concat
authorDavid Kastrup <dak@gnu.org>
Mon, 12 Jun 2017 18:33:40 +0000 (20:33 +0200)
committerDavid Kastrup <dak@gnu.org>
Sat, 17 Jun 2017 06:41:30 +0000 (08:41 +0200)
It doesn't really make any sense to override word-space temporarily
and it does not make sense to heed text-direction when putting together
stuff without actual word boundaries.

scm/define-markup-commands.scm

index 91b9391fe6600325df53b1c5c72df21f28e6f508..370d9de4f2bad7cf6720ed0dc75299c05852cb5f 100644 (file)
@@ -1595,16 +1595,11 @@ equivalent to @code{\"fi\"}.
                         (cons arg result-list))))
                 '()
                 arg-list))
-
-  (interpret-markup layout
-                    (prepend-alist-chain 'word-space 0 props)
-                    (make-line-markup
-                     (make-override-lines-markup-list
-                      (cons 'word-space
-                            (chain-assoc-get 'word-space props))
-                      (if (markup-command-list? args)
-                          args
-                          (concat-string-args args))))))
+  (stack-stencil-line 0
+                      (interpret-markup-list layout props
+                                             (if (markup-command-list? args)
+                                                 args
+                                                 (concat-string-args args)))))
 
 (define (wordwrap-stencils stencils
                            justify base-space line-width text-dir)