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 92dae8b65cbd87809519939ea593c47d2dd8668e..2981559188276a24cc74900dd15c49754589ccfe 100644 (file)
--- a/input/mutopia/E.Satie/petite-ouverture-a-danser.ly
+++ b/input/mutopia/E.Satie/petite-ouverture-a-danser.ly
@@ -1,22 +1,15 @@
 \header {
-  filename =    "petite-ouverture-a-danser.ly"
-  title =       "Petite Ouverture \\`a 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"
 }
 
-%{
- Tested Features:
-%}
+\version "2.7.39"
 
-\version "1.5.68"
-
-\include "nederlands.ly"
-
-global =  \notes {
+global =  {
   \key a \minor
   \time 2/4
   s2*10
@@ -37,36 +30,34 @@ 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 |
-  c4( f,8. as16 | bes4 ~ )bes8 r | f8.( es16 f4 | es )f |
-  g8.( es16 f4 ~ | )f f8 r
+  c8.( es16 bes4 ~ |  bes8) r c8.( bes16 | des4 c8. bes16 | c4 ~  c8) r |
+  c4( f,8. as16 | bes4 ~  bes8) r | f8.( es16 f4 | es  f) |
+  g8.( es16 f4 ~ |  f) f8 r
 
   % Au mouvement
-  f4 ( g | a2 ~ | )a | a4-- a-> ~ | a8 r b!8.( a16 | )b4 c-- ~ |
-  c8 r b8.( d16 | a4 ~ )a8 r | d4( cis | c! b8. d16 | a4 ~ )a8 r
+  f4 ( g | a2 ~ |  a) | a4-- a-> ~ | a8 r b!8.( a16 |  b4) c-- ~ |
+  c8 r b8.( d16 | a4 ~  a8) r | d4( cis | c! b8. d16 | a4 ~  a8) r
 
-  a8.( g16 a4 ~ ) a8 r |
+  a8.( g16 a4 ~  a8) r |
 
-  a4-> ~ a8 r | g8.( a16 )fis4 | e8.( d16 e4 | fis ~ ) fis8 r
+  a4-> ~ a8 r | g8.( a16  fis4) | e8.( d16 e4 | fis ~  fis8) r
 
-  d4( d-- ~ )d8 r e4( f!2 ~ |
+  d4( d-- ~  d8) r e4( f!2 ~ |
 
-  f4 ~ )f8 r | es4( g | as bes ~ | )bes c( | )b!2 | c4( d | )bes2 | c4~ c8 r |
+  f4 ~  f8) r | es4( g | as bes ~ |  bes) c( |  b!2) | c4( d |  bes2) | c4~ c8 r |
   
   % copy from begin: 1-10
-  c8.( es16 bes4 ~ | )bes8 r c8.( bes16 | des4 c8. bes16 | c4 ~ ) c8 r |
-  c4( f,8. as16 | bes4 ~ )bes8 r | f8.( es16 f4 | es )f |
-%  g8.( es16 f4 ~ | )f f8 r ?
-  g8.( es16 f4 ~ | )f ~ f8 r
+  c8.( es16 bes4 ~ |  bes8) r c8.( bes16 | des4 c8. bes16 | c4 ~  c8) r |
+  c4( f,8. as16 | bes4 ~  bes8) r | f8.( es16 f4 | es  f) |
+%  g8.( es16 f4 ~ |  f) f8 r ?
+  g8.( es16 f4 ~ |  f) ~ f8 r
   
 }
 
-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> |
@@ -85,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> |
@@ -103,10 +94,9 @@ ii =  \context Staff \notes\relative c'{
  
 }
 
-lower =  \context Staff \notes \relative c{
-  \context Voice=iii
+lower = \context Staff  \relative c \new Voice{
 
-  <as4 as'> <es es'> | r <as as'> | <des, des'> <f f'> | <c c'> r |
+  <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'> |
   <g g'> <f f'> | <c' c'> <bes bes'> | <f f'> r |
 
@@ -125,37 +115,37 @@ lower =  \context Staff \notes \relative c{
   <e! e'!> <b! b'!> | <a a'> <d d'> | <es es> r | <c c'> r
   
   % copy from begin: 1-10
-  <as'4 as'> <es es'> | r <as as'> | <des, des'> <f f'> | <c c'> r |
+  <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'> |
   <g g'> <f f'> | <c' c'> <bes bes'> | <f f'> r |
 
 }
 
 \score {
-    \context GrandStaff <
-      \context Staff = treble < 
-        \global 
-        \clef violin
-       \i
-       \ii
-      >
-      \context Staff = bass <
-        \global
-       \clef bass
-        \lower
-      >
-    >
-
-  \paper {
-    \translator{
-           \VoiceContext
-           Slur \override #'attachment = #'(stem . stem)
-           autoBeamSettings \override #'(end 1 8 * *) = #(make-moment 1 4)
-           autoBeamSettings \override #'(end 1 16 * *) = #(make-moment 1 4)
+    \context PianoStaff <<
+       \new Staff = "treble" << 
+           \global 
+           \clef violin
+           \i
+           \ii
+       >>
+       \new Staff = "bass" <<
+           \global
+           \clef bass
+           \lower
+       >>
+    >>
+    \layout {
+       \context {
+           \Score
+           \override SpacingSpanner #'spacing-increment = #3
+       }
+    }
+    \midi {
+       \tempo 4 = 60
     }
-  }
-  \midi {
-    \tempo 4 = 60
-  }
 }
 
+%% Local Variables:
+%% coding: utf-8
+%% End: