diff -r 94bb8bdadcc8 -r 3aa5f7a8e1ac op10/GRegor-op10.ly
--- a/op10/GRegor-op10.ly	Sat Aug 21 14:45:47 2010 -0400
+++ b/op10/GRegor-op10.ly	Sat Aug 21 14:45:56 2010 -0400
@@ -9,6 +9,7 @@
 #(set-global-staff-size 20)
 #(set-default-paper-size "a4")
 global = { 
+    #(override-auto-beam-setting '(end * * 7 8) 4 8 'Score)
     \time 7/8
     \skip 8*301  %% 1-43
     % \time 6/8
@@ -22,12 +23,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
@@ -41,38 +42,38 @@
                     \once \override Staff.TimeSignature #'style = #'() \time 7/8
                     \clef "treble"
                     \key fis \minor
-                    r8-\mf ^\markup { \bold \large "Andante (♩.~80)" }  r r r r r r  |
-                    r8 r r r r r r  |
-                    r8 r r r r r r  |
-                    r8 r r r r r r  |
+                    R2..-\mf ^\markup { \bold \large "Andante (♩.~80)" }  |
+                    R2..  |
+                    R2..  |
+                    R2..  |
 %% 5
-                    r8 r r r r r r  |
-                    r8 r r r r r r  |
-                    r8 r r r r r r  |
-                    r8 r r r r r r  |
-                    r8 r r r eis'' 4.  |
+                    R2..  |
+                    R2..  |
+                    R2..  |
+                    R2..  |
+                    r2 eis'' 4.  |
 %% 10
                     fis'' 2 _~ fis'' 4.  |
-                    r8 r r r eis'' 4.  |
+                    r2 eis'' 4.  |
                     fis'' 2 _~ fis'' 4.  |
-                    r8 r r r eis'' 4.  |
+                    r2 eis'' 4.  |
                     fis'' 2 _~ fis'' 4.  |
 %% 15
-                    r8 r r r eis'' 4.  |
+                    r2 eis'' 4.  |
                     fis'' 2 _~ fis'' 4.  |
-                    r8 r r r < cis'' eis'' > 4.  |
+                    r2 < cis'' eis'' > 4.  |
                     < fis'' e'' > 2 _~ < e'' fis'' > 4.  |
-                    r8 r r r < eis'' cis'' > 4.  |
+                    r2 < eis'' cis'' > 4.  |
 %% 20
                     < e'' fis'' > 2 _~ < fis'' e'' > 4.  |
-                    r8 r r r < gis' cis'' eis'' > 4.  |
+                    r2 < gis' cis'' eis'' > 4.  |
                     < e'' fis'' b' > 2 _~ < e'' fis'' b' > 4.  |
-                    r8 r r r < gis' eis'' cis'' > 4.  |
+                    r2 < gis' eis'' cis'' > 4.  |
                     < c'' e'' fis'' > 2 _~ < fis'' e'' c'' > 4.  |
 %% 25
-                    r8 r r r < eis'' cis'' > 4.  |
+                    r2 < eis'' cis'' > 4.  |
                     < e'' fis'' > 2 _~ < e'' fis'' > 4.  |
-                    r8 r r r < eis'' cis'' > 4.  |
+                    r2 < eis'' cis'' > 4.  |
                     < fis'' e'' > 2 _~ < e'' fis'' > 4.  |
                     r8 fis'' cis'' fis'' a'' gis'' fis''  |
 %% 30
@@ -158,36 +159,36 @@
                     b 8 e gis b gis e  |
 %% 100
                     r8 eis gis b gis eis  |
-                    a 2. -\mp _~  |
+                    a 2. -\mp ^~  |
                     a 4. d'  |
                     cis' 2.  |
                     cis' 4. b  |
 %% 105
-                    a 2. _~  |
+                    a 2. ^~  |
                     a 4. d'  |
                     cis' 2.  |
                     cis' 4. b  |
-                    cis' 2. _~  |
+                    cis' 2. ^~  |
 %% 110
                     cis' 4. d'  |
                     cis' 2.  |
                     cis' 4. b  |
-                    a 2. _~  |
+                    a 2. ^~  |
                     a 4. d'  |
 %% 115
                     e' 2.  |
                     e' 4. d'  |
-                    cis' 2. _~  |
+                    cis' 2. ^~  |
                     cis' 4. d'  |
                     cis' 2.  |
 %% 120
                     cis' 4. b  |
-                    a 2. _~  |
+                    a 2. ^~  |
                     a 4. _\markup { \bold \italic "cresc." } d'  |
-                    cis' 2. _~  |
+                    cis' 2. ^~  |
                     cis' 4. d'  |
 %% 125
-                    cis' 2. _~  |
+                    cis' 2. ^~  |
                     cis' 4. d'  |
                     \clef "treble"
                     a' 2. _\markup { \bold \italic "dim." } _~  |
@@ -371,8 +372,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
@@ -507,68 +507,240 @@
                     e, 2.  |
 %% 100
                     eis, 2.  |
-                    fis, 8 cis fis a fis cis  |
-                    d, 8 a, fis r fis a,  |
-                    e, 8 cis e a e cis  |
+                    fis, 8 cis
+                    \change Staff = "RH"
+                    fis a fis
+                    \change Staff = "LH"
+                    cis  |
+                    d, 8 a,
+                    \change Staff = "RH"
+                    fis r fis
+                    \change Staff = "LH"
+                    a,  |
+                    e, 8 cis e
+                    \change Staff = "RH"
+                    a
+                    \change Staff = "LH"
+                    e cis  |
                     eis, 8 cis eis r eis cis  |
 %% 105
-                    fis, 8 cis fis a fis cis  |
-                    d, 8 a, fis r fis a,  |
-                    e, 8 cis e a e cis  |
+                    fis, 8 cis
+                    \change Staff = "RH"
+                    fis a fis
+                    \change Staff = "LH"
+                    cis  |
+                    d, 8 a,
+                    \change Staff = "RH"
+                    fis r fis
+                    \change Staff = "LH"
+                    a,  |
+                    e, 8 cis e
+                    \change Staff = "RH"
+                    a
+                    \change Staff = "LH"
+                    e cis  |
                     eis, 8 cis eis r eis cis  |
-                    fis, 8 cis fis a fis cis  |
+                    fis, 8 cis
+                    \change Staff = "RH"
+                    fis a fis
+                    \change Staff = "LH"
+                    cis  |
 %% 110
-                    d, 8 a, fis r fis a,  |
-                    e, 8 cis e a e cis  |
+                    d, 8 a,
+                    \change Staff = "RH"
+                    fis r fis
+                    \change Staff = "LH"
+                    a,  |
+                    e, 8 cis e
+                    \change Staff = "RH"
+                    a
+                    \change Staff = "LH"
+                    e cis  |
                     eis, 8 cis eis r eis cis  |
-                    fis, 8 cis fis a fis cis  |
-                    d, 8 a, fis r fis a,  |
+                    fis, 8 cis
+                    \change Staff = "RH"
+                    fis a fis
+                    \change Staff = "LH"
+                    cis  |
+                    d, 8 a,
+                    \change Staff = "RH"
+                    fis r fis
+                    \change Staff = "LH"
+                    a,  |
 %% 115
-                    e, 8 cis e a e cis  |
+                    e, 8 cis e
+                    \change Staff = "RH"
+                    a
+                    \change Staff = "LH"
+                    e cis  |
                     eis, 8 cis eis r eis cis  |
-                    fis, 8 cis fis a fis cis  |
-                    d, 8 a, fis r fis a,  |
-                    e, 8 cis e a e cis  |
+                    fis, 8 cis
+                    \change Staff = "RH"
+                    fis a fis
+                    \change Staff = "LH"
+                    cis  |
+                    d, 8 a,
+                    \change Staff = "RH"
+                    fis r fis
+                    \change Staff = "LH"
+                    a,  |
+                    e, 8 cis e
+                    \change Staff = "RH"
+                    a
+                    \change Staff = "LH"
+                    e cis  |
 %% 120
                     eis, 8 cis eis r eis cis  |
-                    fis, 8 cis fis a fis cis  |
-                    d, 8 cis fis r fis cis  |
-                    dis, 8 cis fis a fis cis  |
-                    e, 8 cis fis s fis cis  |
+                    fis, 8 cis
+                    \change Staff = "RH"
+                    fis a fis
+                    \change Staff = "LH"
+                    cis  |
+                    d, 8 cis
+                    \change Staff = "RH"
+                    fis r fis
+                    \change Staff = "LH"
+                    cis  |
+                    dis, 8 cis
+                    \change Staff = "RH"
+                    fis a fis
+                    \change Staff = "LH"
+                    cis  |
+                    e, 8 cis
+                    \change Staff = "RH"
+                    fis s fis
+                    \change Staff = "LH"
+                    cis  |
 %% 125
-                    fis, 8 cis fis a fis cis  |
-                    d, 8 cis fis r fis cis  |
-                    dis, 8 cis fis a fis cis  |
+                    fis, 8 cis
+                    \change Staff = "RH"
+                    fis a fis
+                    \change Staff = "LH"
+                    cis  |
+                    d, 8 cis
+                    \change Staff = "RH"
+                    fis r fis
+                    \change Staff = "LH"
+                    cis  |
+                    dis, 8 cis
+                    \change Staff = "RH"
+                    fis a fis
+                    \change Staff = "LH"
+                    cis  |
                     e, 8 cis fis r fis cis  |
-                    fis, 8 cis fis a fis cis  |
+                    fis, 8 cis
+                    \change Staff = "RH"
+                    fis a fis
+                    \change Staff = "LH"
+                    cis  |
 %% 130
                     d, 8 cis fis s fis cis  |
-                    dis, 8 cis fis a fis cis  |
-                    e, 8 cis fis s fis cis  |
-                    fis, 8 cis fis a fis cis  |
+                    dis, 8 cis
+                    \change Staff = "RH"
+                    fis a fis
+                    \change Staff = "LH"
+                    cis  |
+                    e, 8 cis
+                    \change Staff = "RH"
+                    fis s fis
+                    \change Staff = "LH"
+                    cis  |
+                    fis, 8 cis
+                    \change Staff = "RH"
+                    fis a fis
+                    \change Staff = "LH"
+                    cis  |
                     d, 8 cis fis s fis cis  |
 %% 135
-                    dis, 8 cis fis a fis cis  |
-                    e, 8 cis fis s fis cis  |
-                    fis, 8 cis fis a fis cis  |
-                    d, 8 cis fis a fis cis  |
-                    e, 8 cis e gis e cis  |
+                    dis, 8 cis
+                    \change Staff = "RH"
+                    fis a fis
+                    \change Staff = "LH"
+                    cis  |
+                    e, 8 cis
+                    \change Staff = "RH"
+                    fis s fis
+                    \change Staff = "LH"
+                    cis  |
+                    fis, 8 cis fis
+                    \change Staff = "RH"
+                    a
+                    \change Staff = "LH"
+                    fis cis  |
+                    d, 8 cis fis
+                    \change Staff = "RH"
+                    a
+                    \change Staff = "LH"
+                    fis cis  |
+                    e, 8 cis e
+                    \change Staff = "RH"
+                    gis
+                    \change Staff = "LH"
+                    e cis  |
 %% 140
-                    eis, 8 cis eis b eis cis  |
-                    fis, 8 cis fis a fis cis  |
-                    d, 8 cis fis a fis cis  |
-                    e, 8 cis e gis e cis  |
-                    eis, 8 cis eis b eis cis  |
+                    eis, 8 cis eis
+                    \change Staff = "RH"
+                    b
+                    \change Staff = "LH"
+                    eis cis  |
+                    fis, 8 cis fis
+                    \change Staff = "RH"
+                    a
+                    \change Staff = "LH"
+                    fis cis  |
+                    d, 8 cis fis
+                    \change Staff = "RH"
+                    a
+                    \change Staff = "LH"
+                    fis cis  |
+                    e, 8 cis e
+                    \change Staff = "RH"
+                    gis
+                    \change Staff = "LH"
+                    e cis  |
+                    eis, 8 cis eis
+                    \change Staff = "RH"
+                    b
+                    \change Staff = "LH"
+                    eis cis  |
 %% 145
-                    fis, 8 cis fis a fis cis  |
-                    d, 8 cis fis a fis cis  |
-                    e, 8 cis e gis e cis  |
-                    eis, 8 cis eis b eis cis  |
-                    fis, 8 cis fis a fis cis  |
+                    fis, 8 cis fis
+                    \change Staff = "RH"
+                    a
+                    \change Staff = "LH"
+                    fis cis  |
+                    d, 8 cis fis
+                    \change Staff = "RH"
+                    a
+                    \change Staff = "LH"
+                    fis cis  |
+                    e, 8 cis e
+                    \change Staff = "RH"
+                    gis
+                    \change Staff = "LH"
+                    e cis  |
+                    eis, 8 cis eis
+                    \change Staff = "RH"
+                    b
+                    \change Staff = "LH"
+                    eis cis  |
+                    fis, 8 cis
+                    \change Staff = "RH"
+                    fis a
+                    \change Staff = "LH"
+                    fis cis  |
 %% 150
-                    d, 8 cis fis a fis cis  |
+                    d, 8 cis fis
+                    \change Staff = "RH"
+                    a
+                    \change Staff = "LH"
+                    fis cis  |
                     e, 8 cis e b e cis  |
-                    eis, 8 cis eis b eis cis  |
+                    eis, 8 cis eis
+                    \change Staff = "RH"
+                    b
+                    \change Staff = "LH"
+                    eis cis  |
                     fis, 8 cis fis 4 fis 8 cis  |
                     e, 8 cis e 4 e 8 cis  |
 %% 155
@@ -700,7 +872,7 @@
     >> % notes
 
     \layout {
-        \context { \GrandStaff \accepts "Lyrics" }
+        \context { \PianoStaff \accepts "Lyrics" }
     }
 %     uncomment to enable generating midi file from the lilypond source
 %         \midi {
