Merge commit 'origin/dev/jneeman' into systems-per-page

[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 0a02d35da3d2ca66146cc2653ce72e46d5d09591..268f413972ac49d9bb4bbb488517038cd045318b 100644 (file)
--- a/input/mutopia/E.Satie/petite-ouverture-a-danser.ly
+++ b/input/mutopia/E.Satie/petite-ouverture-a-danser.ly
@@ -1,15 +1,13 @@
 \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.4.0"
-
-\include "nederlands.ly"
+\version "2.12.0"
 
 global =  {
   \key a \minor
@@ -32,8 +30,7 @@ global =  {
   \bar "|."
 }
   
-i = \context Staff \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 \relative c''{
   
 }
 
-ii = \context Staff \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 \relative c'{
  
 }
 
-lower = \context Staff  \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'> |
@@ -126,31 +121,19 @@ lower = \context Staff  \relative c{
 
 }
 
-%% FIXME: this triggers:
-%%
-%%input/mutopia/E.Satie/petite-ouverture-a-danser.ly:148:9: fout: syntax error, unexpected PAPER:
-%%    \pape
-%%         r { }
-%%\new Score \with {
-%%    \override SpacingSpanner #'spacing-increment = #3
-%%} {
-
-
 \score {
     \context PianoStaff <<
-       \context Staff = "treble" << 
+       \new Staff = "treble" << 
            \global 
            \clef violin
            \i
            \ii
        >>
-       \context Staff = "bass" <<
+       \new Staff = "bass" <<
            \global
            \clef bass
            \lower
        >>
-       #(override-auto-beam-setting '(end 1 8 * *)  1 4)
-       #(override-auto-beam-setting '(end 1 16 * *)  1 4)
     >>
     \layout {
        \context {
@@ -158,9 +141,17 @@ lower = \context Staff  \relative c{
            \override SpacingSpanner #'spacing-increment = #3
        }
     }
-    \midi {
-       \tempo 4 = 60
+    
+  \midi {
+    \context {
+      \Score
+      tempoWholesPerMinute = #(ly:make-moment 60 4)
+      }
     }
-}
 
 
+}
+
+%% Local Variables:
+%% coding: utf-8
+%% End: