* Documentation/user/programming-interface.itely (Markup

	construction in Scheme): Corrected example and tried to clarify
	the implicit \line in the table.

diff --git a/ChangeLog b/ChangeLog
index b3baea33915b7a00f01152658a337a1fdb032743..1d674279cb758e7983364a8603669b146cc0a58f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-08  Mats Bengtsson  <mabe@drongo.s3.kth.se>
+
+       * Documentation/user/programming-interface.itely (Markup
+       construction in Scheme): Corrected example and tried to clarify
+       the implicit \line in the table.
+
 2005-08-06  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * scm/framework-ps.scm (munge-lily-font-name): Bugfix: Munge only

diff --git a/Documentation/user/programming-interface.itely b/Documentation/user/programming-interface.itely
index ace314a1e0404089c7c72da57bd7e3ef09a5582c..a4913032cdc53b8510f70e1f5cc9d3bbf229a942 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 < @{ \bold \italic "hello" \raise #0.4 "world" @}
-                  \bigger @{ foo bar baz @} >
+\markup \column { \line @{ \bold \italic "hello" \raise #0.4 "world" @}
+                  \bigger \line @{ foo bar baz @} }
 @end example
 
 @noindent
@@ -467,9 +467,12 @@ is this table:
 @quotation
 @multitable @columnfractions .3 .3
 @item @b{LilyPond} @tab @b{Scheme}
+@item @b{LilyPond} @tab @b{Scheme}
+@item @code{\markup @{ ... @}} @tab @code{( markup ... )}
+@item @code{\markup @{ markup1 markup2 ... @}} @tab 
+        @code{(markup #:line ( markup1 markup2 ... ))}
 @item @code{\command} @tab @code{#:command}
 @item @code{\variable} @tab @code{variable}
-@item @code{@{ ... @}} @tab @code{#:line ( ... )}
 @item @code{\center-align @{ ... @}} @tab @code{#:center-align ( ... )}
 @item @code{string} @tab @code{"string"}
 @item @code{#scheme-arg} @tab @code{scheme-arg}