Rerun scripts/auxiliar/update-with-convert-ly.sh

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

diff --git a/Documentation/notation/percussion.itely b/Documentation/notation/percussion.itely
index f61283f10ff5c7f3942477c5009cf6ae2f7a310e..52e08335db9a83f16375e079ad4ecd86669cd0da 100644 (file)
--- a/Documentation/notation/percussion.itely
+++ b/Documentation/notation/percussion.itely
@@ -7,7 +7,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.12.0"
+@c \version "2.17.6"
 
 @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
 
-TODO add more.
+@c TODO add more references.
 
 @itemize
 
@@ -48,7 +48,6 @@ discussed in @ref{Showing melody rhythms}, and
 
 @end itemize
 
-
 @seealso
 Notation Reference:
 @ref{Showing melody rhythms},
@@ -100,11 +99,10 @@ 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 treble
+  hh4 hh hh hh
 }
 @end lilypond
 
@@ -112,14 +110,13 @@ be set explicitly.  Other clefs may be used as well.
 There are a few issues concerning MIDI support for percussion
 instruments; for details please see @ref{Percussion in MIDI}.
 
-
 @seealso
 Notation Reference:
 @ref{Percussion in MIDI},
 @ref{Percussion notes}.
 
-File:
-@file{ly/@/drumpitch@/-init@/.ly}
+Installed Files:
+@file{ly/drumpitch-init.ly}.
 
 Snippets:
 @rlsr{Percussion}.
