From 91455a1aa64fcf64b7c3996f2247f5125e22bd73 Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Fri, 19 Nov 2004 23:50:38 +0000
Subject: [PATCH] (fill-line): use stack-stencils. This fixes problems with
 putting already centered stencils in a line.

---
 ChangeLog                      |  6 ++++++
 THANKS                         |  3 ++-
 scm/define-markup-commands.scm | 14 +++++++-------
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2b9299cbfc..82770a3251 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2004-11-20  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+	* scm/define-markup-commands.scm (fill-line): use
+	stack-stencils. This fixes problems with putting already centered
+	stencils in a line.
+
+	* VERSION: release 2.5.1
+
 	* lily/bar-line.cc (get_staff_bar_size): add line thickness.
 
 2004-11-19  Han-Wen Nienhuys  <hanwen@xs4all.nl>
diff --git a/THANKS b/THANKS
index c2e06a4047..395ee1be86 100644
--- a/THANKS
+++ b/THANKS
@@ -19,10 +19,11 @@ Andreas Scherer
 BUG HUNTERS/SUGGESTIONS
 
 Andreas Scherer
+Arjan Bos
 Fernando Pablo Lopez-Lezcano
 Jack O'Quin
 Karl Hammar
-Arjan Bos
+Richard Schoeller
 
 Release 2.4
 ***********
diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm
index 9f4c1b9b45..c8d8d8efac 100644
--- a/scm/define-markup-commands.scm
+++ b/scm/define-markup-commands.scm
@@ -108,12 +108,12 @@ gsave /ecrm10 findfont
 			(/ (- line-width text-width)
 			   (if (= word-count 1) 2 (- word-count 1)))))
 	(line-stencils (if (= word-count 1)
-			   (map (lambda (x) (interpret-markup layout props x))
-				(list (make-simple-markup "")
-				      (make-stencil-markup (car stencils))
-				      (make-simple-markup "")))
-				stencils)))
-    (stack-stencil-line fill-space line-stencils)))
+			   (list
+			    (ly:make-stencil '() '(0 . 0) '(0 . 0))  
+			    (car stencils)
+			    (ly:make-stencil '() '(0 . 0) '(0 . 0))  )
+			   stencils)))
+    (stack-stencils X RIGHT fill-space line-stencils)))
   
 (define (font-markup qualifier value)
   (lambda (layout props arg)
@@ -298,7 +298,7 @@ of the @code{#'direction} layout property."
   "Put @code{args} in a centered column. "
   (let* ((mols (map (lambda (x) (interpret-markup layout props x)) args))
          (cmols (map (lambda (x) (ly:stencil-align-to! x X CENTER)) mols)))
-    (stack-lines -1 0.0 (chain-assoc-get 'baseline-skip props) mols)))
+    (stack-lines -1 0.0 (chain-assoc-get 'baseline-skip props) cmols)))
 
 (def-markup-command (vcenter layout props arg) (markup?)
   "Align @code{arg} to its center. "
-- 
2.39.5