X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-context-properties.scm;h=e8c22474325ffa41203086b22a69bd6bbde5925a;hb=665e9d74204d0b97d1fe865f816b199a1b7d4f74;hp=fd840c0457356e0a9882c1cbd22dbfe4849395c6;hpb=f6895cf1863a4e0b0f6aa35d1dc7375a3d8a26e4;p=lilypond.git

diff --git a/scm/define-context-properties.scm b/scm/define-context-properties.scm
index fd840c0457..e8c2247432 100644
--- a/scm/define-context-properties.scm
+++ b/scm/define-context-properties.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 1998--2006  Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 1998--2007  Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;                  Jan Nieuwenhuizen <janneke@gnu.org>
 
 
@@ -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
@@ -279,6 +279,7 @@ containing @code{(@var{step} . @var{alter})} or @code{((@var{octave} .
 0 to@tie{}6 and @var{alter} a fraction, denoting alteration.  For
 alterations, use symbols, e.g. @code{keySignature = #`((6 . ,FLAT))}.")
 
+     (lyricMelismaAlignment ,ly:dir? "Alignment to use for a melisma syllable.")
 
      (majorSevenSymbol ,markup? "How should the major 7th be formatted
 in a chord name?")
@@ -305,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}.")
@@ -462,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