X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Fcollisions.ly;h=eeea895cdcf51318fc24f7bea4c9b66a0b2703fe;hb=3ad118d6062153701ab613c1b3855911c45214d3;hp=60c205a640397577020b2d988b081ffbf2ffeb7b;hpb=7e8d660df15820c540b74a4ab74d175284cd9008;p=lilypond.git
diff --git a/input/regression/collisions.ly b/input/regression/collisions.ly
index 60c205a640..eeea895cdc 100644
--- a/input/regression/collisions.ly
+++ b/input/regression/collisions.ly
@@ -1,56 +1,73 @@
-#(ly:set-option 'old-relative)
-\version "2.1.30"
+\version "2.19.21"
\header{
-texidoc="
+ texidoc="
In addition to normal collision rules, there is support for polyphony,
-where the collosion are avoided by shifting middle voices horizontally.
+where the collisions are avoided by shifting middle voices horizontally.
"
-filename = "collisions.ly"
-enteredby = "HWN,JCN"
-copyright = "public domain"
}
twovoice =
-\notes \relative c' \context Staff \notes <<
- { g4 f f e e d d c }
-\\ { c4 c d d e e f f }
+\relative \context Staff <<
+ { g4 f f e e d d c }
+ \\ { c4 c d d e e f f }
>>
-twovoicechords = \context Staff \notes <<
- \relative c' {
- e4 d c b a g f
- }\\
- \relative c' {
- 4 4 4 4
-
- }
+twovoicechords = \context Staff <<
+ \relative {
+ e'4 d c b a g f
+ }\\
+ \relative {
+ 4 4 4 4
+
+ }
>>
-threevoice = \context Staff \notes <<
- { g4 f e f g a g2 } \\
- { c4 d e d c d es } \\
- { e4 e e e e e e e }
+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 \notes \relative c''
- << e \\
- fis, \\
- cis' \\
- \\
- ais
- >>
-
-
-\score{
- \notes { \transpose c c' {
- \twovoice
- \twovoicechords
- \threevoice }
- \hairyChord
- }
-
-% \midi { \tempo 4:80 }
-}
+hairyChord = \context Staff \relative
+<<
+ e'' \\
+ fis, \\
+ cis' \\
+ \\
+ ais
+>>
+
+minims = <<
+ { e''2 e'' e' d' } \\
+ c'' \\
+ { c' c' c' c' } \\
+ g' >>
+
+semibreves = <<
+ { e''1 e'' e' d' } \\
+ c'' \\
+ { c' c' c' c' } \\
+ g' >>
+
+sequence = <<
+ \new Voice { \voiceOne g''1 e''2 d'' e'' d'' }
+ \new Voice { \voiceThree c''2 b' a'1 b' }
+ \new Voice { \voiceFour g'1 e'2 f'2 a'1 }
+ \new Voice { \voiceTwo c'1 c'2 d' e'2 d' }
+>>
+
+ {
+ \transpose c c' {
+ \twovoice
+ \twovoicechords
+ \threevoice
+ }
+ \hairyChord
+ \break
+ \minims \bar "||"
+ \semibreves \bar "||"
+ \sequence
+ }