Fix compile bug, add linewidth info to \justify.

diff --git a/ChangeLog b/ChangeLog
index d5cc1fc2b27fbe969e2b87f557fe86a395406df0..6139de8300809d1aeb37a43a907ac00acfa5fc36 100644 (file)
--- 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 f82716f2dc6988448fafdb8335861f5e53020924..5516e5532449b49bcc1d010f344b326289260811 100644 (file)
--- 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 06bc2ec7f895a035fa681cf86840e2093abd16cc..b30fb65d0df2c78ef3b46c9db6f848454d9c27ad 100644 (file)
--- 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))