release: 1.1.52

[lilypond.git] / mutopia / E.Satie / gnossienne-4.ly

diff --git a/mutopia/E.Satie/gnossienne-4.ly b/mutopia/E.Satie/gnossienne-4.ly
index e1bd1a22e7c1389dc771cc3ad40fbd74bd386f12..26fbb528fb68c3caea9d39cc8b8179cd90c69dbb 100644 (file)
--- a/mutopia/E.Satie/gnossienne-4.ly
+++ b/mutopia/E.Satie/gnossienne-4.ly
@@ -19,74 +19,51 @@
 global = \notes {
   \key a \minor;
   \time 6/4;
-%  \cadenza 1;
   \skip 1.*34;
   \bar ".|";
 }
   
-x = \context Voice=x \notes {
-  % no beams in grace notes
-  \property Voice.beamAuto = "0"
-}
-
 upper = \context Staff=treble \notes\relative c''{
   \clef violin;
-  \stemup
-  \context Voice=one
+  \property Voice.verticalDirection = 1
   r2 r r 
   r2 r r
-  r4 a'8--(\< a--  a-- a-- c-- \!b--  a--\> gis f \!e 
-  % grace hack
-  < { es8 )c } \context Voice=x { \stemup s8*1/2 \tiny b8*1/2 ~ } > r4 r2 r
+  r4 a'8--(\< a--  a-- a-- c-- \!b-- a--\> gis f \!e 
+  es8 \grace b({ ))c r4 r2 r
   r2 r r
-  r4 a'8--(\< a--  a-- a-- c-- \!b--  a--\> gis f \!e 
-  < { es8 )c } \context Voice=x { \stemup s8*1/2 \tiny b8*1/2 ~ } > r4 r2 r
-  r4 g16( a bes a  g a bes a g a bes a  g a bes a g fis es fis 
-  % urg, what a syntax
-  )d4 \tiny fis8 ( *1/2  \normalsize ) gis4*3/4 ~ gis8 r r4 r2
-  r4 g16( a bes a  g a bes a g a bes a  g a bes a g fis es fis 
-  )d4 \tiny fis8(*1/2 \normalsize )gis4*3/4 ~ gis8 r r4 r2
-  \tiny a8(*1/2  \normalsize )f4*3/4 ~ f8 r r2 r
-  r2 r4 a8( b c d c b \tiny b8(*1/2 \normalsize 
-  < { )e8*1/2 )g,8 } \context Voice=x { \stemup s8*1/4 \tiny a8*1/2 ~ } > r4 r2 r
+  r4 a'8--(\< a--  a-- a-- c-- \!b-- a--\> gis f \!e 
+  es8 } \grace b({ ))c r4 r2 r
+  r4 g16( a bes a  g a bes a g a bes a g a bes a g fis es fis 
+  )d4 } \grace fis8()gis4 ~ gis8 r r4 r2
+  r4 g16( a bes a  g a bes a g a bes a g a bes a g fis es fis 
+  )d4 \grace fis8()gis4 ~ gis8 r r4 r2
+  \grace a8()f4 ~ f8 r r2 r
+  r2 r4 a8( b c d c b \grace b8()e \grace a,())g r4 r2 r
   r2 r4 a8( b c d c b  a b c d c b a b c d c b 
-  \tiny b8(*1/2 \normalsize 
-  < { )e8*1/2 )g,8 } \context Voice=x { \stemup s8*1/4 \tiny a8*1/2 ~ } > r4 r2 r
-  a2( \tiny e'8(*1/2 \normalsize )f4*3/4 ~ )f8 r r2
+  \grace b8()e \grace a,())g r4 r2 r
+  a2( \grace e'8()f4 ~ )f8 r r2
   r2 r r
-  fis,4( \tiny dis8*1/2 \normalsize <)cis4*3/4 ais> r2 r
-  \tiny b'8(*1/2 \normalsize 
-  < { )a8*1/2 a8 } \context Voice=x { \stemup s8*1/4 \tiny b8*1/2 ~ } > r4 r2 r
+  fis,4( \grace dis8<)cis4 ais> r2 r
+  \grace b'8()a \grace b()a r4 r2 r
   r4 a'8--(\< a--  a-- a-- c-- \!b--  a--\> gis f \!e 
-  < { es8 )c } \context Voice=x { \stemup s8*1/2 \tiny b8*1/2 ~ } > r4 r2 r
-  d,4( \tiny fis8(*1/2 \normalsize )gis4*3/4 ~ )gis8 r r4 r2
+  es8 \grace b())c r4 r2 r
+  d,4( \grace fis8()gis4 ~ )gis8 r r4 r2
   f4 ~ f8 r r2 r
   f'8( g a b a g f g a b a g 
-  \tiny f8(*1/2 \normalsize 
-  < { )g8*1/2 )e8 } \context Voice=x { \stemup s8*1/4 \tiny d8*1/2 ~ } > r4 r2 r
+  \grace f8()g \grace d)e r4 r2 r
   f8( g a b a g f g a b a g 
-  \tiny f8(*1/2 \normalsize 
-  < { )g8*1/2 )e8 } \context Voice=x { \stemup s8*1/4 \tiny d8*1/2 ~ } > r4 r2 r
-  a,2( \tiny e'8(*1/2 \normalsize )f4*3/4 ~ )f8 r r2
+  \grace f8()g8 \grace d())e r4 r2 r
+  a,2( \grace e'8() f4 ~ )f8 r r2
   r2 r r
-  fis,4( \tiny dis8*1/2 \normalsize <)cis4*3/4 ais> r2 r
+  fis,4( \grace dis8<)cis4 ais> r2 r
   <e1 g b e> ~ <e g b e>
 }
 
 basloopje = \notes\relative c{
-%      \property Voice.beamAutoEnd = "1/2"
 %  d,8( a' d f a d f d a f d )a
   d,8( a' d f a \translator Staff=treble d f d \translator Staff=bass a f d )a
 }
 
-%{
-bassbeam = \notes{
-  [s2] [s8 \translator Staff=treble s s s] [\translator Staff=bass s2]
-%   [s2] [s2] [s2]
-}
-%}
-
-
 lower = \context Voice=two \notes \relative c{
   \stemdown
   \property Staff.slurVerticalDirection = 1
@@ -162,8 +139,8 @@ lower = \context Voice=two \notes \relative c{
       \remove "Time_signature_engraver";
     }
   }
-  \midi {
-    \tempo 4 = 54;
-  }
+% broken 1.1.51.hwn2
+%  \midi {
+%    \tempo 4 = 54;
+%  }
 }
-