X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fnotation%2Fpercussion.itely;h=c6502992b0796ddf8dd53ed75090f895b7a20d77;hb=553410afdd9496f7d9f1498e755ea18de8e70596;hp=f97af1ccefc85bb6cfc774049b7759838351846a;hpb=d5fc7a079db0853bfb49e21821226d492f01cf8c;p=lilypond.git

diff --git a/Documentation/notation/percussion.itely b/Documentation/notation/percussion.itely
index f97af1ccef..c6502992b0 100644
--- a/Documentation/notation/percussion.itely
+++ b/Documentation/notation/percussion.itely
@@ -44,7 +44,7 @@ discussed in @ref{Showing melody rhythms}, and
 @ref{Instantiating new staves}.
 
 @item MIDI output is discussed in a separate section; please see
-@ref{Percussion in MIDI}.
+@ref{MIDI instruments}.
 
 @end itemize
 
@@ -52,7 +52,7 @@ discussed in @ref{Showing melody rhythms}, and
 Notation Reference:
 @ref{Showing melody rhythms},
 @ref{Instantiating new staves}.
-@ref{Percussion in MIDI}.
+@ref{MIDI instruments}.
 
 Snippets:
 @rlsr{Percussion}.
@@ -78,10 +78,8 @@ which creates the correct context and entry mode for percussion:
 This is shorthand for:
 
 @lilypond[quote,verbatim]
-\new DrumStaff {
-  \drummode {
-    hihat4 hh bassdrum bd
-  }
+\new DrumStaff \drummode {
+  hihat4 hh bassdrum bd
 }
 @end lilypond
 
@@ -100,19 +98,19 @@ be set explicitly.  Other clefs may be used as well.
 @lilypond[quote,ragged-right,verbatim]
 \drums {
   \clef percussion
-  bd4 bd bd bd
+  bd4 4 4 4
   \clef treble
-  hh4 hh hh hh
+  hh4 4 4 4
 }
 @end lilypond
 
 
 There are a few issues concerning MIDI support for percussion
-instruments; for details please see @ref{Percussion in MIDI}.
+instruments; for details please see @ref{MIDI instruments}.
 
 @seealso
 Notation Reference:
-@ref{Percussion in MIDI},
+@ref{MIDI instruments},
 @ref{Percussion notes}.
 
 Installed Files:
@@ -135,10 +133,10 @@ as described in @ref{Tremolo repeats}.
 @lilypond[quote,verbatim]
 \drums {
   \time 2/4
-  sn16 sn8 sn16 sn8 sn8:32 ~
-  sn8 sn8 sn4:32 ~
-  sn4 sn8 sn16 sn16
-  sn4 r4
+  sn16 8 16 8 8:32 ~
+  8 8 4:32 ~
+  4 8 16 16
+  4 r4
 }
 @end lilypond
 
@@ -150,9 +148,9 @@ may be overridden to achieve a pleasing baseline.
 @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" 16^"R" 16^"L" 16^"L" 16^"R" 16^"L" 16^"R" 16^"R"
     \stemUp
-    sn16_"L" sn_"R" sn_"L" sn_"L" sn_"R" sn_"L" sn_"R" sn_"R"
+    sn16_"L" 16_"R" 16_"L" 16_"L" 16_"R" 16_"L" 16_"R" 16_"R"
   }
 }
 @end lilypond
@@ -168,16 +166,13 @@ Snippets:
 @node Pitched percussion
 @unnumberedsubsubsec Pitched percussion
 
-Certain pitched percussion instruments (e.g. xylophone,
+Certain pitched percussion instruments (e.g., xylophone,
 vibraphone, and timpani) are written using normal staves.
 This is covered in other sections of the manual.
 
 @seealso
-@c TODO: possibly link to an alternate section of NR 3.5, if
-@c "percussion in MIDI" gets a separate subsubsection for
-@c pitched percussion sounds.  -gp
 Notation Reference:
-@ref{Percussion in MIDI}.
+@ref{MIDI instruments}.
 
 Snippets:
 @rlsr{Percussion}.
@@ -267,6 +262,37 @@ toms, simply select the toms that produce the desired result.  For
 example, to get toms on the three middle lines you use
 @code{tommh}, @code{tomml}, and @code{tomfh}.
 
+@item agostini-drums-style
+Invented by the French percussionist Dante Agostini in 1965, this notation is
+commonly employed in France but also elsewhere.
+
+@lilypond[quote,line-width=10.0\cm]
+nam = \lyricmode {
+  cymc cyms cymr hh hhc hho hhho hhp
+  cb hc bd sn ss tomh tommh tomml toml tomfh tomfl }
+mus = \drummode {
+  cymc cyms cymr hh hhc hho hhho hhp \break
+  cb hc bd sn ss tomh tommh tomml toml tomfh tomfl s16 }
+\score {
+  << \new DrumStaff \with {
+       \remove "Bar_engraver"
+       \remove "Time_signature_engraver"
+       \hide Stem
+       \override Stem.Y-extent = ##f
+       drumStyleTable = #agostini-drums-style
+     } \mus
+     \new Lyrics \nam
+  >>
+  \layout {
+    \context {
+      \Score
+      \override LyricText.font-family = #'typewriter
+      \override BarNumber.transparent =##T
+    }
+  }
+}
+@end lilypond
+
 @item timbales-style
 This typesets timbales on a two line staff:
 
@@ -426,8 +452,8 @@ woodstaff = {
 
   \drummode {
     \time 2/4
-    wbl8 wbl16 wbl wbh8-> wbl |
-    wbl8 wbl16 wbh-> ~ wbh wbl16 r8 |
+    wbl8 16 16 8-> 8 |
+    wbl8 16 16-> ~ 16 16 r8 |
   }
 }
 @end lilypond
@@ -455,8 +481,8 @@ tambustaff = {
 
   \drummode {
     \time 6/8
-    tamb8. tamb16 tamb8 tamb tamb tamb |
-    tamb4. tamb8 tamb tamb |
+    tamb8. 16 8 8 8 8 |
+    tamb4. 8 8 8 |
     % the trick with the scaled duration and the shorter rest
     % is neccessary for the correct ending of the trill-span!
     tamb2.*5/6 \startTrillSpan s8 \stopTrillSpan |
@@ -502,8 +528,8 @@ bellstaff = {
   \bellstaff
   \drummode {
     \time 2/4
-    rb8 rb cb cb16 rb-> ~ |
-    rb16 rb8 rb16 cb8 cb |
+    rb8 8 cb8 16 rb16-> ~ |
+    16 8 16 cb8 8 |
   }
 }
 @end lilypond
@@ -593,12 +619,12 @@ Ghost notes for drums and percussion may be created using the
   \drummode {
     <<
       {
-        hh8[ hh] <hh sn> hh16
+        hh8[ 8] <hh sn> hh16
         \parenthesize sn  hh
         \parenthesize sn  hh8 <hh sn> hh
       } \\
       {
-        bd4 r4 bd8 bd r8 bd
+        bd4 r4 bd8 8 r8 bd
       }
     >>
   }