*** empty log message ***

diff --git a/Documentation/user/programming-interface.itely b/Documentation/user/programming-interface.itely
index d854ad1ea8bfb908a170d9b02c941d44a34050f8..2e9c0e1591d26946a1d276c59349c2dc81f3e457 100644 (file)
--- a/Documentation/user/programming-interface.itely
+++ b/Documentation/user/programming-interface.itely
@@ -148,9 +148,11 @@ property of @internalsref{RepeatedMusic}, and the alternatives in
 @node Extending music syntax
 @subsection Extending music syntax
 
-The syntax of composite music expressions, like
-@code{\repeat}, @code{\transpose}, and @code{\context}
-follows the general form of
+@c TODO: rewrite example.
+@c The use of FUNC as example  argument is rather confusing.
+
+The syntax of composite music expressions, like @code{\repeat},
+@code{\transpose}, and @code{\context} follows the general form of
 
 @example
 \@code{keyword} @var{non-music-arguments} @var{music-arguments}
@@ -194,7 +196,7 @@ The above Scheme code only defines the functionality.  The tag
 @example
 applymusic = #(ly:make-music-function
                 (list procedure? ly:music?)
-                (lambda (location func music)
+                (lambda (parser location func music)
                   (func music)))
 @end example
 
@@ -203,7 +205,7 @@ A @code{def-music-function} macro is introduced on top of
 functions:
 
 @example
-applymusic = #(def-music-function (location func music)
+applymusic = #(def-music-function (parser location func music)
                 (procedure? ly:music?)
                 (func music))
 @end example
@@ -396,7 +398,7 @@ This function may also be defined as a music function:
 
 @lilypond[quote,verbatim,raggedright]
 withPadding =
-  #(def-music-function (location padding music) (number? ly:music?)
+  #(def-music-function (parser location padding music) (number? ly:music?)
     #{ \override TextScript #'padding = #$padding
        $music 
        \revert TextScript #'padding #})
@@ -413,10 +415,11 @@ withPadding =
 @section Markup programmer interface
 
 @c Please rewrite the second sentence; I don't understand its meaning. AS
-Markups are implemented as special Scheme functions.  When applied with as
-arguments an output definition (@code{\layout} or @code{\paper}),
-and a list of properties and other arguments, produce a Stencil
-object.
+
+Markups are implemented as special Scheme functions.  When applied
+with as arguments an output definition (@code{\layout} or
+@code{\paper}), and a list of properties and other arguments, produce
+a Stencil object.
 
 @menu
 * Markup construction in Scheme::  

diff --git a/lily/spaceable-grob.cc b/lily/spaceable-grob.cc
index 405aabd6c64d5d1aeda936b9732161ffd6e99913..2dc389736ca9ae6783fa43887bcb6263b636fecc 100644 (file)
--- a/lily/spaceable-grob.cc
+++ b/lily/spaceable-grob.cc
@@ -105,5 +105,5 @@ ADD_INTERFACE (Spaceable_grob,"spaceable-grob-interface",
               "A layout object that takes part in the spacing problem. "
               ,
               "measure-length spacing-wishes penalty minimum-distances ideal-distances "
-              "left-neighbors right-neighbors");
+              "allow-outside-line left-neighbors right-neighbors");
 

diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm
index fca647c368230ae84916486fe7bd968e7b2d08d2..d416a9a21a8dcac56ed0ad2dca26f793845050b5 100644 (file)
--- a/scm/define-grob-properties.scm
+++ b/scm/define-grob-properties.scm
@@ -47,7 +47,7 @@ called first.  The functions take a grob and axis argument. ")
      (align-dir ,ly:dir? "Which side to align? @code{-1}: left side,
 @code{0}: around center of width, @code{1}: right side.")
      (arch-angle ,number? "Turning angle of the hook of a system brace" )
-     (arch-height ,ly:dimension? "Height of the hook of a system brace.")
+     (arch-height ,ly:dimension ? "Height of the hook of a system brace.")
      (arch-thick ,number? "Thickness of the hook of system brace.")
      (arch-width ,ly:dimension? "Width of the hook of a system brace.")
      (arpeggio-direction ,ly:dir? "If set, put an