web-fr: nitpicks in troduction

[lilypond.git] / input / regression / collisions.ly

diff --git a/input/regression/collisions.ly b/input/regression/collisions.ly
index d66fdff632b08b5258c4d99390854a9c60f4344c..5b03483b6bf4abea02f8c48394bd6b7feae47d5e 100644 (file)
--- a/input/regression/collisions.ly
+++ b/input/regression/collisions.ly
@@ -1,8 +1,8 @@
-\version "2.10.0"
+\version "2.16.0"
 \header{
   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.
 "
 }
 
@@ -39,6 +39,24 @@ hairyChord = \context Staff  \relative c''
   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' {
@@ -47,6 +65,9 @@ hairyChord = \context Staff  \relative c''
       \threevoice
     }
     \hairyChord
+    \break
+    \minims \bar "||"
+    \semibreves \bar "||"
+    \sequence
   }
-