X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=input%2Fregression%2Fcollisions.ly;h=eeea895cdcf51318fc24f7bea4c9b66a0b2703fe;hb=ae050ca38fb9ba535b451c501859e29ad2feea33;hp=bf45a57697d6e2a258037bd2944e781d55fb921d;hpb=e797c6d2bb2018d2118730b99ee54c4b81eac25c;p=lilypond.git
diff --git a/input/regression/collisions.ly b/input/regression/collisions.ly
index bf45a57697..eeea895cdc 100644
--- a/input/regression/collisions.ly
+++ b/input/regression/collisions.ly
@@ -1,55 +1,73 @@
-\version "1.7.18"
+\version "2.19.21"
\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"
-enteredby = "HWN,JCN"
-copyright = "public domain"
}
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 }
->
-
-twovoicechords = \context Staff \notes <
- \context Voice = i \relative c' {
- \stemUp e4 d c b a g f
- }
- \context Voice = ii \relative c' {
- \stemDown <>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 }
->
-
-hairyChord = \context Staff \notes \relative c''
- < e \\
- fis, \\
- cis' \\
- \\
- ais
- >
-
-
-\score{
- \notes { \transpose c c' {
- \twovoice
- \twovoicechords
- \threevoice }
- \hairyChord
- }
-
-% \midi { \tempo 4:80 }
-}
-%% new-chords-done %%
+\relative \context Staff <<
+ { g4 f f e e d d c }
+ \\ { c4 c d d e e f f }
+>>
+
+twovoicechords = \context Staff <<
+ \relative {
+ e'4 d c b a g f
+ }\\
+ \relative {
+ 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
+<<
+ 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
+ }
+