From: Neil Puttock <n.puttock@gmail.com>
Date: Mon, 26 Jul 2010 21:28:22 +0000 (+0100)
Subject: Fix space in \hspace.
X-Git-Tag: release/2.13.29-1~31
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=2ed4e9b64d3c9338c621a85f3264315e59cf2176;p=lilypond.git

Fix space in \hspace.

Since \hspace creates an invisible stencil, any following markup is
effectively spaced at a distance of (hspace-amount + word-space).

* scm/define-markup-commands.scm (hspace):

  subtract word-space from amount
---

diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm
index 1291d4f879..cc2d232754 100644
--- a/scm/define-markup-commands.scm
+++ b/scm/define-markup-commands.scm
@@ -477,6 +477,7 @@ Create a box of the same height as the space in the current font."
 (define-markup-command (hspace layout props amount)
   (number?)
   #:category align
+  #:properties ((word-space))
   "
 @cindex creating horizontal spaces in text
 
@@ -491,9 +492,10 @@ Create an invisible object taking up horizontal space @var{amount}.
   three
 }
 @end lilypond"
-  (if (> amount 0)
-      (ly:make-stencil "" (cons 0 amount) '(0 . 0))
-      (ly:make-stencil "" (cons amount amount) '(0 . 0))))
+  (let ((corrected-space (- amount word-space)))
+    (if (> corrected-space 0)
+	(ly:make-stencil "" (cons 0 corrected-space) '(0 . 0))
+	(ly:make-stencil "" (cons corrected-space corrected-space) '(0 . 0)))))
 
 ;; todo: fix negative space
 (define-markup-command (vspace layout props amount)