Merge branch 'master' of ssh://kainhofer@git.sv.gnu.org/srv/git/lilypond into dev...

[lilypond.git] / Documentation / user / percussion.itely

diff --git a/Documentation/user/percussion.itely b/Documentation/user/percussion.itely
index 880fe5c54cf94b0f700c4ce5a21276f205959068..dc5b946a232788cc9bf9a6df9d408f2c6d414b2d 100644 (file)
--- a/Documentation/user/percussion.itely
+++ b/Documentation/user/percussion.itely
@@ -34,33 +34,10 @@ also be used to show the rhythms of melodies.
 @c TODO Add refs
 TBC
 
-@ignore
-TODO This section needs splitting.
-     The part showing the rhythm of a melody should be moved to
-     1.2.3 Displaying rhythms, but the example should be changed
-     to omit the drum roll.
-     A better example of drum rolls should be devised and placed in
-     Basic percussion notation. -td
-
-@node Showing melody rhythms
-@subsubsection Showing melody rhythms
-
-Sometimes you might want to show only the rhythm of a melody.  This
-can be done with the rhythmic staff.  All pitches of notes on such a
-staff are squashed, and the staff itself has a single line
-
-@lilypond[quote,ragged-right,fragment,relative=1,verbatim]
-\new RhythmicStaff {
-  \time 4/4
-  c4 e8 f g2 | r4 g r2 | g1:32 | r1 |
-}
-@end lilypond
 
 @seealso
 
-Internals Reference: @internalsref{RhythmicStaff}.
-
-@end ignore
+Internals Reference: @rinternals{RhythmicStaff}.
 
 
 @node Basic percussion notation
@@ -72,8 +49,10 @@ Internals Reference: @internalsref{RhythmicStaff}.
 
 Percussion notes may be entered in @code{\drummode} mode, which is
 similar to the standard mode for entering notes.  Each piece of
-percussion has a full name and an abbreviated name, and both can be used
-in input files
+percussion has a full name and an abbreviated name, and both can
+be used in input files.  The simplest way to enter percussion notes
+is to use the @code{\drums} command, which creates the correct
+context and entry mode for percussion:
 
 @lilypond[quote,ragged-right,verbatim]
 \drums {
@@ -81,13 +60,48 @@ in input files
 }
 @end lilypond
 
+This is shorthand for
+
+@lilypond[quote,ragged-right,verbatim]
+\new DrumStaff
+\drummode {
+  hihat hh bassdrum bd
+}
+@end lilypond
+
+
 The complete list of drum names is in the init file
 @file{ly/@/drumpitch@/-init@/.ly}.
 @c TODO: properly document this.
 
+Drum rolls are indicated with three slashes across the stem.
+For quarter notes or longer the three slashes are shown explicitly,
+eighth notes are shown with two slashes (the beam being the third),
+and drum rolls shorter than eighths have one stem slash to
+supplement the beams.  This is achieved with the tremolo notation,
+@code{:32}, see @ref{Tremolo repeats}.  Here's an example of
+some snare rolls:
+
+@lilypond[quote,ragged-right,verbatim]
+\new DrumStaff
+\drummode {
+  \time 2/4
+  sn16 sn8 sn16 sn8 sn8:32~ |
+  sn8 sn8 sn4:32~ |
+  sn4 sn8 sn16 sn16 |
+  sn4 r4 |
+}
+@end lilypond
+
+Sticking can be indicated by placing @code{^"R"} or @code{^"L"}
+after the note.  The @code{staff-padding} property may be
+overridden to achieve a pleasing baseline.
+
+@c TODO Add example of sticking
+
 @seealso
 
-Internals Reference: @internalsref{note-event}.
+Internals Reference: @rinternals{note-event}.
 
 @node Percussion staves
 @subsubsection Percussion staves
@@ -100,7 +114,7 @@ of percussion.
 
 
 To typeset the music, the notes must be interpreted in a
-@internalsref{DrumStaff} and @internalsref{DrumVoice} contexts
+@rinternals{DrumStaff} and @rinternals{DrumVoice} contexts
 
 @lilypond[quote,ragged-right,verbatim]
 up = \drummode { crashcymbal4 hihat8 halfopenhihat hh hh hh openhihat }
@@ -112,8 +126,8 @@ down = \drummode { bassdrum4 snare8 bd r bd sn4 }
 @end lilypond
 
 The above example shows verbose polyphonic notation.  The short
-polyphonic notation, described in @rlearning{I'm seeing Voices},
-can also be used if the @internalsref{DrumVoice}s are instantiated
+polyphonic notation, described in @rlearning{I'm hearing Voices},
+can also be used if the @rinternals{DrumVoice}s are instantiated
 by hand first.  For example,
 
 @lilypond[quote,ragged-right,fragment,verbatim]
@@ -133,7 +147,7 @@ by hand first.  For example,
 
 
 There are also other layout possibilities.  To use these, set the
-property @code{drumStyleTable} in context @internalsref{DrumVoice}.
+property @code{drumStyleTable} in context @rinternals{DrumVoice}.
 The following variables have been predefined
 
 @table @code
@@ -298,7 +312,7 @@ down = \drummode { bd4 sn bd toml8 toml }
 
 Init files: @file{ly/@/drumpitch@/-init@/.ly}.
 
-Internals Reference: @internalsref{DrumStaff}, @internalsref{DrumVoice}.
+Internals Reference: @rinternals{DrumStaff}, @rinternals{DrumVoice}.
 
 @knownissues