(fill-line): use

stack-stencils. This fixes problems with putting already centered
stencils in a line.

diff --git a/ChangeLog b/ChangeLog
index 2b9299cbfc4555329680cc79782b7db0c30d3436..82770a325114ec54cfdb5cba94dbb316240c5db8 100644 (file)
--- 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 c2e06a4047fe7ba89ac6069fa216dceb649733da..395ee1be86014538f3515825063a3a96b4733289 100644 (file)
--- 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 9f4c1b9b45292062577ad4bf7531356735946938..c8d8d8efac40588e37db2cd8ad62fc4df6e2dd72 100644 (file)
--- 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. "