release: 0.1.13

[lilypond.git] / input / collisions.ly

diff --git a/input/collisions.ly b/input/collisions.ly
index a202789ca4c1c134e254ac097e82e4129aab70de..c65800b9618393b1e4dee2395ae401e5e8908c1c 100644 (file)
--- a/input/collisions.ly
+++ b/input/collisions.ly
@@ -1,55 +1,91 @@
-% test the Collision resolution 
-\version "0.0.56";
+%{MudelaHeader
 
-two_voice_steminvert = \melodic { 
-       < \multivoice 
-         {     \octave c'; \stem 1;
-               c d e f() g2 g a }
-         { \stem -1;
-               g f e g ()g2 g2 } 
+ filename: collisions.ly
+ title:
+ description:  random counterpoint to test collisions
+ composer(s): 
+ entered-by: HWN,JCN
+ copyright: public domain
+
+ Tested Features:test the Collision resolution 
+EndMudelaHeader
+%}
+\version "0.1.5";
+
+
+
+two_voice = \melodic 
+       < \multi 2; 
+         { \stemdown \octave c'; 
+               c4 d e f g2~  g4 a [c8 d e f] c2| }
+         { \stemup
+               g4 f e g ~ g2 g2  c4 g4 g2 } 
 
        >
-}      
 
-two_voice = \melodic { 
-       < \multivoice 
-         {     \octave c'; \stem -1;
-               c d e f g2() g a }
-         { \stem 1;
-               g f e g ()g2 g2 } 
+two_voice_steminvert = \melodic 
+       < \multi 2;  
+         { 
+               \octave c'; \stemup
+% the f and g on 4th beat are exceptionally ugh.
+               c4 d e f g2 g4 a | }
+         { \stemdown
+               g4 f e g  g2 g2 } 
 
        >
-}      
 
-three_voice = \melodic {
-       < \multivoice
-       { \stem 1; 
-               g f e f g a g2 }
-       { \hshift 1; \stem 1; 
+three_voice = \melodic 
+       < \multi 2;
+       { \stemup 
+               g4 f e f g a g2 }
+       { \stemup \property Voice.hshift = 1 
                e2  e2  e2  e2 }
-       { \stem -1;
-               c d e d c d es }
+       { \stemdown
+               c4 d e d c d es }
        >
-}
 
-rests = \melodic  {
-       < \multivoice
-       { \stem 1;\duration "last";
-               r8 r r r  r r r r 
+
+rests = \melodic  
+       < \multi 2;
+       { \stemup
+               | r8 r r r  r r r r 
                [c' b a g] [f e d c]
        } 
-       { \stem -1;
+       { \stemdown
                [c8 d e f] [g a b c']
-               r r r r r r r r r 
+               r r r r r r r r 
        }
        >
+
+restsII = \melodic {
+       \octave c'; 
+                       < \multi2;  
+                               { \stemup  g' f' e' d' c' b a g f e d c }
+                               { \stemdown r  r  r  r  r  r r r r r r r }
+                       >
+                       < \multi2;  
+                               { \stemup  r r r r r r r r  r  r  r  r }
+                               { \stemdown c d e f g a b c' d' e' f' g' }
+                       >
+                       r8 r4
+                       < \multi2;  r8 r8 >
+                       < \multi2;  r8 r8 r8 >
+                       < \multi2;  r8 r8 r8 r8 >
+                       < \multi2;  r r >
+                       < \multi2;  r r r >
+                       \stemup
+                       [c''8 r8 c''8 c''8]
+                       [c8 r8 c8 c8]
+                       \stemdown
+                       [c8 r8 c8 c8]
+                       [c''8 r8 c''8 c''8]
 }
+
 \score{
-       \staff{ melodicregs 
-               \melodic {  \$two_voice ++  \$two_voice_steminvert 
-                       ++ \$three_voice ++ \rests
-               }
-       }
-       \paper {}
+       {  \two_voice  \two_voice_steminvert 
+                       \three_voice  \rests \restsII }
+       
+
+       
 %      \midi { \tempo 4:80 }
 }