Index: Documentation/notation/percussion.itely |
diff --git a/Documentation/notation/percussion.itely b/Documentation/notation/percussion.itely |
index 7c3a27bd8670f3219971f6a13e11f82a4a23058a..195a7f3077b02aec3300ff3dac9ab7e8927b018e 100644 |
--- a/Documentation/notation/percussion.itely |
+++ b/Documentation/notation/percussion.itely |
@@ -100,11 +100,11 @@ be set explicitly. Other clefs may be used as well. |
@lilypond[quote,ragged-right,verbatim] |
\drums { |
- \clef treble |
- hh4 hh hh hh |
+ \clef "treble" |
+ hh4 hh hh hh | |
\break |
- \clef percussion |
- bd4 bd bd bd |
+ \clef "percussion" |
+ bd4 bd bd bd | |
} |
@end lilypond |
@@ -139,10 +139,10 @@ example of some snare rolls: |
@lilypond[quote,verbatim] |
\drums { |
\time 2/4 |
- sn16 sn8 sn16 sn8 sn8:32 ~ |
- sn8 sn8 sn4:32 ~ |
- sn4 sn8 sn16 sn16 |
- sn4 r4 |
+ sn16 sn8 sn16 sn8 sn:32~ | |
+ sn8 sn sn4:32~ | |
+ sn4 sn8 sn16 sn | |
+ sn4 r | |
} |
@end lilypond |
@@ -153,7 +153,7 @@ 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" |
} |
} |
@end lilypond |
@@ -215,12 +215,12 @@ For example, |
@lilypond[quote,verbatim] |
\new DrumStaff << |
\drummode { |
- bd4 sn4 bd4 sn4 |
+ bd4 sn bd sn | |
<< { |
- \repeat unfold 16 hh16 |
+ \repeat unfold 16 { hh16 } |
} \\ { |
- bd4 sn4 bd4 sn4 |
- } >> |
+ bd4 sn bd sn |
+ } >> | |
} |
>> |
@end lilypond |
@@ -238,10 +238,10 @@ five-line staff: |
@lilypond[quote,line-width=10.0\cm] |
nam = \lyricmode { |
- cymc cyms cymr hh hhc hho hhho hhp |
+ cymc4 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 |
+ cymc4 cyms cymr hh hhc hho hhho hhp \break |
cb hc bd sn ss tomh tommh tomml toml tomfh tomfl s16 } |
\score { |
<< \new DrumStaff \with { |
@@ -272,8 +272,8 @@ example, to get toms on the three middle lines you use |
This typesets timbales on a two line staff: |
@lilypond[quote,ragged-right] |
-nam = \lyricmode { timh ssh timl ssl cb } |
-mus = \drummode { timh ssh timl ssl cb s16 } |
+nam = \lyricmode { timh4 ssh timl ssl cb } |
+mus = \drummode { timh4 ssh timl ssl cb s16 } |
<< |
\new DrumStaff \with { |
@@ -297,8 +297,8 @@ mus = \drummode { timh ssh timl ssl cb s16 } |
This typesets congas on a two line staff: |
@lilypond[quote,ragged-right] |
-nam = \lyricmode { cgh cgho cghm ssh cgl cglo cglm ssl } |
-mus = \drummode { cgh cgho cghm ssh cgl cglo cglm ssl s16 } |
+nam = \lyricmode { cgh4 cgho cghm ssh cgl cglo cglm ssl } |
+mus = \drummode { cgh4 cgho cghm ssh cgl cglo cglm ssl s16 } |
<< |
\new DrumStaff \with { |
@@ -323,8 +323,8 @@ mus = \drummode { cgh cgho cghm ssh cgl cglo cglm ssl s16 } |
This typesets bongos on a two line staff: |
@lilypond[quote,ragged-right] |
-nam = \lyricmode { boh boho bohm ssh bol bolo bolm ssl } |
-mus = \drummode { boh boho bohm ssh bol bolo bolm ssl s16 } |
+nam = \lyricmode { boh4 boho bohm ssh bol bolo bolm ssl } |
+mus = \drummode { boh4 boho bohm ssh bol bolo bolm ssl s16 } |
<< |
\new DrumStaff \with { |
@@ -349,8 +349,8 @@ mus = \drummode { boh boho bohm ssh bol bolo bolm ssl s16 } |
To typeset all kinds of simple percussion on one line staves: |
@lilypond[quote,ragged-right] |
-nam = \lyricmode { tri trio trim gui guis guil cb cl tamb cab mar hc } |
-mus = \drummode { tri trio trim gui guis guil cb cl tamb cab mar hc s16 } |
+nam = \lyricmode { tri4 trio trim gui guis guil cb cl tamb cab mar hc } |
+mus = \drummode { tri4 trio trim gui guis guil cb cl tamb cab mar hc s16 } |
<< |
\new DrumStaff \with{ |
@@ -377,13 +377,13 @@ If you do not like any of the predefined lists you can define your |
own list at the top of your file. |
@lilypond[quote,verbatim] |
-#(define mydrums '( |
- (bassdrum default #f -1) |
- (snare default #f 0) |
- (hihat cross #f 1) |
- (halfopenhihat cross "halfopen" 1) |
- (pedalhihat xcircle "stopped" 2) |
- (lowtom diamond #f 3))) |
+#(define mydrums |
+ '((bassdrum default #f -1) |
+ (snare default #f 0) |
+ (hihat cross #f 1) |
+ (halfopenhihat cross "halfopen" 1) |
+ (pedalhihat xcircle "stopped" 2) |
+ (lowtom diamond #f 3))) |
up = \drummode { hh8 hh hhho hhho hhp4 hhp } |
down = \drummode { bd4 sn bd toml8 toml } |
@@ -428,7 +428,7 @@ woodstaff = { |
\drummode { |
\time 2/4 |
wbl8 wbl16 wbl wbh8-> wbl | |
- wbl8 wbl16 wbh-> ~ wbh wbl16 r8 | |
+ wbl8 wbl16 wbh->~ wbh wbl16 r8 | |
} |
} |
@end lilypond |
@@ -481,7 +481,7 @@ tamtamstaff = { |
\set DrumStaff.drumStyleTable = #(alist->hash-table mydrums) |
\drummode { |
- tt 1 \pp \laissezVibrer |
+ tt1\pp\laissezVibrer |
} |
} |
@end lilypond |
@@ -503,7 +503,7 @@ bellstaff = { |
\bellstaff |
\drummode { |
\time 2/4 |
- rb8 rb cb cb16 rb-> ~ | |
+ rb8 rb cb cb16 rb->~ | |
rb16 rb8 rb16 cb8 cb | |
} |
} |
@@ -517,10 +517,10 @@ Here a short example taken from Stravinsky's @q{L'histoire du Soldat}. |
(tambourine default #t 0))) |
global = { |
- \time 3/8 s4. |
- \time 2/4 s2*2 |
- \time 3/8 s4. |
- \time 2/4 s2 |
+ \time 3/8 s4. | |
+ \time 2/4 s2*2 | |
+ \time 3/8 s4. | |
+ \time 2/4 s2 | |
} |
drumsA = { |
@@ -528,11 +528,11 @@ drumsA = { |
{ \global } |
{ \drummode { |
\autoBeamOff |
- \stemDown sn8 \stemUp tamb s8 | |
- sn4 \stemDown sn4 | |
- \stemUp tamb8 \stemDown sn8 \stemUp sn16 \stemDown sn \stemUp sn8 | |
- \stemDown sn8 \stemUp tamb s8 | |
- \stemUp sn4 s8 \stemUp tamb |
+ \stemDown sn8 \stemUp tamb s | |
+ sn4 \stemDown sn | |
+ \stemUp tamb8 \stemDown sn \stemUp sn16 \stemDown sn \stemUp sn8 | |
+ \stemDown sn8 \stemUp tamb s | |
+ \stemUp sn4 s8 \stemUp tamb | |
} |
} |
>> |
@@ -540,7 +540,7 @@ drumsA = { |
drumsB = { |
\drummode { |
- s4 bd8 s2*2 s4 bd8 s4 bd8 s8 |
+ s4 bd8 | s2*2 | s4 bd8 | s4 bd8 s | |
} |
} |
@@ -552,7 +552,7 @@ drumsB = { |
\new StaffGroup << |
\new DrumStaff { |
\set DrumStaff.instrumentName = \markup { |
- \column { |
+ \center-column { |
"Tambourine" |
"et" |
"caisse claire s. timbre" |
@@ -594,16 +594,14 @@ However, the default @code{\drummode} does not include the |
\consists "Parenthesis_engraver" |
} |
<< |
- \context DrumVoice = "1" { s1 } |
- \context DrumVoice = "2" { s1 } |
+ \context DrumVoice = "1" { s1 } |
+ \context DrumVoice = "2" { s1 } |
\drummode { |
<< |
{ |
- hh8[ hh] <hh sn> hh16 |
- < \parenthesize sn > hh |
- < \parenthesize sn > hh8 <hh sn> hh |
- } \\ |
- { |
+ hh8[ hh] <hh sn> hh16 <\parenthesize sn> |
+ hh16 <\parenthesize sn> hh8 <hh sn> hh |
+ } \\ { |
bd4 r4 bd8 bd r8 bd |
} |
>> |