@@ -133,8 +130,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,
-@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 {
@@ -146,20 +142,25 @@ example of some snare rolls:
 }
 @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 a 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 {
-    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
+Notation Reference:
+@ref{Tremolo repeats}.
+
 Snippets:
 @rlsr{Percussion}.
 
@@ -171,7 +172,6 @@ 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
@@ -245,19 +245,19 @@ mus = \drummode {
   cb hc bd sn ss tomh tommh tomml toml tomfh tomfl s16 }
 \score {
   << \new DrumStaff \with {
-       \remove Bar_engraver
-       \remove Time_signature_engraver
-       \override Stem #'transparent = ##t
-       \override Stem #'Y-extent = ##f
-       \override VerticalAxisGroup #'minimum-Y-extent = #'(-4.0 . 5.0)
+       \remove "Bar_engraver"
+       \remove "Time_signature_engraver"
+       \override Stem.transparent = ##t
+       \override Flag.transparent = ##t
+       \override Stem.Y-extent = ##f
      } \mus
      \new Lyrics \nam
   >>
   \layout {
     \context {
       \Score
-      \override LyricText #'font-family = #'typewriter
-      \override BarNumber #'transparent =##T
+      \override LyricText.font-family = #'typewriter
+      \override BarNumber.transparent =##T
     }
   }
 }
@@ -277,17 +277,18 @@ mus = \drummode { timh ssh timl ssl cb s16 }
 
 <<
   \new DrumStaff \with {
-    \remove Bar_engraver
-    \remove Time_signature_engraver
-    \override Stem #'transparent = ##t
-    \override Stem #'Y-extent = ##f
-    \override StaffSymbol #'line-count = #2
-    \override StaffSymbol #'staff-space = #2
-    \override VerticalAxisGroup #'minimum-Y-extent = #'(-3.0 . 4.0)
+    \remove "Bar_engraver"
+    \remove "Time_signature_engraver"
+    \override Stem.transparent = ##t
+    \override Flag.transparent = ##t
+    \override Stem.Y-extent = ##f
+    \override StaffSymbol.line-count = #2
+    \override StaffSymbol.staff-space = #2
+    \override VerticalAxisGroup.minimum-Y-extent = #'(-3.0 . 4.0)
     drumStyleTable = #timbales-style
   } \mus
   \new Lyrics {
-    \override LyricText #'font-family = #'typewriter
+    \override LyricText.font-family = #'typewriter
     \nam
   }
 >>
@@ -302,18 +303,19 @@ mus = \drummode { cgh cgho cghm ssh cgl cglo cglm ssl s16 }
 
 <<
   \new DrumStaff \with {
-    \remove Bar_engraver
-    \remove Time_signature_engraver
+    \remove "Bar_engraver"
+    \remove "Time_signature_engraver"
     drumStyleTable = #congas-style
-    \override StaffSymbol #'line-count = #2
+    \override StaffSymbol.line-count = #2
 
     %% this sucks; it will lengthen stems.
-    \override StaffSymbol #'staff-space = #2
-    \override Stem #'transparent = ##t
-    \override Stem #'Y-extent = ##f
+    \override StaffSymbol.staff-space = #2
+    \override Stem.transparent = ##t
+    \override Flag.transparent = ##t
+    \override Stem.Y-extent = ##f
   } \mus
   \new Lyrics {
-    \override LyricText #'font-family = #'typewriter
+    \override LyricText.font-family = #'typewriter
     \nam
   }
 >>
@@ -328,18 +330,19 @@ mus = \drummode { boh boho bohm ssh bol bolo bolm ssl s16 }
 
 <<
   \new DrumStaff \with {
-    \remove Bar_engraver
-    \remove Time_signature_engraver
-    \override StaffSymbol #'line-count = #2
+    \remove "Bar_engraver"
+    \remove "Time_signature_engraver"
+    \override StaffSymbol.line-count = #2
     drumStyleTable = #bongos-style
 
     %% this sucks; it will lengthen stems.
-    \override StaffSymbol #'staff-space = #2
-    \override Stem #'transparent = ##t
-    \override Stem #'Y-extent = ##f
+    \override StaffSymbol.staff-space = #2
+    \override Stem.transparent = ##t
+    \override Flag.transparent = ##t
+    \override Stem.Y-extent = ##f
   } \mus
   \new Lyrics {
-    \override LyricText #'font-family = #'typewriter
+    \override LyricText.font-family = #'typewriter
     \nam
   }
 >>
@@ -354,15 +357,16 @@ mus = \drummode { tri trio trim gui guis guil cb cl tamb cab mar hc s16 }
 
 <<
   \new DrumStaff \with{
-    \remove Bar_engraver
+    \remove "Bar_engraver"
     drumStyleTable = #percussion-style
-    \override StaffSymbol #'line-count = #1
-    \remove Time_signature_engraver
-    \override Stem #'transparent = ##t
-    \override Stem #'Y-extent = ##f
+    \override StaffSymbol.line-count = #1
+    \remove "Time_signature_engraver"
+    \override Stem.transparent = ##t
+    \override Flag.transparent = ##t
+    \override Stem.Y-extent = ##f
   } \mus
   \new Lyrics {
-    \override LyricText #'font-family = #'typewriter
+    \override LyricText.font-family = #'typewriter
     \nam
   }
 >>
@@ -413,10 +417,10 @@ Two Woodblocks, entered with wbh (high woodblock) and wbl (low woodblock)
 woodstaff = {
   % This defines a staff with only two lines.
   % It also defines the positions of the two lines.
-  \override Staff.StaffSymbol #'line-positions = #'(-2 3)
+  \override Staff.StaffSymbol.line-positions = #'(-2 3)
 
   % This is necessary; if not entered, the barline would be too short!
-  \override Staff.BarLine #'bar-size = #3
+  \override Staff.BarLine.bar-extent = #'(-1.5 . 1.5)
 }
 
 \new DrumStaff {
@@ -434,7 +438,7 @@ woodstaff = {
 @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}.
@@ -445,8 +449,8 @@ A tambourine, entered with @q{tamb}:
 #(define mydrums '((tambourine default #t 0)))
 
 tambustaff = {
-  \override Staff.StaffSymbol #'line-positions = #'( 0 )
-  \override Staff.BarLine #'bar-size = #3
+  \override Staff.StaffSymbol.line-positions = #'( 0 )
+  \override Staff.BarLine.bar-extent = #'(-1.5 . 1.5)
   \set DrumStaff.instrumentName = #"Tambourine"
 }
 
@@ -471,8 +475,8 @@ Music for Tam-Tam (entered with @q{tt}):
 #(define mydrums '((tamtam default #t 0)))
 
 tamtamstaff = {
-  \override Staff.StaffSymbol #'line-positions = #'( 0 )
-  \override Staff.BarLine #'bar-size = #3
+  \override Staff.StaffSymbol.line-positions = #'( 0 )
+  \override Staff.BarLine.bar-extent = #'(-1.5 . 1.5)
   \set DrumStaff.instrumentName = #"Tamtam"
 }
 
@@ -493,9 +497,9 @@ Two different bells, entered with @q{cb} (cowbell) and @q{rb} (ridebell)
                    (cowbell  default #t -2)))
 
 bellstaff = {
-  \override DrumStaff.StaffSymbol #'line-positions = #'(-2 3)
+  \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"
 }
 
@@ -570,7 +574,6 @@ drumsB = {
 }
 @end lilypond
 
-
 @seealso
 Snippets:
 @rlsr{Percussion}.
@@ -589,7 +592,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.
 
-@lilypond[quote,ragged-right,verbatim,fragment]
+@lilypond[quote,ragged-right,verbatim]
 \new DrumStaff \with {
   \consists "Parenthesis_engraver"
 }
@@ -615,7 +618,6 @@ However, the default @code{\drummode} does not include the
 Also note that you must add chords (@code{< >} brackets)
 around each @code{\parenthesize} statement.
 
-
 @seealso
 Snippets:
 @rlsr{Percussion}.