Merge commit '76de7e1'

[lilypond.git] / Documentation / user / basic-notation.itely

diff --git a/Documentation/user/basic-notation.itely b/Documentation/user/basic-notation.itely
index eadb2b71a620c8fdba07fb6c08df77260f6d8aa1..47ca1e436887f2aa8679a6f548bfd165f16b662c 100644 (file)
--- a/Documentation/user/basic-notation.itely
+++ b/Documentation/user/basic-notation.itely
@@ -991,6 +991,8 @@ articulations, just like simple notes
 For more information about chords, see @ref{Chord names}.
 
 
+@c  I don't like having this here, but I can't think of
+@c  anywhere else to put it.  :(   -gp
 @node Stems
 @subsection Stems
 
@@ -3013,6 +3015,19 @@ c2\glissando c,
 @end lilypond
 
 
+@commonprop
+
+@lilypond[quote,ragged-right,verbatim]
+I = \once \override NoteColumn #'ignore-collision = ##t
+
+\relative <<
+  { \oneVoice \stemDown f2 \glissando \stemNeutral a } \\
+  { \oneVoice \I c2 \glissando \I d, }
+>>
+@end lilypond
+
+
+
 @seealso
 
 Program reference: @internalsref{Glissando}.
@@ -3021,7 +3036,6 @@ Example files:
 @lsr{expressive,glissando.ly}, @lsr{expressive,line-styles.ly}
 
 
-
 @refbugs
 
 Printing text over the line (such as @emph{gliss.}) is not supported.
@@ -3254,7 +3268,7 @@ bracket only lasts one measure, which is a duration of 3/4.
 \relative c''{
   \time 3/4
   c c c
-  \set Staff.voltaSpannerDuration = #(ly:make-moment 3 4)
+  \set Score.voltaSpannerDuration = #(ly:make-moment 3 4)
   \repeat volta 5 { d d d }
   \alternative { { e e e f f f }
   { g g g } }
@@ -3271,6 +3285,11 @@ see @ref{Bar lines} for more information.
 
 @seealso
 
+Program reference: @internalsref{VoltaBracket},
+@internalsref{RepeatedMusic},
+@internalsref{VoltaRepeatedMusic}, and
+@internalsref{UnfoldedRepeatedMusic}.
+
 Examples:
 
 Brackets for the repeat are normally only printed over the topmost
@@ -3304,8 +3323,6 @@ so after a repeat timing information must be reset by hand; for
 example, by setting @code{Score.measurePosition} or entering
 @code{\partial}.  Similarly, slurs or ties are also not repeated.
 
-Volta brackets are not vertically aligned.
-
 
 @node Repeats and MIDI
 @subsection Repeats and MIDI