Merge commit 'ce4b499'

[lilypond.git] / scm / define-context-properties.scm

diff --git a/scm/define-context-properties.scm b/scm/define-context-properties.scm
index 51685c1e86308dc3632b140cd9af90f2a6143c23..e8c22474325ffa41203086b22a69bd6bbde5925a 100644 (file)
--- a/scm/define-context-properties.scm
+++ b/scm/define-context-properties.scm
@@ -89,7 +89,7 @@ arguments, @var{context}, @var{dir} [start/stop (-1 or 1)], and
 @var{test} [shortest note in the beam].  A non-@code{#f} return value
 starts or stops the auto beam.")
      (autoBeamSettings ,list? "Specifies when automatically generated
-beams should begin and end.  See @usermanref{Setting automatic beam
+beams should begin and end.  See @ruser{Setting automatic beam
 behavior} for more information.")
      (autoBeaming ,boolean? "If set to true then beams are generated
 automatically.")
@@ -228,7 +228,7 @@ for the full staff.")
 
 
      (gridInterval ,ly:moment? "Interval for which to generate
-@ref{GridPoint}s.")
+@code{GridPoint}s.")
 
 
      (hairpinToBarline ,boolean? "If set, end a hairpin at the barline
@@ -306,9 +306,15 @@ markup.  Called with two arguments, event and context.")
 @code{midiMinimumVolume}.")
      (midiMinimumVolume ,number? "Set the minimum loudness for MIDI.
 Ranges from 0 to@tie{}1.")
+     (middleCClefPosition ,number? "The position of the middle C,
+as determined only by the clef.  This can be calculated by looking at
+@code{clefPosition} and @code{clefGlyph}.")
+     (middleCOffset ,number? "The offset of
+middle C from the position given by @code{middleCClefPosition} This
+is used for ottava brackets.")
      (middleCPosition ,number? "The place of the middle C, measured in
 half staff-spaces.  Usually determined by looking at
-@code{clefPosition} and @code{clefGlyph}.")
+@code{middleCClefPosition} and @code{middleCOffset}.")
      (minimumFret ,number? "The tablature auto string-selecting
 mechanism selects the highest string with a fret at least
 @code{minimumFret}.")
@@ -463,9 +469,6 @@ for repeated bass figures.")
 context names whose vertical axis groups should be taken into account
 for vertical spacing of systems.")
      (vocalName ,markup? "Name of a vocal line.")
-     (voltaOnThisStaff ,boolean? "Normally, volta brackets are put
-only on the topmost staff.  This variable overrides this behavior, when
-set to @code{#t} or @code{#f}.")
      (voltaSpannerDuration ,ly:moment? "This specifies the maximum
 duration to use for the brackets printed for @code{\\alternative}.
 This can be used to shrink the length of brackets in the situation