diff -r 91fc53719a58 -r 4d5a905d67f7 op13/2/GRegor-op13-mov2.ly --- a/op13/2/GRegor-op13-mov2.ly Tue Oct 12 00:52:48 2010 -0400 +++ b/op13/2/GRegor-op13-mov2.ly Tue Oct 12 01:04:58 2010 -0400 @@ -48,12 +48,12 @@ } \score { << % common - \context GrandStaff = "0" << + \context PianoStaff = "0" << + \set PianoStaff.instrumentName = \markup { \column { "Piano " } } % force offset of colliding notes in chords: \override Score.NoteColumn #'force-hshift = #1.0 - \context Staff = "track 1, RH" << - \set Staff.instrumentName = \markup { \column { "RH " } } + \context Staff = "RH" << \set Staff.midiInstrument = "Acoustic Grand Piano" \set Score.skipBars = ##t \set Staff.printKeyCancellation = ##f @@ -79,13 +79,13 @@ r4 < f' bes g d' > 2 | %% 10 r4 < a d' f' g > 2 | - r4 < f' bes g d' > 2 | + \stemDown r4 < f' bes g d' > 2 \stemNeutral | r4 < a d' f' g > 2 | r4 \< < g' aes c' ees' > 2 % warning: overlong bar truncated here | r4 < bes' des' g' fes' > 2 | %% 15 - r4 \! \> < bes' bes d' f' > 2 + \stemDown r4 \! \> < bes' bes d' f' > 2 \stemNeutral % warning: overlong bar truncated here | r4 < a' ges' c' d' > 2 | r4 \! < f' bes g d' > 2 | @@ -103,7 +103,7 @@ < g' bes' > 4 < bes' d'' > < g'' bes' d'' > | \once \override Staff.TimeSignature #'style = #'() \time 4/4 < bes'' ges'' ees'' c'' > 2. ^\markup { \bold \large "Andante (♩~100)" } \times 2/3 { bes'' 8 -\mp \! a'' aes'' } | - g'' 2 ges'' | + \stemUp g'' 2 \stemNeutral ges'' | < ges' ees' c' bes' > 2 \times 2/3 { bes' 4 c'' bes' } | %% 30 r2 g' 4 c'' | @@ -125,12 +125,12 @@ < bes' g' > 2. | < a' g' > 2 _\markup { \bold \italic "ritard." } g' 4 | \once \override Staff.TimeSignature #'style = #'() \time 4/4 - d' 4. _\markup { \bold \italic "a tempo" } \! g 8 bes g bes d' | - d' 4. g 8 bes g bes d' | + d' 4. _\markup { \bold \italic "a tempo" } \! \autoBeamOff g 8 [ bes g bes d' ] \autoBeamOn | + d' 4. \autoBeamOff g 8 [ bes g bes d' ] | %% 45 - d' 4. d 8 ges d fis d' | - d' 4. d 8 ges d' ges' d'' | - ges'' 2. -\fermata g'' 4 \bar "||" + d' 4. \autoBeamOff d 8 [ ges d fis d' ] \autoBeamOn | + d' 4. \autoBeamOff d 8 [ ges d' ges' d'' ] \autoBeamOn | + ges'' 2. -\fermata g'' 4 \bar "||" \break } % Voice \context Voice = "voice 2" { @@ -140,19 +140,19 @@ \skip 2.*4 %% 5 \clef "treble" - g'' 2. _~ | + g'' 2. ^~ | g'' 2 f'' 4 | - d'' 2. _~ | + d'' 2. ^~ | d'' 2 c'' 4 | d'' 2 ees'' 4 | %% 10 c'' 2 d'' 4 | - g' 2. _~ | + g' 2. ^~ | g' 2. | - g'' 2. _~ | + g'' 2. ^~ | g'' 2 f'' 4 | %% 15 - d'' 2. _~ | + d'' 2. ^~ | d'' 2 \times 2/3 { c'' 8 ees'' d'' } | bes' 2. | } % Voice @@ -167,8 +167,8 @@ s1 | %% 30 < d'' e' > 1 | - \times 2/3 { f' 2 s1 } | - \times 2/3 { bes 2 s1 } | + \stemDown f' 2 \stemNeutral s2 | + bes 2 s2 | } % Voice \context Voice = "voice 4" { @@ -179,7 +179,7 @@ \clef "treble" < c''' c'' e'' > 2. | s2. | - a' 2. | + \stemDown a' 2. \stemNeutral | } % Voice \context Voice = "voice 5" { @@ -230,7 +230,7 @@ %% 80 d''' 2. | fis'' 8 d''' ees''' d''' ees''' d''' _~ | - d''' 2 ees''' 8 -\fermata d''' -\fermata \bar "||" + d''' 2 ees''' 8 -\fermata d''' -\fermata \bar "||" \break } % Voice \context Voice = "voice 6" { @@ -284,7 +284,7 @@ g''' 4 < ges d a > 8 bes d' ges' | g' 4 < d' g bes > 8 ees' g' bes' | %% 95 - bes' 4 c'' 4. bes' 8 | + \stemUp bes' 4 \stemNeutral c'' 4. bes' 8 | \clef "bass" f' 4 ^\markup { \bold \large "Andante" } -\mf \! \times 2/3 { ges 8 f e } \times 2/3 { ees d des } | d 4 s s | @@ -393,9 +393,10 @@ < c' bes' g' > 1 | < bes' c' ges' > 1 _\markup { \bold \italic "accel." } \< % warning: overlong bar truncated here | - d'' 1 | - d'' 1 | - d'' 2 d'' 4 d'' | + \once \override NoteColumn #'force-hshift = #2 + \repeat tremolo 16 {d'' 32 ees'' 32} | + \repeat tremolo 16 {d'' 32 f'' 32} | + \repeat tremolo 8 {d'' 32 a'' 32} \repeat tremolo 4 {d'' 32 bes'' 32} \repeat tremolo 4 {d'' 32 c''' 32} | %% 160 < d''' d'' > 4. < ees''' ees'' > 8 < d''' d'' > 4. < ees'' ees''' > 8 | < d'' d''' > 8 < ees'' ees''' > < e'' e''' > < f''' f'' > < ges'' ges''' > 4 -\fermata < g'' g''' > \bar "||" @@ -408,7 +409,7 @@ \skip 2.*149 %% 145 \clef "treble" - s2 a'' 8 bes'' | + s2 \stemUp a'' 8 bes'' \stemNeutral | s2. | s2. | s2. | @@ -417,7 +418,7 @@ s2. | s2. | s2. | - s2 a'' 8 bes'' | + s2 \stemUp a'' 8 bes'' \stemNeutral | } % Voice \context Voice = "voice 13" { @@ -434,22 +435,39 @@ \override MultiMeasureRest #'expand-limit = 1 \skip 2.*168 \skip 4 - \clef "bass" + << { \voiceOne + s4 \clef "bass" s2. | + r4 \clef "treble" #(set-octavation 1) < g'' g''' > < g'' g''' > 4. < f''' f'' > 8 | + \hideNotes d'' 4 \unHideNotes #(set-octavation 0) \clef "bass" s2. | +%% 165 + r4. \clef "treble" #(set-octavation 1) < d''' d'' > 16 < ees'' ees''' > < d'' d''' > 4 < c'' c''' > | + \hideNotes d'' 4 \unHideNotes #(set-octavation 0) \clef "bass" s2. | + r4. \clef "treble" #(set-octavation 1) < ees'' ees''' > 8 < c''' c'' > 4 < d''' d'' > | + \hideNotes g' 4 \unHideNotes #(set-octavation 0) \clef "bass" s2. | + r4. \clef "treble" #(set-octavation 1) < c'''' c''' > 8 < bes'' bes''' > 4 < a''' a'' > | +%% 170 + \hideNotes g'' 4 \unHideNotes #(set-octavation 0) \clef "bass" s2. | + r2 \clef "treble" #(set-octavation 1) < g'' g''' > 4 < f'' f''' > | + \hideNotes d'' 4 \unHideNotes #(set-octavation 0) \clef "bass" s2. | + r4. \clef "treble" #(set-octavation 1) < d''' d'' > 16 < ees'' ees''' > < d''' d'' > 4 < c'' c''' > | + \hideNotes d'' 4 \unHideNotes #(set-octavation 0) \clef "bass" s2. | + } \new Voice = "RH2" { \voiceTwo < g''' bes'' d''' g'' > 1 ^\markup { \bold \large "Presto" } -\ff | - r4 < g'' g''' > < g'' g''' > 4. < f''' f'' > 8 | + s1 | < d'' d''' > 1 | %% 165 - r4. < d''' d'' > 16 < ees'' ees''' > < d'' d''' > 4 < c'' c''' > | + s1 | < d''' d'' > 1 | - r4. < ees'' ees''' > 8 < c''' c'' > 4 < d''' d'' > | + s1 | < g' g'' > 1 | - r4. < c'''' c''' > 8 < bes'' bes''' > 4 < a''' a'' > | + s1 | %% 170 < g'' g''' > 1 | - r2 < g'' g''' > 4 < f'' f''' > | + s1 | < d''' d'' > 1 | - r4. < d''' d'' > 16 < ees'' ees''' > < d''' d'' > 4 < c'' c''' > | + s1 | < d'' d''' > 1 | + } >> \oneVoice %% 175 \clef "treble" \times 2/3 { < ees'' ees' > 2 < d'' d' > 8 < ees'' ees' > < d'' d' > 2 < des' des'' > 8 < d' d'' > } | @@ -512,7 +530,7 @@ < ges' ges d' > 1 | < d'' g'' > 2 _~ < d'' g'' > 8 a'' bes'' c''' | d''' 2 ees''' | - #(set-octavation 1) < ges''' ges'' d''' a'' > 1 \arpeggio #(set-octavation 1) _~ + #(set-octavation 1) < ges''' ges'' d''' a'' > 1 \arpeggio _~ % warning: overlong bar truncated here | %% 200 < ges''' ges'' a'' d''' > 2 g''' | @@ -528,8 +546,7 @@ } % Voice >> % Staff ends - \context Staff = "track 2, LH" << - \set Staff.instrumentName = \markup { \column { "LH " } } + \context Staff = "LH" << \set Staff.midiInstrument = "Acoustic Grand Piano" \set Score.skipBars = ##t \set Staff.printKeyCancellation = ##f @@ -567,10 +584,38 @@ f, 8 d s4 s | %% 20 e, 8 d s4 s | - ees, 8 bes, ees g bes ees' | - e, 8 d bes, g d bes | - f, 8 d bes, f d bes | - ges, 8 d a, ges d a | + ees, 8 bes, ees g bes + \change Staff = "RH" + ees' + \change Staff = "LH" + | + e, 8 d bes, + \change Staff = "RH" + g + \change Staff = "LH" + d + \change Staff = "RH" + bes + \change Staff = "LH" + | + f, 8 d bes, + \change Staff = "RH" + f + \change Staff = "LH" + d + \change Staff = "RH" + bes + \change Staff = "LH" + | + ges, 8 d a, + \change Staff = "RH" + ges + \change Staff = "LH" + d + \change Staff = "RH" + a + \change Staff = "LH" + | %% 25 g, 8 d s4 s | f, 8 d g bes d' g' | @@ -797,10 +842,10 @@ \once \override Staff.TimeSignature #'style = #'() \time 4/4 \clef "bass_8" < ees, d > 1 | - d, 1 | - d, 1 | - d, 1 | - d, 1 | + \repeat tremolo 16 { d, 32 d 32 } | + \repeat tremolo 16 { d, 32 d 32 } | + \repeat tremolo 16 { d, 32 d 32 } | + \repeat tremolo 16 { d, 32 d 32 } | %% 160 < d, d > 4. < ees ees, > 8 < d d, > 4. < ees ees, > 8 | < d d, > 1 | @@ -812,21 +857,126 @@ \skip 2.*168 \skip 4 \clef "bass_8" - < g, g,, > 4 < d,, d, > 8 < bes, bes > < g, g,, > < d' d > < bes, bes,, > < g g' > | + < g, g,, > 4 + \autoBeamOff + < d,, d, > 8 [ + \change Staff = "RH" + < bes, bes > + \change Staff = "LH" + < g, g,, > + \change Staff = "RH" + < d' d > + \change Staff = "LH" + < bes, bes,, > + \change Staff = "RH" + < g g' > + ] \autoBeamOn + \change Staff = "LH" + | < d d, > 1 | - < ees, ees,, > 4 < bes,, bes,,, > 8 < g g, > < ees, ees,, > < bes, bes > < g, g,, > < ees ees' > | + < ees, ees,, > 4 + \autoBeamOff + < bes,, bes,,, > 8 [ + \change Staff = "RH" + < g g, > + \change Staff = "LH" + < ees, ees,, > + \change Staff = "RH" + < bes, bes > + \change Staff = "LH" + < g, g,, > + \change Staff = "RH" + < ees ees' > + ] \autoBeamOn + \change Staff = "LH" + | %% 165 < ees ees, > 1 | - < e, e,, > 4 < c, c,, > 8 < g, g > < e, e,, > < c' c > < g, g,, > < e' e > | + < e, e,, > 4 + \autoBeamOff + < c, c,, > 8 [ + \change Staff = "RH" + < g, g > + \change Staff = "LH" + < e, e,, > + \change Staff = "RH" + < c' c > + \change Staff = "LH" + < g, g,, > + \change Staff = "RH" + < e' e > + ] \autoBeamOn + \change Staff = "LH" + | < c c, > 1 | - < ees, ees,, > 4 < bes,, bes,,, > 8 < g, g > < ees, ees,, > < bes, bes > < g, g,, > < ees ees' > | + < ees, ees,, > 4 + \autoBeamOff + < bes,, bes,,, > 8 [ + \change Staff = "RH" + < g, g > + \change Staff = "LH" + < ees, ees,, > + \change Staff = "RH" + < bes, bes > + \change Staff = "LH" + < g, g,, > + \change Staff = "RH" + < ees ees' > + ] \autoBeamOn + \change Staff = "LH" + | < ees ees, > 1 | %% 170 - < e,, e, > 4 < g, g,, > 8 < des des' > < bes,, bes, > < e e' > < des des, > < g' g > | + < e,, e, > 4 + \autoBeamOff + < g, g,, > 8 [ + \change Staff = "RH" + < des des' > + \change Staff = "LH" + < bes,, bes, > + \change Staff = "RH" + < e e' > + \change Staff = "LH" + < des des, > + \change Staff = "RH" + < g' g > + ] \autoBeamOn + \change Staff = "LH" + | < e e, > 1 | - < f, f,, > 4 < bes,, bes,,, > 8 < f, f > < d, d,, > < bes, bes > < f, f,, > < d d' > | + < f, f,, > 4 + \autoBeamOff + < bes,, bes,,, > 8 [ + \change Staff = "RH" + < f, f > + \change Staff = "LH" + < d, d,, > + \change Staff = "RH" + < bes, bes > + \change Staff = "LH" + < f, f,, > + \change Staff = "RH" + < d d' > + ] \autoBeamOn + \change Staff = "LH" + | < d d, > 1 | - < g, g,, > 4 < d, d,, > 8 < bes, bes > < g, g,, > < d d' > < bes, bes,, > < g g' > | + < g, g,, > 4 + \autoBeamOff + < d, d,, > 8 [ + \change Staff = "RH" + < bes, bes > + \change Staff = "LH" + < g, g,, > + \change Staff = "RH" + < d d' > + \change Staff = "LH" + < bes, bes,, > + \change Staff = "RH" + < g g' > + ] \autoBeamOn + \change Staff = "LH" + | %% 175 < c c, > 2 < bes, bes,, > | < a, a,, > 2 < ees, ees,, > | @@ -870,8 +1020,40 @@ d' 1 _~ | %% 200 d' 1 | - < g, g,, > 4 < d, d,, > 8 < bes, bes > < g, g,, > < d d' > < bes, bes,, > < g' g > | - < d d, > 8 < bes bes' > < g g, > < d'' d' > < bes bes, > < g' g'' > < d' d > < bes'' bes' > | + < g, g,, > 4 + \autoBeamOff + < d, d,, > 8 [ + \change Staff = "RH" + < bes, bes > + \change Staff = "LH" + < g, g,, > + \change Staff = "RH" + < d d' > + \change Staff = "LH" + < bes, bes,, > + \change Staff = "RH" + < g' g > + ] + \change Staff = "LH" + | + < d d, > 8 [ + \change Staff = "RH" + < bes bes' > + \change Staff = "LH" + < g g, > + \change Staff = "RH" + < d'' d' > + \change Staff = "LH" + < bes bes, > + \change Staff = "RH" + < g' g'' > + \change Staff = "LH" + < d' d > + \change Staff = "RH" + < bes'' bes' > + ] \autoBeamOn + \change Staff = "LH" + | < c' c > 4.. #(set-octavation -1) < c,, c, > 16 #(set-octavation -1) < c, c,, > 2 | #(set-octavation 0) < d d' > 4.. #(set-octavation -1) < d,, d, > 16 #(set-octavation -1) < d, d,, > 2 | %% 205