X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Fcollisions.ly;h=9ba5c5bf2540e233baecf3c9152e95c4122511e0;hb=ccc485525e63f68623bce1c3ca7a2d4fb6e94499;hp=0c4cb7a121b6826e72dea4b616ff66028becf23c;hpb=955f829883aa125b2b633b1e71f6256da5b773fa;p=lilypond.git
diff --git a/input/regression/collisions.ly b/input/regression/collisions.ly
index 0c4cb7a121..9ba5c5bf25 100644
--- a/input/regression/collisions.ly
+++ b/input/regression/collisions.ly
@@ -1,56 +1,52 @@
-#(ly:set-option 'old-relative)
-\version "1.9.0"
+\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"
-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 }
-}
+\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
+ }
+