release: 1.3.44

[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 ca23359ef7d9f4b20b59534844598920b03b924f..71fb470337a56a0502ae2d1151c496b7088bcdfb 100644 (file)
--- a/mutopia/E.Satie/gnossienne-4.ly
+++ b/mutopia/E.Satie/gnossienne-4.ly
@@ -2,7 +2,6 @@
   filename =    "gnossienne-4.ly";
   title =       "Gnossienne";
   subtitle =   "4";
-  source =      "";
   composer =    "Erik Satie (1866-1925)";
   enteredby =   "jcn";
   copyright =   "Public Domain";
@@ -12,20 +11,19 @@
  Tested Features: cross staff auto beams and slurs, grace notes, no bars
 %}
 
-\version "1.1.52";
-
-\include "nederlands.ly"
+\version "1.3.42";
 
 global = \notes {
-  \key a \minor;
-  \time 6/4;
-  \skip 1.*34;
-  \bar ".|";
+       \key a \minor;
+       \time 6/4;
+       \skip 1.*34;
+       \bar "|.";
 }
-  
+
 melody = \notes\relative c''{
   \clef violin;
-  \property Voice.verticalDirection = 1
+  \property Voice.verticalDirection = #1
+  \property Voice.graceFraction = #(make-moment 1 4)
   r2 r r 
   r2 r r
   r4 a'8--(\< a--  a-- a-- c-- \!b-- a--\> gis f \!e 
@@ -56,11 +54,10 @@ melody = \notes\relative c''{
   a,2( \grace e'8() f4 ~ )f8 r r2
   r2 r r
   fis,4( \grace dis8<)cis4 ais> r2 r
-  <e1 g b e> ~ <e g b e>
+  <e1*6/4 g b e> ~ <e g b e>
 }
 
 basloopje = \notes\relative c{
-%  d,8( a' d f a \translator Staff=treble d f d \translator Staff=bass a f d )a
   d,8( a' d f a d f d a f d )a
 }
 
@@ -99,73 +96,48 @@ accompany = \notes \relative c{
   \notes\relative c \basloopje
   \notes\relative c \basloopje
   \transpose e' \notes\relative c{ \basloopje }
-  < e1 b' e> ~ < e b' e> 
+  < e1*6/4 b' e> ~ < e b' e> 
 }
 
-
 \score{
-  \notes{
-    \context AutoSwitchGrandStaff \relative c <
-      \global
-      \context Staff=upper { 
-        \context Voice=foo
-        \property Voice.verticalDirection = 1
-        \property Voice.scriptVerticalDirection = 1
-        \melody 
-       }
-      \context AutoSwitchContext \accompany
-      >
-  }
-  \paper {
-    gourlay_maxmeasures = 4.;
-    indent = 8.\mm;
-    textheight = 295.\mm;
+       \notes \context PianoStaff <
+               \context Staff=up < 
+                       \global
+                       \context Voice=foo {
+                       \property Voice.verticalDirection = #1
+                       \property Voice.scriptVerticalDirection = #1
+                       \melody 
+                       }
+               >
+               \context Staff=down <
+                       \global
+                       \clef bass;
+                       \autochange Staff \accompany
+               >
+       >
 
-    % no slur damping
-    slur_slope_damping = 100.0;
+       \paper {
+               gourlay_maxmeasures = 4.;
+               indent = 8.\mm;
+               textheight = 295.\mm;
 
-    \translator{ 
-      \StaffContext
-      % don't auto-generate bars: not a good idea: -> no breakpoints
-      % barAuto = "0";
-      % urg defaultBarType = "";
-      defaultBarType = "empty";
-      \remove "Time_signature_engraver";
-    }
-    \translator{ 
-      \GraceContext
-      \remove "Local_key_engraver";
-    }
-    \translator { 
-      \ScoreContext
-      \accepts AutoSwitchGrandStaff;
-      }
-    \translator{
-      \type "Engraver_group_engraver";
-      \name AutoSwitchGrandStaff;
-      \consists "Span_bar_engraver";
-      \consists "Vertical_align_engraver";
-      \consists "Piano_bar_engraver";
-      \consistsend "Axis_group_engraver";
-      minVerticalAlign = 2.*\staffheight;
-      maxVerticalAlign = 2.*\staffheight;      
-      switcherName = "Voice";
-      acceptorName = "Thread";
-      staffContextName = "Staff";
+               % ugly is beautiful
+               slur_beautiful = 5.0;
 
-      \accepts "AutoSwitchContext";
-      \accepts "Staff";
-      slurVerticalDirection = 1;
-      verticalDirection = -1;
-      beamAutoEnd = "1/2";
-      }
-    \translator {
-      \type "Engraver_group_engraver";
-      \name "AutoSwitchContext";
-      \consists "Staff_switching_translator";
-      }
-    }
-  \midi {
-    \tempo 4 = 54;
-  }
+               \translator{ 
+                       \StaffContext
+                       % don't auto-generate bars: not a good idea: -> no breakpoints
+                       % barAuto = #f
+                       defaultBarType = #""
+                       \remove "Time_signature_engraver";
+
+                       slurVerticalDirection = #1
+                       verticalDirection = #-1
+                       beamAutoEnd = #(make-moment 1 2)
+               }
+       }
+       \midi {
+               \tempo 4 = 54;
+       }
 }
+