release: 1.3.107

[lilypond.git] / input / test / collisions.ly

diff --git a/input/test/collisions.ly b/input/test/collisions.ly
index 79614c661455c7f0278fe768db9b8f13b7fd9633..e2c3ce45f19590ae5380bc8718b7d4ee9e2a3cb5 100644 (file)
--- a/input/test/collisions.ly
+++ b/input/test/collisions.ly
@@ -5,65 +5,71 @@ enteredby =    "HWN,JCN";
 copyright =     "public domain";
 Tested =        "test the Collision resolution ";
 }
-\version "1.0.14";
+\version "1.3.96";
 
-twovoice = \type Staff \notes < 
-       \type Voice=i { \stemdown c4 d e f g2~  g4 a [c8 d e f] c2| }
-       \type Voice=ii { \stemup g4 f e g ~ g2 g2  c4 g4 g2 } 
+twovoice = \context Staff \notes < 
+       \context Voice=i { \stemDown c4 d e f g2~  g4 a [c8 d e f] c2| }
+       \context Voice=ii { \stemUp g4 f e g ~ g2 g2  c4 g4 g2 } 
 >
 
-twovoicesteminvert = \type Staff \notes <  
+twovoicesteminvert = \context Staff \notes <  
        % the f and g on 4th beat are exceptionally ugh.
-       \type Voice=i { \stemup c4 d e f g2 g4 a | }
-       \type Voice=ii { \stemdown g4 f e g  g2 g2 } 
+       \context Voice=i { \stemUp c4 d e f g2 g4 a | }
+       \context Voice=ii { \stemDown g4 f e g  g2 g2 } 
 >
 
-threevoice = \type Staff \notes <
-       \type Voice=i { \stemup g4 f e f g a g2 }
-       \type Voice=ii { \stemup \property Voice.hshift = 1 e2  e2  e2  e2 }
-       \type Voice=iii { \stemdown c4 d e d c d es }
+threevoice = \context Staff \notes <
+       \context Voice=i { \stemUp g4 f e f g a g2 }
+       \context Voice=ii { \stemUp \property Voice.NoteColumn \push #'horizontal-shift = #1
+               e2  e2  e2  e2 }
+       \context Voice=iii { \stemDown c4 d e d c d es }
 >
 
+chordstest = \context Staff \notes <
+       \context Voice = i \relative c {
+               \stemUp e4 dis c f g f a b b
+       }
+       \context Voice = ii \relative c {
+               \stemDown <a4 c> <a4 c> <a4 e'> <a4 c> <e' a> <e a> <e a> <a c> <a d>
+       }
+>
+
+hairyChord = \context Staff \notes\relative c' <
+     \context Voice=one {
+ \property Voice.NoteColumn \push #'horizontal-shift = #0
+       \stemUp 
+       e4 
+     }
+     
+     \context Voice=two {
+       \stemUp
+ \property Voice.NoteColumn \push #'horizontal-shift = #1
+       cis
+     }
+     
+     \context Voice=three {
+ \property Voice.NoteColumn \push #'horizontal-shift = #2
 
-rests = \type Staff \notes <
-       \type Voice=i { \stemup | r8 r r r  r r r r [c' b a g] [f e d c] } 
-       \type Voice = ii { \stemdown [c8 d e f] [g a b c'] r r r r r r r r }
+       \stemUp 
+       ais
+     }
+     
+     \context Voice=four {
+        \stemDown
+ \property Voice.NoteColumn \push #'horizontal-shift = #1
+
+       fis
+     }
 >
 
-restsII = \type Staff \notes {
-       \type Voice=i
-       < 
-               { \stemup  g' f' e' d' c' b a g f e d c }
-               \type Voice = ii { \stemdown r  r  r  r  r  r r r r r r r }
-       >
-       <
-               { \stemup  r r r r r r r r  r  r  r  r }
-               \type Voice = ii { \stemdown c d e f g a b c' d' e' f' g' }
-       >
-       r8 r4
-       <  r8 r8 >
-       <  r8 r8 r8 >
-       <  r8 r8 r8 r8 >
-       <  r r >
-       <  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{
        \notes \transpose c'' {  \twovoice  
        \twovoicesteminvert 
-       \threevoice  
-       \rests 
-       % UGH ! bug!
-       \restsII 
+       \threevoice \break
+        \chordstest
+        \hairyChord
        }
        
-
-       
 %      \midi { \tempo 4:80 }
 }