Updates CG regtest instructions

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

diff --git a/Documentation/notation/percussion.itely b/Documentation/notation/percussion.itely
index a41a53a03a264da0fb55882f20483daba632caed..c6a0115f8b34e9794425320413bf75f0e1efce56 100644 (file)
--- a/Documentation/notation/percussion.itely
+++ b/Documentation/notation/percussion.itely
@@ -7,7 +7,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
     Guide, node Updating translation committishes..
 @end ignore
 

-@c \version "2.12.0"
+@c \version "2.14.0"

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


@@ -35,7 +35,7 @@ also be used to show the rhythms of melodies.
 @node References for percussion
 @unnumberedsubsubsec References for percussion
 
 @node References for percussion
 @unnumberedsubsubsec References for percussion
 

-TODO add more.
+@c TODO add more references.

 
 @itemize
 
 
 @itemize
 


@@ -94,17 +94,16 @@ note names may be found in @ref{Percussion notes}.
 @cindex percussion clef
 
 Note that the normal notation of pitches (such as @code{cis4}) in a
 @cindex percussion clef
 
 Note that the normal notation of pitches (such as @code{cis4}) in a

-@code{DrumStaff} context will cause an error message. Percussion clefs
+@code{DrumStaff} context will cause an error message.  Percussion clefs

 are added automatically to a @code{DrumStaff} context but they can also
 be set explicitly.  Other clefs may be used as well.
 
 @lilypond[quote,ragged-right,verbatim]
 \drums {
 are added automatically to a @code{DrumStaff} context but they can also
 be set explicitly.  Other clefs may be used as well.
 
 @lilypond[quote,ragged-right,verbatim]
 \drums {

-  \clef treble
-  hh4 hh hh hh
-  \break

   \clef percussion
   bd4 bd bd bd
   \clef percussion
   bd4 bd bd bd

+  \clef treble
+  hh4 hh hh hh

 }
 @end lilypond
 
 }
 @end lilypond
 


@@ -119,7 +118,7 @@ Notation Reference:
 @ref{Percussion notes}.
 
 File:
 @ref{Percussion notes}.
 
 File:

-@file{ly/@/drumpitch@/-init@/.ly}
+@file{ly/drumpitch-init.ly}

 
 Snippets:
 @rlsr{Percussion}.
 
 Snippets:
 @rlsr{Percussion}.


@@ -133,8 +132,7 @@ 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,
 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}, as described in @ref{Tremolo repeats}.  Here is an
-example of some snare rolls:
+as described in @ref{Tremolo repeats}.

 
 @lilypond[quote,verbatim]
 \drums {
 
 @lilypond[quote,verbatim]
 \drums {


@@ -146,20 +144,27 @@ example of some snare rolls:
 }
 @end lilypond
 
 }
 @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.
+Sticking can be indicated by placing placing markup for @code{"R"}
+or @code{"L"} above or below notes, as discussed in
+@ref{Direction and placement}.  The @code{staff-padding} property
+may be overridden to achieve a pleasing baseline.

 
 @lilypond[quote,verbatim]
 \drums {
   \repeat unfold 2 {
 
 @lilypond[quote,verbatim]
 \drums {
   \repeat unfold 2 {

-    sn16 ^"L" sn^"R" sn^"L" sn^"L" sn^"R" sn^"L"  sn^"R" sn^"R"
+    sn16^"L" sn^"R" sn^"L" sn^"L" sn^"R" sn^"L" sn^"R" sn^"R"
+    \stemUp
+    sn16_"L" sn_"R" sn_"L" sn_"L" sn_"R" sn_"L" sn_"R" sn_"R"

   }
 }
 @end lilypond
 
 
 @seealso
   }
 }
 @end lilypond
 
 
 @seealso

+
+Notation Reference:
+@ref{Tremolo repeats}.
+

 Snippets:
 @rlsr{Percussion}.
 
 Snippets:
 @rlsr{Percussion}.
 


@@ -229,7 +234,7 @@ There are also other layout possibilities.  To use these, set the
 property @code{drumStyleTable} in context @code{DrumVoice}.  The
 following variables have been predefined:
 
 property @code{drumStyleTable} in context @code{DrumVoice}.  The
 following variables have been predefined:
 

-@c FIXME: decide what to do about this table.  (ie verbatim or not)
+@c TODO: decide what to do about this table.  (ie verbatim or not)

 @table @code
 
 @item drums-style
 @table @code
 
 @item drums-style


