X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Fcollisions.ly;h=d33d4e579b7a504af9fdcdcf12b8f5fee746e3b3;hb=e09c45014bec847822d467dca3918e8e6703620e;hp=e40250ea8f4a3926171ab422c135fa8858550cda;hpb=34eb783cd6b1af2fd7cf2c573ec9dc7e9d16e7f7;p=lilypond.git diff --git a/input/regression/collisions.ly b/input/regression/collisions.ly index e40250ea8f..d33d4e579b 100644 --- a/input/regression/collisions.ly +++ b/input/regression/collisions.ly @@ -1,52 +1,52 @@ -\version "2.6.0" +\version "2.11.51" \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. " } twovoice = - \relative c' \context Staff << - { g4 f f e e d d c } -\\ { c4 c d d e e f f } +\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 - - } + \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 } + { 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 - >> - - -\score{ - { \transpose c c' { - \twovoice - \twovoicechords - \threevoice } - \hairyChord - } - -% \midi { \tempo 4:80 } -} +<< + e \\ + fis, \\ + cis' \\ + \\ + ais +>> + + + { + \transpose c c' { + \twovoice + \twovoicechords + \threevoice + } + \hairyChord + } +