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 c03e8901239ec3f41453b8b32ab533df936e0cd4..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
 
@@ -1055,7 +1057,8 @@ outside the @code{<< \\ >>} construct.  This should be noted when making
 changes at the voice level.  This also means that slurs and ties cannot go
 into or out of a @code{<< \\ >>} construct.  Conversely, parallel voices
 from separate @code{<< \\ >>} constructs on the same staff are the
-same voice.  Here is the same example, with different noteheads for each
+same voice.  Here is the same example, with different noteheads and
+colors for each
 voice.  Note that the change to the note-head style in the main voice does
 not affect
 the inside of the @code{<< \\ >>} constructs.  Also, the change to the
@@ -1068,16 +1071,20 @@ voice in the first @code{<< \\ >>} construct is effective in the second
 @lilypond[quote,verbatim,fragment]
 \new Staff \relative c' {
   \override NoteHead #'style = #'cross
+  \override NoteHead #'color = #red
   c16 d e f
   <<
     { g4 f e } \\
     { \override NoteHead #'style = #'triangle
+      \override NoteHead #'color = #blue
     r8 e4 d c8 ~ }
   >> |
   <<
     { d2 e2 } \\
     { c8 b16 a b8 g ~ g2 } \\
-    { \override NoteHead #'style = #'slash s4 b4 c2 }
+    { \override NoteHead #'style = #'slash 
+      \override NoteHead #'color = #green
+      s4 b4 c2 }
   >>
 }
 @end lilypond
@@ -1128,12 +1135,13 @@ The command @code{\oneVoice} will revert back to the normal setting.
 An expression that appears directly inside a @code{<< >>} belongs to
 the main voice.  This is useful when extra voices appear while the main
 voice is playing.  Here is a more correct rendition of the example from
-the previous section.  The crossed noteheads demonstrate that the main
+the previous section.  The crossed colored noteheads demonstrate that the main
 melody is now in a single voice context.
 
 @lilypond[quote,ragged-right,verbatim]
 \new Staff \relative c' {
   \override NoteHead #'style = #'cross
+  \override NoteHead #'color = #red
   c16 d e f
   \voiceOne
   <<
@@ -2082,7 +2090,7 @@ for example, to tie a tremolo to a chord. For example,
 @lilypond[fragment,verbatim,relative=1,ragged-right,quote]
 \set tieWaitForNote = ##t
 \grace { c16[~ e~ g]~ } <c, e g>2
-\repeat "tremolo" 8 { c32~ c'~ } <c c,>1
+\repeat tremolo 8 { c32~ c'~ } <c c,>1
 e8~ c~ a~ f~ <e' c a f>2
 @end lilypond
 
@@ -2562,9 +2570,10 @@ care when you mix staves with grace notes and staves without, for example,
 This can be remedied by inserting grace skips of the corresponding
 durations in the other staves. For the above example
 
-@example
-\new Staff @{ c4 \bar "|:" \grace s16 d4 @}
-@end example
+@lilypond[quote,ragged-right,relative=2,verbatim,fragment]
+<< \new Staff { e4 \bar "|:" \grace c16 d4 }
+   \new Staff { c4 \bar "|:" \grace s16 d4 } >>
+@end lilypond
 
 Grace sections should only be used within sequential music
 expressions.  Nesting or juxtaposing grace sections is not supported,
@@ -3006,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}.
@@ -3014,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.
@@ -3247,8 +3268,8 @@ 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)
-  \repeat "volta" 5 { d d d }
+  \set Score.voltaSpannerDuration = #(ly:make-moment 3 4)
+  \repeat volta 5 { d d d }
   \alternative { { e e e f f f }
   { g g g } }
 }
@@ -3264,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
@@ -3297,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
@@ -3392,16 +3416,16 @@ To place tremolo marks between notes, use @code{\repeat} with tremolo
 style
 @lilypond[quote,verbatim,ragged-right]
 \new Voice \relative c' {
-  \repeat "tremolo" 8 { c16 d16 }
-  \repeat "tremolo" 4 { c16 d16 }
-  \repeat "tremolo" 2 { c16 d16 }
+  \repeat tremolo 8 { c16 d16 }
+  \repeat tremolo 4 { c16 d16 }
+  \repeat tremolo 2 { c16 d16 }
 }
 @end lilypond
 
 Tremolo marks can also be put on a single note.  In this case, the
 note should not be surrounded by braces.
 @lilypond[quote,verbatim,ragged-right]
-\repeat "tremolo" 4 c'16
+\repeat tremolo 4 c'16
 @end lilypond
 
 Similar output is obtained using the tremolo subdivision, described in
@@ -3459,8 +3483,8 @@ Percent repeats must be declared within a @code{Voice} context.
 
 @lilypond[quote,verbatim,ragged-right]
 \new Voice \relative c' {
-  \repeat "percent" 4 { c4 }
-  \repeat "percent" 2 { c2 es2 f4 fis4 g4 c4 }
+  \repeat percent 4 { c4 }
+  \repeat percent 2 { c2 es2 f4 fis4 g4 c4 }
 }
 @end lilypond
 
@@ -3470,7 +3494,7 @@ on the @code{countPercentRepeats} property,
 @lilypond[relative=2,fragment,quote,verbatim,ragged-right]
 \new Voice {
 \set countPercentRepeats = ##t
-  \repeat "percent" 4 { c1 }
+  \repeat percent 4 { c1 }
 }
 @end lilypond