''

[lilypond.git] / input / tutorial / sammartini.ly

diff --git a/input/tutorial/sammartini.ly b/input/tutorial/sammartini.ly
index d9f648fa17e6adb1d633228e141053eca8b953fe..18b884eaacf208f3d7a4efab357d1ae538e4e258 100644 (file)
--- a/input/tutorial/sammartini.ly
+++ b/input/tutorial/sammartini.ly
@@ -1,55 +1,62 @@
 
 \include "paper16.ly"
-
-stemDown = \property Voice.Stem \override #'direction = #-1
-stemUp = \property Voice.Stem \override #'direction = #1
-stemBoth = \property Voice.Stem \revert #'direction  
-
-viola = \notes \relative c' \context Voice = viola {
+ 
+viola = \notes \relative c'  \context Voice = viola {
     <c4-\f-\arpeggio g' c>
-    \stemDown g'8. b,16
+    \stemDown
+    g'8. b,16
     s1 s2. r4
     g
 }
 
-oboes = \notes \relative c'' \context Voice = oboe {
-    \stemUp s4  g8. b,16 c8 r <e'8.^\p g> <f16 a>
+oboes = \notes \relative c'' \context Voice = oboes {
+    \stemUp
+    s4  g8. b,16 c8 r <e'8.^\p g> <f16 a>
     \grace <e8( g> <d4 f> <c2 e>
     \times 2/3 { <d8 \< f> <e g> <f a> }
     <
-        { \times 2/3 { a8 g c } \! c2 }
-        \context Voice = oboeTwo {
-            \stemDown
+        { \stemUp \times 2/3 { a8 g c } \! c2 }
+        \context Voice = second { \stemDown
             \grace {
                 \stemDown
-                [f,16 g] }
+                [f,16 g]
+               \stemBoth }
                 f8 e e2
             }
     >
-    \stemBoth
+
     \grace <c,8( e> <)b8. d8.-\trill> <c16 e> | 
     [<d ( f> < )f8. a>] <)b,8 d> r [<d16( f> <f8. )a>] <b,8 d> r  |
     [<c16( e>  < )e8. g>] <c8 e,>
 }
 
 hoomPah = \repeat unfold 8 \notes
-    \transpose c' { c8 \stemDown g'8 \stemUp }
+    \transpose c' {
+       \translator Staff = down
+       \stemUp
+       c8
+       \translator Staff = up
+       \stemDown
+       c'8 }
 
 bassvoices = \notes \relative c' {
     c4 g8. b,16
     \autochange Staff \context Voice \hoomPah
+    
     \translator Staff = down
-    \stemDown [c8 c'8] r4
+    \stemBoth 
+    
+    [c8 c'8] r4
     <g d'> r4
-    < {\stemUp r2 <e4 c'> <c8 g'> }
-        \context Voice = reallyLow  {\stemDown g2 ~ | g4 c8 } >
+    < { r2 <e4 c'> <c8 g'> } \\
+      { g2 ~ | g4 c8 } >
 }
 
 \score {
     \context PianoStaff \notes <
-        \context Staff = up < \time 2/2
-             \viola
+        \context Staff = up < 
              \oboes
+             \viola
          >
          \context Staff = down < \time 2/2 \clef bass
              \bassvoices