release: 0.0.76

[lilypond.git] / input / collisions.ly

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