Merge master into nested-bookparts

[lilypond.git] / input / mutopia / E.Satie / petite-ouverture-a-danser.ly

diff --git a/input/mutopia/E.Satie/petite-ouverture-a-danser.ly b/input/mutopia/E.Satie/petite-ouverture-a-danser.ly
index f032de77beccc81a9ea268869bcc661ab1ab317f..6d0047e469c53e60da35cf74a8e5b3aaf11b645f 100644 (file)
--- a/input/mutopia/E.Satie/petite-ouverture-a-danser.ly
+++ b/input/mutopia/E.Satie/petite-ouverture-a-danser.ly
@@ -1,17 +1,15 @@
 \header {
-  title = "Petite Ouverture à danser"
-  subtitle =   "4"
+  title = "Petite Ouverture à danser"
+  subtitle = "4"
   source = ""
   composer = "Erik Satie (1866-1925)"
   enteredby = "jcn"
   copyright = "Public Domain"
 }
 
-\version "2.1.22"
+\version "2.11.61"
 
-\include "nederlands.ly"
-
-global = \notes {
+global =  {
   \key a \minor
   \time 2/4
   s2*10
@@ -32,8 +30,7 @@ global = \notes {
   \bar "|."
 }
   
-i = \context Staff \notes\relative c''{
-  \context Voice=i
+i = \context Staff \relative c''\new Voice {
   \voiceOne
 
   c8.( es16 bes4 ~ |  bes8) r c8.( bes16 | des4 c8. bes16 | c4 ~  c8) r |
@@ -60,8 +57,7 @@ i = \context Staff \notes\relative c''{
   
 }
 
-ii = \context Staff \notes\relative c'{
-  \context Voice=ii
+ii = \context Staff \relative c'\new Voice{
   \voiceTwo
 
   r8 <es as> r <des f> | r <es g> r <es as> | r <f as> r <f as> |
@@ -98,8 +94,7 @@ ii = \context Staff \notes\relative c'{
  
 }
 
-lower = \context Staff \notes \relative c{
-  \context Voice=iii
+lower = \context Staff  \relative c \new Voice{
 
   <as as'>4 <es es'> | r <as as'> | <des, des'> <f f'> | <c c'> r |
   <as as'> <des des'> | <bes bes'> r | <des des'> <bes bes'> |
@@ -127,31 +122,36 @@ lower = \context Staff \notes \relative c{
 }
 
 \score {
-    \context GrandStaff <<
-      \context Staff = treble << 
-        \global 
-        \clef violin
-       \i
-       \ii
-      >>
-      \context Staff = bass <<
-        \global
-       \clef bass
-        \lower
-      >>
+    \context PianoStaff <<
+       \new Staff = "treble" << 
+           \global 
+           \clef violin
+           \i
+           \ii
+       >>
+       \new Staff = "bass" <<
+           \global
+           \clef bass
+           \lower
+       >>
     >>
-
-  \paper {
-    \translator{
-           \VoiceContext
-           Slur \override #'attachment = #'(stem . stem)
-           autoBeamSettings \override #'(end 1 8 * *) = #(ly:make-moment 1 4)
-           autoBeamSettings \override #'(end 1 16 * *) = #(ly:make-moment 1 4)
+    \layout {
+       \context {
+           \Score
+           \override SpacingSpanner #'spacing-increment = #3
+       }
     }
-  }
+    
   \midi {
-    \tempo 4 = 60
-  }
-}
+    \context {
+      \Score
+      tempoWholesPerMinute = #(ly:make-moment 60 4)
+      }
+    }
+
 
+}
 
+%% Local Variables:
+%% coding: utf-8
+%% End: