patch::: 1.5.30.uu1

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

diff --git a/input/regression/collisions.ly b/input/regression/collisions.ly
index 57193d7a6407746418171f119279c2efb16e0641..2f1467326d3e1de7b2c4c01f29e8a2e2fa465146 100644 (file)
--- a/input/regression/collisions.ly
+++ b/input/regression/collisions.ly
@@ -1,66 +1,63 @@
+\version "1.3.146"
 \header{
 texidoc="
 Normal collisions. We have support for polyphony, where the
 middle voices are horizontally shifted.
-";
-filename =      "collisions.ly";
-description =   "random counterpoint to test collisions";
-enteredby =     "HWN,JCN";
-copyright =     "public domain";
-Tested =        "test the Collision resolution ";
+"
+filename =      "collisions.ly"
+description =   "random counterpoint to test collisions"
+enteredby =     "HWN,JCN"
+copyright =     "public domain"
+Tested =        "test the Collision resolution "
 }
 
 
-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 } 
+twovoice =
+\notes \relative c' \context Staff \notes < 
+       \context Voice=i { \stemDown c4 c  d d e e f f }
+       \context Voice=ii { \stemUp g4 f f e e d d c } 
 >
 
-twovoicesteminvert =  \context Staff \notes <  
-       % the f and g on 4th beat are exceptionally ugh.
-       \context Voice=i { \stemUp c4 d e f g2 g4 a | }
-       \context Voice=ii { \stemDown g4 f e g  g2 g2 } 
+twovoicechords = \context Staff \notes <
+       \context Voice = i \relative c' {
+               \stemUp e4 d c b a g f
+       }
+       \context Voice = ii \relative c' {
+               \stemDown <a4 c> <a4 c> <a4 c> <a4 c> <a c>
+               <a c> <a c>  
+       }
 >
 
+
 threevoice =  \context Staff \notes <
        \context Voice=i { \stemUp g4 f e f g a g2 }
-       \context Voice=ii { \stemUp \property Voice.NoteColumn \override #'horizontal-shift = #1
-               e2  e2  e2  e2 }
+       \context Voice=ii { \stemUp \shiftOn
+               e4 e e e e e e e  }
        \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 \override #'horizontal-shift = #0
+\shiftOff
        \stemUp 
        e4 
      }
      
      \context Voice=two {
        \stemUp
+       \shiftOn
  \property Voice.NoteColumn \override #'horizontal-shift = #1
        cis
      }
      
-     \context Voice=three {
- \property Voice.NoteColumn \override #'horizontal-shift = #2
-
+     \context Voice=three {    \shiftOnn
        \stemUp 
        ais
      }
      
      \context Voice=four {
         \stemDown
- \property Voice.NoteColumn \override #'horizontal-shift = #1
+       \shiftOn
 
        fis
      }
@@ -68,10 +65,11 @@ hairyChord =  \context Staff \notes\relative c' <
 
 
 \score{
-       \notes \transpose c'' {  \twovoice  
-       \twovoicesteminvert 
-       \threevoice \break
-        \chordstest
+       \notes \transpose c'' {
+          \twovoice
+          \twovoicechords
+       
+       \threevoice 
         \hairyChord
        }