Fix some bugs in the dynamic engraver and PostScript backend

[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 616c74de86e4a1f3302370e6bd0556ad2bcb39a9..2981559188276a24cc74900dd15c49754589ccfe 100644 (file)
--- a/input/mutopia/E.Satie/petite-ouverture-a-danser.ly
+++ b/input/mutopia/E.Satie/petite-ouverture-a-danser.ly
@@ -1,18 +1,15 @@
-#(ly:set-option 'old-relative)
 \header {
-  title =       "Petite Ouverture à danser"
-  subtitle =   "4"
-  source =      ""
-  composer =    "Erik Satie (1866-1925)"
-  enteredby =   "jcn"
-  copyright =   "Public Domain"
+  title = "Petite Ouverture à danser"
+  subtitle = "4"
+  source = ""
+  composer = "Erik Satie (1866-1925)"
+  enteredby = "jcn"
+  copyright = "Public Domain"
 }
 
-\version "1.9.8"
+\version "2.7.39"
 
-\include "nederlands.ly"
-
-global =  \notes {
+global =  {
   \key a \minor
   \time 2/4
   s2*10
@@ -33,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 |
@@ -61,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> |
@@ -81,9 +76,9 @@ ii =  \context Staff \notes\relative c'{
   r <cis e> r <cis e> | r <b d> r <a d> | r <g b> r <a cis> |
   r <a cis> r <a cis> |
 
-  \translator Staff=bass\voiceOne
+  \change Staff=bass\voiceOne
   r <g b> r <fis a> r <fis a> | r <g bes>
-  \translator Staff=treble\voiceTwo
+  \change Staff=treble\voiceTwo
   r <a c> r <a d> |
 
   r <bes d> r <bes d> | r <g c> r <bes d> | r <c es> r <d g> |
@@ -99,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'> |
@@ -128,31 +122,30 @@ 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
     }
-  }
-  \midi {
-    \tempo 4 = 60
-  }
 }
 
-
+%% Local Variables:
+%% coding: utf-8
+%% End: