X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Fcollisions.ly;h=9ba5c5bf2540e233baecf3c9152e95c4122511e0;hb=e90f0536f9be39ada0bef0aeb0d275dec3b2fb5b;hp=89332dee95dacc3ada55b3c879395351207dc547;hpb=68a168bff1fec7f8011b2afa82d4fc89182c4bf7;p=lilypond.git
diff --git a/input/regression/collisions.ly b/input/regression/collisions.ly
index 89332dee95..9ba5c5bf25 100644
--- a/input/regression/collisions.ly
+++ b/input/regression/collisions.ly
@@ -1,80 +1,52 @@
-\version "1.3.146"
+\version "2.14.0"
\header{
-texidoc="
-Normal collisions. We have support for polyphony, where the
-middle voices are horizontally shifted.
+ texidoc="
+In addition to normal collision rules, there is support for polyphony,
+where the collisions are avoided by shifting middle voices horizontally.
"
-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 =
+\relative c' \context Staff <<
+ { g4 f f e e d d c }
+ \\ { c4 c d d e e f f }
+>>
+
+twovoicechords = \context Staff <<
+ \relative c' {
+ e4 d c b a g f
+ }\\
+ \relative c' {
+ 4 4 4 4
+
+ }
+>>
+
+
+threevoice = \context Staff <<
+ { g4 f e f g a g2 } \\
+ { c4 d e d c d es } \\
+ { e4 e e e e e e e }
+>>
+
+hairyChord = \context Staff \relative c''
+<<
+ e \\
+ fis, \\
+ cis' \\
+ \\
+ ais
+>>
+
+
+ {
+ \transpose c c' {
+ \twovoice
+ \twovoicechords
+ \threevoice
+ }
+ \hairyChord
+ }
+
-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 }
->
-
-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=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
- }
->
-
-hairyChord = \context Staff \notes\relative c' <
- \context Voice=one {
- \property Voice.NoteColumn \override #'horizontal-shift = #0
- \stemUp
- e4
- }
-
- \context Voice=two {
- \stemUp
- \property Voice.NoteColumn \override #'horizontal-shift = #1
- cis
- }
-
- \context Voice=three {
- \property Voice.NoteColumn \override #'horizontal-shift = #2
-
- \stemUp
- ais
- }
-
- \context Voice=four {
- \stemDown
- \property Voice.NoteColumn \override #'horizontal-shift = #1
-
- fis
- }
->
-
-
-\score{
- \notes \transpose c'' { \twovoice
- \twovoicesteminvert
- \threevoice \break
- \chordstest
- \hairyChord
- }
-
-% \midi { \tempo 4:80 }
-}