release: 1.1.50

[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 fc2f0b7a1ed512a2720335e8f882179f2c0ad39e..e1bd1a22e7c1389dc771cc3ad40fbd74bd386f12 100644 (file)
--- a/mutopia/E.Satie/gnossienne-4.ly
+++ b/mutopia/E.Satie/gnossienne-4.ly
@@ -9,10 +9,10 @@
 }
 
 %{
- Tested Features: cross staff beams and slurs, grace notes, no bars
+ Tested Features: cross staff auto beams and slurs, grace notes, no bars
 %}
 
-\version "1.0.21";
+\version "1.0.20";
 
 \include "nederlands.ly"
 
@@ -24,101 +24,112 @@ global = \notes {
   \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
   r2 r r 
   r2 r r
-  r4 [a'8--(\< a--] [a-- a-- c-- \!b--] [a--\> gis f \!e]
+  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
+  < { es8 )c } \context Voice=x { \stemup s8*1/2 \tiny b8*1/2 ~ } > 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] 
-  )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
-  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
+  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
+  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
   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
-  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
+  \tiny b'8(*1/2 \normalsize 
+  < { )a8*1/2 a8 } \context Voice=x { \stemup s8*1/4 \tiny b8*1/2 ~ } > 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
   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
-  [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
+  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
+  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
   r2 r r
   fis,4( \tiny dis8*1/2 \normalsize <)cis4*3/4 ais> r2 r
   <e1 g b e> ~ <e g b e>
 }
 
 basloopje = \notes\relative c{
-  d,8( a' d f a d f d a f d )a
+%      \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
 
   % snapnie, hoevaak relative c heeft ze nodig?
-  < \notes\relative c \basloopje \bassbeam >
-  < \notes\relative c \basloopje \bassbeam >
-  < \notes\relative c \basloopje \bassbeam >
-  < \transpose bes \notes\relative c{ \basloopje } \bassbeam >
-  < \transpose bes \notes\relative c{ \basloopje } \bassbeam >
-  < \notes\relative c \basloopje \bassbeam >
-  < \transpose bes \notes\relative c{ \basloopje } \bassbeam >
-  < \transpose bes \notes\relative c{ \basloopje } \bassbeam >
-  < \transpose a \notes\relative c{ \basloopje } \bassbeam >
-  < \transpose bes \notes\relative c{ \basloopje } \bassbeam >
-  < \transpose a \notes\relative c{ \basloopje } \bassbeam >
-  < \notes\relative c \basloopje \bassbeam >
-  < \notes\relative c \basloopje \bassbeam >
+  \notes\relative c \basloopje
+  \notes\relative c \basloopje
+  \notes\relative c \basloopje
+  \transpose bes \notes\relative c{ \basloopje }
+  \transpose bes \notes\relative c{ \basloopje }
+  \notes\relative c \basloopje
+  \transpose bes \notes\relative c{ \basloopje }
+  \transpose bes \notes\relative c{ \basloopje }
+  \transpose a \notes\relative c{ \basloopje }
+  \transpose bes \notes\relative c{ \basloopje }
+  \transpose a \notes\relative c{ \basloopje }
+  \notes\relative c \basloopje
+  \notes\relative c \basloopje
   % huh? d'
-  < \transpose d' \notes\relative c{ \basloopje } \bassbeam >
-  < \notes\relative c \basloopje \bassbeam >
-  < \notes\relative c \basloopje \bassbeam >
-  < \transpose d' \notes\relative c{ \basloopje } \bassbeam >
-  < \notes\relative c \basloopje \bassbeam >
-  < \notes\relative c \basloopje \bassbeam >
-  < \transpose e' \notes\relative c{ \basloopje } \bassbeam >
-  < \notes\relative c \basloopje \bassbeam >
-  < \notes\relative c \basloopje \bassbeam >
-  < \transpose bes \notes\relative c{ \basloopje } \bassbeam >
-  < \transpose a \notes\relative c{ \basloopje } \bassbeam >
-  < \notes\relative c \basloopje \bassbeam >
-  < \notes\relative c \basloopje \bassbeam >
-  < \transpose d' \notes\relative c{ \basloopje } \bassbeam >
-  < \notes\relative c \basloopje \bassbeam >
-  < \transpose d' \notes\relative c{ \basloopje } \bassbeam >
-  < \notes\relative c \basloopje \bassbeam >
-  < \notes\relative c \basloopje \bassbeam >
-  < \transpose e' \notes\relative c{ \basloopje } \bassbeam >
+  \transpose d' \notes\relative c{ \basloopje }
+  \notes\relative c \basloopje
+  \notes\relative c \basloopje
+  \transpose d' \notes\relative c{ \basloopje }
+  \notes\relative c \basloopje
+  \notes\relative c \basloopje
+  \transpose e' \notes\relative c{ \basloopje }
+  \notes\relative c \basloopje
+  \notes\relative c \basloopje
+  \transpose bes \notes\relative c{ \basloopje }
+  \transpose a \notes\relative c{ \basloopje }
+  \notes\relative c \basloopje
+  \notes\relative c \basloopje
+  \transpose d' \notes\relative c{ \basloopje }
+  \notes\relative c \basloopje
+  \transpose d' \notes\relative c{ \basloopje }
+  \notes\relative c \basloopje
+  \notes\relative c \basloopje
+  \transpose e' \notes\relative c{ \basloopje }
   < e1 b' e> ~ < e b' e> 
 }
 
 \score {
-    \context GrandStaff < 
+    \context PianoStaff < 
       \context Staff = treble < 
         \global 
        \upper
@@ -138,11 +149,9 @@ lower = \context Voice=two \notes \relative c{
     % no slur damping
     slur_slope_damping = 100.0;
 
-    \translator{ \OrchestralScoreContext }
-    \translator{ 
-      \GrandStaffContext
-      minVerticalAlign = 3.0*\staffheight;
-      maxVerticalAlign = 3.0*\staffheight;
+    \translator{
+      \VoiceContext
+      beamAutoEnd = "1/2";
     }
     \translator{ 
       \StaffContext