From: Graham Percival <graham@percival-music.ca>
Date: Mon, 8 Aug 2005 22:47:23 +0000 (+0000)
Subject: Fix compile bug, add linewidth info to \justify.
X-Git-Tag: release/2.7.5~34
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=d105cc65a4a1ce2eaed0316bf29b237e9d98f25a;p=lilypond.git

Fix compile bug, add linewidth info to \justify.
---

diff --git a/ChangeLog b/ChangeLog
index d5cc1fc2b2..6139de8300 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-08-08  Graham Percival  <gpermus@gmail.com>
+
+	* Documentation/user/programming-interface.itely: fix @{ @}.
+
+	* scm/define-markup-commands.scm: add linewidth info to
+	\justify and \wordwrap.
+
 2005-08-08  Mats Bengtsson  <mabe@drongo.s3.kth.se>
 
 	* Documentation/user/programming-interface.itely (Markup
diff --git a/Documentation/user/programming-interface.itely b/Documentation/user/programming-interface.itely
index f82716f2dc..5516e55324 100644
--- a/Documentation/user/programming-interface.itely
+++ b/Documentation/user/programming-interface.itely
@@ -455,8 +455,8 @@ providing a LilyPond-like syntax.  For example,
 @noindent
 is equivalent to:
 @example
-\markup \column { \line @{ \bold \italic "hello" \raise #0.4 "world" @}
-                  \bigger \line @{ foo bar baz @} }
+\markup \column @{ \line @{ \bold \italic "hello" \raise #0.4 "world" @}
+                  \bigger \line @{ foo bar baz @} @}
 @end example
 
 @noindent
diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm
index 06bc2ec7f8..b30fb65d0d 100644
--- a/scm/define-markup-commands.scm
+++ b/scm/define-markup-commands.scm
@@ -466,12 +466,15 @@ determines the space between each markup in @var{args}."
     (stack-lines DOWN 0.0 baseline-skip lines)))
 
 (def-markup-command (justify layout props args) (markup-list?)
-  "Like wordwrap, but with lines stretched to justify the margins."
+  "Like wordwrap, but with lines stretched to justify the margins.
+Use @code{\override #'(linewidth . X)} to set linewidth, where X
+is the number of staff spaces."
 
   (wordwrap-markups layout props args #t))
 
 (def-markup-command (wordwrap layout props args) (markup-list?)
-  "Simple wordwrap"
+  "Simple wordwrap.  Use @code{\override #'(linewidth . X)} to set
+linewidth, where X is the number of staff spaces."
 
   (wordwrap-markups layout props args #f))