diff -r 1cdd067059b2 -r 604c04c779a1 op13/1/GRegor-op13-mov1.ly --- a/op13/1/GRegor-op13-mov1.ly Thu Sep 16 12:26:13 2010 -0400 +++ b/op13/1/GRegor-op13-mov1.ly Thu Sep 16 12:26:38 2010 -0400 @@ -31,14 +31,22 @@ \override Score.MetronomeMark #'transparent = ##t \tempo 4 = 120 \skip 2.*347 } + +nsl = { + \override Stem #'transparent = ##t +} +sl = { + \revert Stem #'transparent +} + \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 @@ -85,7 +93,7 @@ %% 25 < f'' a'' > 2. | a'' 4 -\p \stemUp bes'' 2 _~ \stemNeutral | - \stemDown bes'' 2 _~ bes'' 8 a'' \stemNeutral | + \stemDown bes'' 2 ^~ bes'' 8 a'' \stemNeutral | a'' 4 \stemUp g'' 2 _~ \stemNeutral | g'' 2. | %% 30 @@ -161,7 +169,7 @@ %% 85 < f'' a'' > 2. | a'' 4 -\p \stemUp bes'' 2 _~ \stemNeutral | - \stemDown bes'' 2 _~ bes'' 8 a'' \stemNeutral | + \stemDown bes'' 2 ^~ bes'' 8 a'' \stemNeutral | a'' 4 \stemUp g'' 2 _~ \stemNeutral | \stemDown g'' 2. \stemNeutral | %% 90 @@ -265,7 +273,7 @@ < a'''' c''''' > 4 aes'''' -\fermata g'''' | \times 6/7 { ges'''' 16 f'''' fes'''' ees'''' d'''' des'''' c'''' } \times 6/7 { ces'''' bes''' a''' aes''' g''' ges''' f''' } | %% 165 - #(set-octavation 0) #(set-octavation 1) fes''' 2 #(set-octavation 1) _~ fes''' 8 f''' + #(set-octavation 1) fes''' 2 _~ fes''' 8 f''' % warning: overlong bar truncated here | f''' 2. | f''' 2. | @@ -292,13 +300,13 @@ %% 185 < des' bes' > 2 s4 | s2. | - #(set-octavation 1) < bes''' des''' > 2. -\mp #(set-octavation 1) _~ + #(set-octavation 1) < bes''' des''' > 2. -\mp _~ % warning: overlong bar truncated here | < bes''' des''' > 2. -\fermata | #(set-octavation 0) < bes' des' > 2 s4 | %% 190 s2. | - #(set-octavation 1) < des''' bes''' > 2. #(set-octavation 1) _~ + #(set-octavation 1) < des''' bes''' > 2. _~ % warning: overlong bar truncated here | < bes''' des''' > 2. -\fermata | #(set-octavation 0) < bes' des' > 2. _~ | @@ -388,7 +396,7 @@ e''' 2. \startTrillSpan _~ % warning: overlong bar truncated here | %% 260 - e''' 2 \grace { e''' 8 \stopTrillSpan f''' g''' } a''' 4 | + e''' 2 \grace { \autoBeamOff e''' 8 \stopTrillSpan [f''' g'''] \autoBeamOn } a''' 4 | a''' 2. _~ | a''' 4 _~ a''' 2 \startTrillSpan | a''' 2. \stopTrillSpan _~ | @@ -405,8 +413,8 @@ < bes'' bes''' g''' d''' > 2 _~ < bes'' bes''' d''' g''' > 8 < c''' c'''' e''' a''' > | < c'''' e''' c''' a''' > 4 < c''' a''' e''' a'' > 2 _~ | < a'' c''' a''' e''' > 2. | - #(set-octavation 0) a'' 4 -\mp bes'' 2 _~ | - bes'' 2 _~ bes'' 8 a'' | + #(set-octavation 0) a'' 4 -\mp \stemUp bes'' 2 _~ \stemNeutral | + bes'' 2 ^~ bes'' 8 a'' | %% 275 a'' 4 d''' bes'' 8 a'' | < g' des'' g'' e'' > 2. \arpeggio | @@ -418,14 +426,14 @@ < aes' b' f'' d'' > 2. \arpeggio | #(set-octavation 1) < d''' f''' > 4 -\ff #(set-octavation 1) e''' d''' % warning: overlong bar truncated here | - e''' 2 f''' 4 | + \nsl e''' 2 \sl f''' 4 | < a'' a''' f''' c''' > 2. \> % warning: overlong bar truncated here | #(set-octavation 0) < a'' f'' c''' > 2. | %% 285 < des'' a'' g'' f'' > 4 \arpeggio -\mp \! g'' \< f'' % warning: overlong bar truncated here | - g'' 2 a'' 4 | + \nsl g'' 2 \sl a'' 4 | c''' 2. \! \> _~ % warning: overlong bar truncated here | c''' 4 bes'' a'' | @@ -437,7 +445,7 @@ a'' 4 g'' 2 _~ | g'' 4 des'' a'' | %% 295 - #(set-octavation 1) d''' 2. #(set-octavation 1) _~ + #(set-octavation 1) d''' 2. _~ % warning: overlong bar truncated here | d''' 4 a'' d''' | a''' 4 g''' 2 _~ | @@ -451,7 +459,7 @@ s4 f'' g'' | %% 305 < a'' b' > 2. _~ | - < a'' b' > 2 -\fermata c'' 4 \bar "||" + < a'' b' > 2 -\fermata c'' 4 \bar "||" \break a'' 2. _\markup { \bold \italic "molto rubato" } ^\markup { \bold \large "Andante appassionato (♩ ~106)" } _~ | a'' 4 c'' a'' | c''' 2 _~ \times 2/3 { c''' 8 d''' ees''' } | @@ -462,7 +470,7 @@ g'' 2. _~ | g'' 8 a'' bes'' a'' a'' 8. a'' 16 | %% 315 - #(set-octavation 1) a'' 2. #(set-octavation 1) _~ + #(set-octavation 1) a'' 2. _~ % warning: overlong bar truncated here | \times 2/3 { a'' 8 bes'' c''' } \times 2/3 { d''' ees''' ees''' } ees''' 8. ees''' 16 | ees''' 2. _~ | @@ -504,7 +512,7 @@ \clef "treble" < b d' > 4 \times 2/3 { e' 8 < b d' > e' } | \once \override Staff.TimeSignature #'style = #'() \time 3/4 - < b d' > 2 _\markup { \bold \italic "ritard." } _~ < d' b > 8 c' | + < b d' > 2 _\markup { \bold \italic "ritard." } _~ < d' b > 8 c' | \break a' 2. -\pp ^\markup { \bold \large "Larghetto" } _~ | a' 4 c' 4. a' 8 | c'' 4 b' 2 _~ | @@ -556,7 +564,7 @@ e'' 2. _~ | e'' 2. | %% 30 - \stemUp a'' 2. _~ \stemNeutral | + \stemUp a'' 2. ^~ \stemNeutral | \times 2/3 { \stemUp a'' 8 aes'' g'' } \times 2/3 { ges'' f'' e'' _~ } e'' f'' \stemNeutral | } % Voice @@ -604,8 +612,13 @@ \skip 2.*64 \skip 4*2 \clef "treble" - s4 f' 2 | + << { \voiceOne + s4 f' 2 | f' 2. | + } \new Voice = "RH2" { \voiceTwo + s4 \hideNotes < f' a' > 2 _~ \unHideNotes | + \hideNotes < f' a' > 2. \unHideNotes | + } >> \oneVoice } % Voice \context Voice = "voice 9" { @@ -629,7 +642,7 @@ e'' 2. _~ | e'' 2. | %% 90 - \stemUp a'' 2. _~ \stemNeutral | + \stemUp a'' 2. ^~ \stemNeutral | \times 2/3 { \stemUp a'' 8 aes'' g'' } \times 2/3 { ges'' f'' e'' _~ } e'' f'' \stemNeutral | s2. | s2. | @@ -732,11 +745,13 @@ s2. | \stemDown #(set-octavation 1) < bes'' g'' > 2. #(set-octavation 1) \stemNeutral % warning: overlong bar truncated here | + \once \override NoteColumn #'force-hshift = #1.7 < d''' b'' aes'' > 2. | s2. | s2. | %% 285 s2. | + \once \override NoteColumn #'force-hshift = #1.7 #(set-octavation 0) < f'' d'' > 2. | } % Voice @@ -775,8 +790,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 @@ -952,7 +966,7 @@ ges, 2. | g, 2. | des' 4 a ees | - s4_\markup { \bold \italic "senza pedale" } c, a,, | + \stemDown s4_\markup { \bold \italic "senza pedale" } c, a,, \stemNeutral | %% 135 s2. | bes, 4 < bes f > des | @@ -1016,16 +1030,40 @@ a, 4 < bes f > des | aes, 4 < bes f > des | %% 185 - g, 8 des f bes des' bes' | + g, 8 des f bes + \change Staff = "RH" + des' bes' + \change Staff = "LH" + | \clef "treble" - g' 8 f'' des'' bes'' f'' f''' | + g' 8 f'' des'' + \change Staff = "RH" + bes'' + \change Staff = "LH" + f'' + \change Staff = "RH" + f''' + \change Staff = "LH" + | s2. | s2. | \clef "bass" - ges, 8 des ges bes des' bes' | + ges, 8 des ges + \change Staff = "RH" + bes des' bes' + \change Staff = "LH" + | %% 190 \clef "treble" - ges' 8 des'' bes' ges'' des'' bes'' | + ges' 8 des'' bes' + \change Staff = "RH" + ges'' + \change Staff = "LH" + des'' + \change Staff = "RH" + bes'' + \change Staff = "LH" + | s2. | s2. | \clef "bass" @@ -1069,14 +1107,30 @@ d, 8 a, f a, f a, | d, 8 a, f a, f a, | %% 225 - bes, 8 f bes d' f' bes' | + bes, 8 f bes + \change Staff = "RH" + d' f' bes' + \change Staff = "LH" + | s2. | - b, 8 f d' f' a' d'' | + b, 8 f d' + \change Staff = "RH" + f' a' d'' + \change Staff = "LH" + | s2. | - c 8 a f' a' c'' f'' | + c 8 a f' + \change Staff = "RH" + a' c'' f'' + \change Staff = "LH" + | %% 230 s2. | - des 8 a e' a' e'' e''' | + des 8 a e' + \change Staff = "RH" + a' e'' e''' + \change Staff = "LH" + | s2. | \clef "treble" f' 4 c'' a'' | @@ -1188,8 +1242,12 @@ d' 8 bes g d bes, d, | c,, 8 g,, e, g, c g | c' 2 s4 | - f, 8 _\markup { \bold \italic "meno rubato" } c f a c' f' | - a' 8 f' c' a f c | + f, 8 _\markup { \bold \italic "meno rubato" } c f a + \change Staff = "RH" + c' f' | + a' 8 f' c' + \change Staff = "LH" + a f c | %% 325 fis, 8 c fis bes d' fis' | bes' 8 fis' d' bes fis fis, | @@ -1211,7 +1269,11 @@ c 8 a f' a' c'' f'' | %% 340 a'' 8 f'' c'' a' f' a | - b, 8 a d' f' a' d'' | + b, 8 a d' + \change Staff = "RH" + f' a' d'' + \change Staff = "LH" + | s2. | s2. | s2. | @@ -1253,7 +1315,7 @@ \skip 2.*132 \skip 4*2 \clef "bass" - f, 2. _~ | + f, 2. ^~ | %% 135 < f, f,, > 2. | } % Voice