From: David Kastrup Date: Thu, 7 Nov 2013 19:16:57 +0000 (+0100) Subject: Issue 3648/7: Give several examples of durations without explicit pitches X-Git-Tag: release/2.19.0-1~151^2~1 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b570097f37f1aa89e81da7b48e3a9827d9f7184c;p=lilypond.git Issue 3648/7: Give several examples of durations without explicit pitches --- diff --git a/Documentation/included/note-head-style.ly b/Documentation/included/note-head-style.ly index a786978734..0d2cabfcda 100644 --- a/Documentation/included/note-head-style.ly +++ b/Documentation/included/note-head-style.ly @@ -1,4 +1,4 @@ -\version "2.17.6" +\version "2.19.0" \header { texidoc=" @@ -25,11 +25,11 @@ dimensions. pattern = << \new Voice { \override Stem.direction = #UP - e'4 e'2. e'1 e'\breve*1/2 e'\longa*1/4 \bar "||" + e'4 2. 1 \breve*1/2 \longa*1/4 \bar "||" } \new Voice { \override Stem.direction = #DOWN - a4 a2. a1 a\breve*1/2 a\longa*1/4 \bar "||" + a4 2. 1 \breve*1/2 \longa*1/4 \bar "||" } >> diff --git a/Documentation/ly-examples/orchestra.ly b/Documentation/ly-examples/orchestra.ly index 6b205af903..d784dfd6af 100644 --- a/Documentation/ly-examples/orchestra.ly +++ b/Documentation/ly-examples/orchestra.ly @@ -1,4 +1,4 @@ -\version "2.17.6" +\version "2.19.0" \header { tagline = ##f @@ -271,49 +271,49 @@ R2. | ees r r r4 r8 r4 r8 | } - trian = \relative c' { + trian = { \clef percussion \time 6/8 R2.*4 | \time 9/8 R1*9/8 | } - cym = \relative c' { + cym = { \clef percussion \time 6/8 R2.*4 | \time 9/8 R1*9/8 | } - tamt = \relative c' { + tamt = { \clef percussion \time 6/8 R2. | r4 r8 r c4\mf\<^"*" ~ | - c8\!\ff r r r4 r8 | R2. | + 8\!\ff r r r4 r8 | R2. | \time 9/8 R1*9/8 | } - tamb = \relative c' { + tamb = { \clef percussion \time 6/8 R2.*4 | \time 9/8 R1*9/8 | } - snare = \relative c' { + snare = { \clef percussion \time 6/8 R2.*4 | \time 9/8 - c8\pp c c c c c c c c | + c8\pp 8 8 8 8 8 8 8 8 | } - bsdrum = \relative c' { + bsdrum = { \clef percussion \time 6/8 - c2.:32\pp\< ~ | c: ~ | - c8\!\ff \offCr r r r4 r8 | R2. | + c2.:32\pp\< ~ | 2.: ~ | + 8\!\ff \offCr r r r4 r8 | R2. | \time 9/8 - c2.:32\pp ~ c4.: | + 2.:32\pp ~ 4.: | } harprh = \relative c'' { diff --git a/Documentation/notation/spacing.itely b/Documentation/notation/spacing.itely index 9aa7224320..bea1a12027 100644 --- a/Documentation/notation/spacing.itely +++ b/Documentation/notation/spacing.itely @@ -3103,11 +3103,14 @@ proportional notation settings and examine how these settings interact. We start with the following one-measure example, which uses classical spacing with ragged-right turned on. +@c The initial pitch is not necessary as long as RhythmicStaff is +@c not preceded by other material in the score, but we don't want +@c to explain that. @lilypond[quote,verbatim,ragged-right] \score { << \new RhythmicStaff { - c'2 c'16 c' c' c' \tuplet 5/4 { c'16 c' c' c' c' } + c2 16 16 16 16 \tuplet 5/4 { 16 16 16 16 16 } } >> } @@ -3132,7 +3135,7 @@ setting. \score { << \new RhythmicStaff { - c'2 c'16 c' c' c' \tuplet 5/4 { c'16 c' c' c' c' } + c2 16 16 16 16 \tuplet 5/4 { 16 16 16 16 16 } } >> \layout { @@ -3176,7 +3179,7 @@ larger reference durations space music tightly. \score { << \new RhythmicStaff { - c'2 c'16 c' c' c' \tuplet 5/4 { c'16 c' c' c' c' } + c2 16 16 16 16 \tuplet 5/4 { 16 16 16 16 16 } } >> \layout { @@ -3190,7 +3193,7 @@ larger reference durations space music tightly. \score { << \new RhythmicStaff { - c'2 c'16 c' c' c' \tuplet 5/4 { c'16 c' c' c' c' } + c2 16 16 16 16 \tuplet 5/4 { 16 16 16 16 16 } } >> \layout { @@ -3204,7 +3207,7 @@ larger reference durations space music tightly. \score { << \new RhythmicStaff { - c'2 c'16 c' c' c' \tuplet 5/4 { c'16 c' c' c' c' } + c2 16 16 16 16 \tuplet 5/4 { 16 16 16 16 16 } } >> \layout { @@ -3232,10 +3235,10 @@ tuplet. \score { << \new RhythmicStaff { - c'2 c'16 c' c' c' \tuplet 5/4 { c'16 c' c' c' c' } + c2 16 16 16 16 \tuplet 5/4 { 16 16 16 16 16 } } \new RhythmicStaff { - \tuplet 9/8 { c'8 c' c' c' c' c' c' c' c' } + \tuplet 9/8 { c8 8 8 8 8 8 8 8 8 } } >> } @@ -3250,10 +3253,10 @@ result. Setting @code{proportionalNotationDuration} fixes this. \score { << \new RhythmicStaff { - c'2 c'16 c' c' c' \tuplet 5/4 { c'16 c' c' c' c' } + c2 16 16 16 16 \tuplet 5/4 { 16 16 16 16 16 } } \new RhythmicStaff { - \tuplet 9/8 { c'8 c' c' c' c' c' c' c' c' } + \tuplet 9/8 { c8 8 8 8 8 8 8 8 8 } } >> \layout { @@ -3275,10 +3278,10 @@ turn on @code{uniform-stretching}, which is a property of \score { << \new RhythmicStaff { - c'2 c'16 c' c' c' \tuplet 5/4 { c'16 c' c' c' c' } + c2 16 16 16 16 \tuplet 5/4 { 16 16 16 16 16 } } \new RhythmicStaff { - \tuplet 9/8 { c'8 c' c' c' c' c' c' c' c' } + \tuplet 9/8 { c8 8 8 8 8 8 8 8 8 } } >> \layout { @@ -3374,13 +3377,13 @@ property of @code{SpacingSpanner}. Compare the two scores below: @lilypond[quote,verbatim,ragged-right] \new Staff { \set Score.proportionalNotationDuration = #(ly:make-moment 1/16) - c''8 c'' c'' \clef alto d' d'2 + c''8 8 8 \clef alto d'2 2 } \new Staff { \set Score.proportionalNotationDuration = #(ly:make-moment 1/16) \override Score.SpacingSpanner.strict-note-spacing = ##t - c''8 c'' c'' \clef alto d' d'2 + c''8 8 8 \clef alto d'2 2 } @end lilypond diff --git a/Documentation/snippets/new/flat-flags-and-beam-nibs.ly b/Documentation/snippets/new/flat-flags-and-beam-nibs.ly new file mode 100644 index 0000000000..754394be7a --- /dev/null +++ b/Documentation/snippets/new/flat-flags-and-beam-nibs.ly @@ -0,0 +1,86 @@ +\version "2.19.0" + +\header { + lsrtags = "contemporary-notation, rhythms" + + texidoc = " + Flat flags on lone notes and beam nibs at the ends of beamed figures +are both possible with a combination of @code{stemLeftBeamCount}, +@code{stemRightBeamCount} and paired @code{[]} beam indicators. + + + + +For right-pointing flat flags on lone notes, use paired @code{[]} beam +indicators and set @code{stemLeftBeamCount} to zero (see Example 1). + + + + +For left-pointing flat flags, set @code{stemRightBeamCount} instead +(Example 2). + + + + +For right-pointing nibs at the end of a run of beamed notes, set +@code{stemRightBeamCount} to a positive value. And for left-pointing +nibs at the start of a run of beamed notes, set +@code{stemLeftBeamCount} instead (Example 3). + + + + +Sometimes it may make sense for a lone note surrounded by rests to +carry both a left- and right-pointing flat flag. Do this with paired +@code{[]} beam indicators alone (Example 4). + + + + +(Note that @code{\\set stemLeftBeamCount} is always equivalent to +@code{\\once \\set}. In other words, the beam count settings are not +@qq{sticky}, so the pair of flat flags attached to the lone +@code{16[]} in the last example have nothing to do with the +@code{\\set} two notes prior.) + + + + +" + doctitle = "Flat flags and beam nibs" +} +\score { + << + % Example 1 + \new RhythmicStaff { + \set stemLeftBeamCount = #0 + c16[] + r8. + } + % Example 2 + \new RhythmicStaff { + r8. + \set stemRightBeamCount = #0 + 16[] + } + % Example 3 + \new RhythmicStaff { + 16 16 + \set stemRightBeamCount = #2 + 16 r r + \set stemLeftBeamCount = #2 + 16 16 16 + } + % Example 4 + \new RhythmicStaff { + 16 16 + \set stemRightBeamCount = #2 + 16 r16 + 16[] + r16 + \set stemLeftBeamCount = #2 + 16 16 + } + >> +} diff --git a/Documentation/snippets/new/modifying-tuplet-bracket-length.ly b/Documentation/snippets/new/modifying-tuplet-bracket-length.ly new file mode 100644 index 0000000000..6ee36e8201 --- /dev/null +++ b/Documentation/snippets/new/modifying-tuplet-bracket-length.ly @@ -0,0 +1,33 @@ +\version "2.19.0" + +\header { + lsrtags = "really-simple, rhythms" + + texidoc = " +Tuplet brackets can be made to run to prefatory matter or the next +note. Default tuplet brackets end at the right edge of the final note +of the tuplet; full-length tuplet brackets extend farther to the right, +either to cover all the non-rhythmic notation up to the following note, +or to cover only the whitespace before the next item of notation, be +that a clef, time signature, key signature, or another note. The +example shows how to switch tuplets to full length mode and how to +modify what material they cover. + +" + doctitle = "Modifying tuplet bracket length" +} + +\new RhythmicStaff { + % Set tuplets to be extendable... + \set tupletFullLength = ##t + % ...to cover all items up to the next note + \set tupletFullLengthNote = ##t + \time 2/4 + \tuplet 3/2 { c4 4 4 } + % ...or to cover just whitespace + \set tupletFullLengthNote = ##f + \time 4/4 + \tuplet 5/4 { 4 1 } + \time 3/4 + 2. +} diff --git a/Documentation/snippets/new/staff-headword.ly b/Documentation/snippets/new/staff-headword.ly index 67bc0f6286..a23b5cb063 100644 --- a/Documentation/snippets/new/staff-headword.ly +++ b/Documentation/snippets/new/staff-headword.ly @@ -35,22 +35,13 @@ trompette = \relative do'' { do8-. r8 sib4-> | } -tambourin = \relative do' { +tambourin = \drummode { \time 2/4 - r8 do16 do do8 do | - r8 do16 do do8 do | - r8 do r do | - r8 do16 do do8 do | - r8 do r do | -} - -tambourinMidi = \drummode { - \time 2/4 - r8 tamb16 tamb tamb8 tamb | - r8 tamb16 tamb tamb8 tamb | - r8 tamb r tamb | - r8 tamb16 tamb tamb8 tamb | - r8 tamb r tamb | + r8 tamb16 16 8 8 | + r8 16 16 8 8 | + r8 8 r8 8 | + r8 16 16 8 8 | + r8 8 r8 8 | } upper = \relative do' { @@ -102,7 +93,7 @@ lower = \relative do { \trompette } \context DrumStaff = "tambourin" { - \tambourinMidi + \tambourin } \context Staff = "piano" << \upper @@ -113,4 +104,3 @@ lower = \relative do { \tempo 4 = 72 } } -