@@ -249,7 +254,6 @@ mus = \drummode {
        \remove Time_signature_engraver
        \override Stem #'transparent = ##t
        \override Stem #'Y-extent = ##f
        \remove Time_signature_engraver
        \override Stem #'transparent = ##t
        \override Stem #'Y-extent = ##f

-       \override VerticalAxisGroup #'minimum-Y-extent = #'(-4.0 . 5.0)

      } \mus
      \new Lyrics \nam
   >>
      } \mus
      \new Lyrics \nam
   >>


@@ -397,7 +401,7 @@ down = \drummode { bd4 sn bd toml8 toml }
 
 @snippets
 
 
 @snippets
 

-FIXME: MOVE ALL THESE TO LSR!  -gp
+@c TODO: MOVE ALL THESE TO LSR!  -gp

 
 Here are some examples:
 
 
 Here are some examples:
 


@@ -415,8 +419,8 @@ woodstaff = {
   % It also defines the positions of the two lines.
   \override Staff.StaffSymbol #'line-positions = #'(-2 3)
 
   % It also defines the positions of the two lines.
   \override Staff.StaffSymbol #'line-positions = #'(-2 3)
 

-  % This is neccessary; if not entered, the barline would be too short!
-  \override Staff.BarLine #'bar-size = #3
+  % This is necessary; if not entered, the barline would be too short!
+  \override Staff.BarLine #'bar-extent = #'(-1.5 . 1.5)

 }
 
 \new DrumStaff {
 }
 
 \new DrumStaff {


@@ -434,7 +438,7 @@ woodstaff = {
 @end lilypond
 
 Note that in this special case the length of the barline must
 @end lilypond
 
 Note that in this special case the length of the barline must

-altered with @code{\override Staff.BarLine #'bar-size #number}.
+altered with @code{\override Staff.BarLine #'bar-extent #'(from . to)}.

 Otherwise it would be too short.  And you have also to define the
 positions of the two stafflines.  For more information about these
 delicate things have a look at @ref{Staff symbol}.
 Otherwise it would be too short.  And you have also to define the
 positions of the two stafflines.  For more information about these
 delicate things have a look at @ref{Staff symbol}.


@@ -446,7 +450,7 @@ A tambourine, entered with @q{tamb}:
 
 tambustaff = {
   \override Staff.StaffSymbol #'line-positions = #'( 0 )
 
 tambustaff = {
   \override Staff.StaffSymbol #'line-positions = #'( 0 )

-  \override Staff.BarLine #'bar-size = #3
+  \override Staff.BarLine #'bar-extent = #'(-1.5 . 1.5)

   \set DrumStaff.instrumentName = #"Tambourine"
 }
 
   \set DrumStaff.instrumentName = #"Tambourine"
 }
 


@@ -472,7 +476,7 @@ Music for Tam-Tam (entered with @q{tt}):
 
 tamtamstaff = {
   \override Staff.StaffSymbol #'line-positions = #'( 0 )
 
 tamtamstaff = {
   \override Staff.StaffSymbol #'line-positions = #'( 0 )

-  \override Staff.BarLine #'bar-size = #3
+  \override Staff.BarLine #'bar-extent = #'(-1.5 . 1.5)

   \set DrumStaff.instrumentName = #"Tamtam"
 }
 
   \set DrumStaff.instrumentName = #"Tamtam"
 }
 


@@ -495,7 +499,7 @@ Two different bells, entered with @q{cb} (cowbell) and @q{rb} (ridebell)
 bellstaff = {
   \override DrumStaff.StaffSymbol #'line-positions = #'(-2 3)
   \set DrumStaff.drumStyleTable = #(alist->hash-table mydrums)
 bellstaff = {
   \override DrumStaff.StaffSymbol #'line-positions = #'(-2 3)
   \set DrumStaff.drumStyleTable = #(alist->hash-table mydrums)

-  \override Staff.BarLine #'bar-size = #3
+  \override Staff.BarLine #'bar-extent = #'(-1.5 . 1.5)

   \set DrumStaff.instrumentName = #"Different Bells"
 }
 
   \set DrumStaff.instrumentName = #"Different Bells"
 }
 


@@ -589,7 +593,7 @@ Ghost notes for drums and percussion may be created using the
 However, the default @code{\drummode} does not include the
 @code{Parenthesis_engraver} plugin which allows this.
 
 However, the default @code{\drummode} does not include the
 @code{Parenthesis_engraver} plugin which allows this.
 

-@lilypond[quote,ragged-right,verbatim,fragment]
+@lilypond[quote,ragged-right,verbatim]

 \new DrumStaff \with {
   \consists "Parenthesis_engraver"
 }
 \new DrumStaff \with {
   \consists "Parenthesis_engraver"
 }