Merge branch 'master' into lilypond/translation

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

diff --git a/Documentation/user/percussion.itely b/Documentation/user/percussion.itely
index 93a217a5b3cc5f486c898a7545fa5ec3f76d974e..c2ead94a5c0fa8eb4b613652569d3a9d2e7fb22f 100644 (file)
--- a/Documentation/user/percussion.itely
+++ b/Documentation/user/percussion.itely
@@ -1,40 +1,47 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
 @c -*- coding: utf-8; mode: texinfo; -*-

+@ignore
+    Translation of GIT committish: FILL-IN-HEAD-COMMITTISH
+
+    When revising a translation, copy the HEAD committish of the
+    version that you are working on.  See TRANSLATION for details.
+@end ignore
+
+@c \version "2.11.38"

 
 @node Percussion
 @section Percussion
 
 
 @node Percussion
 @section Percussion
 

+@menu
+* Common notation for percussion::
+@end menu
+
+@node Common notation for percussion
+@subsection Common notation for percussion
+

 Rhythmic music is primarily used for percussion and drum notation, but it can
 also be used to show the rhythms of melodies.
 
 @menu
 Rhythmic music is primarily used for percussion and drum notation, but it can
 also be used to show the rhythms of melodies.
 
 @menu

-* Showing melody rhythms::      
-* Entering percussion::         
-* Percussion staves::           
-* Ghost notes::                 
+* References for percussion::
+* Basic percussion notation::
+* Percussion staves::
+* Ghost notes::

 @end menu
 
 @end menu
 

+@node References for percussion
+@subsubsection References for percussion

 
 

-@anchor{Showing melody rhythms}
-@unnumberedsubsubsec Showing melody rhythms
+@c TODO Add refs
+TBC

 
 

-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
 
 
 @seealso
 

-Program reference: @internalsref{RhythmicStaff}.
+Internals Reference: @rinternals{RhythmicStaff}.

 
 
 
 

-@anchor{Entering percussion}
-@unnumberedsubsubsec Entering percussion
+@node Basic percussion notation
+@subsubsection Basic percussion notation

 
 @cindex percussion
 @cindex drums
 
 @cindex percussion
 @cindex drums


@@ -42,8 +49,10 @@ Program 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 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 {
 
 @lilypond[quote,ragged-right,verbatim]
 \drums {


@@ -51,16 +60,51 @@ in input files
 }
 @end lilypond
 
 }
 @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.
 
 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
 
 @seealso
 

-Program reference: @internalsref{note-event}.
+Internals Reference: @rinternals{note-event}.

 
 

-@anchor{Percussion staves}
-@unnumberedsubsubsec Percussion staves
+@node Percussion staves
+@subsubsection Percussion staves

 @cindex percussion
 @cindex drums
 
 @cindex percussion
 @cindex drums
 


@@ -70,7 +114,7 @@ of percussion.
 
 
 To typeset the music, the notes must be interpreted in a
 
 
 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 }
 
 @lilypond[quote,ragged-right,verbatim]
 up = \drummode { crashcymbal4 hihat8 halfopenhihat hh hh hh openhihat }


@@ -82,8 +126,9 @@ down = \drummode { bassdrum4 snare8 bd r bd sn4 }
 @end lilypond
 
 The above example shows verbose polyphonic notation.  The short
 @end lilypond
 
 The above example shows verbose polyphonic notation.  The short

-polyphonic notation, described in @ref{Basic polyphony}, can also be used if
-the @internalsref{DrumVoice}s are instantiated by hand first.  For example,
+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]
 \new DrumStaff <<
 
 @lilypond[quote,ragged-right,fragment,verbatim]
 \new DrumStaff <<


@@ -102,7 +147,7 @@ the @internalsref{DrumVoice}s are instantiated by hand first.  For example,
 
 
 There are also other layout possibilities.  To use these, set the
 
 
 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
 The following variables have been predefined
 
 @table @code


@@ -267,25 +312,23 @@ down = \drummode { bd4 sn bd toml8 toml }
 
 Init files: @file{ly/@/drumpitch@/-init@/.ly}.
 
 
 Init files: @file{ly/@/drumpitch@/-init@/.ly}.
 

-Program reference: @internalsref{DrumStaff}, @internalsref{DrumVoice}.
+Internals Reference: @rinternals{DrumStaff}, @rinternals{DrumVoice}.

 
 

-@refbugs
+@knownissues

 
 Because general MIDI does not contain rim shots, the sidestick is used
 for this purpose instead.
 
 
 
 Because general MIDI does not contain rim shots, the sidestick is used
 for this purpose instead.
 
 

-@c FIXME: check name -gp
-@anchor{Ghost notes}
-@unnumberedsubsubsec Ghost notes
+@c TODO: check name -gp
+@node Ghost notes
+@subsubsection Ghost notes

 
 Ghost notes for drums and percussion may be created using the
 @code{\parenthesize} command detailed in @ref{Parentheses}.  However,
 the default @code{\drummode} does
 not include the @code{Parenthesis_engraver} plugin which allows
 
 Ghost notes for drums and percussion may be created using the
 @code{\parenthesize} command detailed in @ref{Parentheses}.  However,
 the default @code{\drummode} does
 not include the @code{Parenthesis_engraver} plugin which allows

-this.  You
-must add the plugin explicitly in the context definition as
-detailed in @ref{Changing context properties on the fly}.
+this.

 
 @lilypond[quote,ragged-right,verbatim,fragment]
 \new DrumStaff \with {
 
 @lilypond[quote,ragged-right,verbatim,fragment]
 \new DrumStaff \with {