Imported Upstream version 2.16.0

[lilypond.git] / input / regression / collision-seconds.ly

diff --git a/input/regression/collision-seconds.ly b/input/regression/collision-seconds.ly
index 70b0e052e046330b18097dd294d8f0ae4bb2a075..f1b2134a51e98a20d325089f47406279bf35392e 100644 (file)
--- a/input/regression/collision-seconds.ly
+++ b/input/regression/collision-seconds.ly
@@ -1,10 +1,16 @@
-\version "2.14.0"
+\version "2.16.0"
 
 \header {
-  texidoc = "Seconds do not confuse the collision algorithm too much. The best
-way to format this would be to merge the two Ds, but we will be happy for now
-if the upstem D does not collide with the downstem C."
+  texidoc = "Seconds do not confuse the collision algorithm.
+The first pair of chords in each measure should merge, mesh,
+or come relatively close, but the second in each measure needs
+more space to make clear which notes belong to which voice."
 }
 
-
-<< d' \\ <c' d'> >>
+\relative f << {
+  <a' b>2 <a b d e> <a e' f> <a e' f> <a b c> <f g a>
+  \bar "||" <f g c> <g a c> <f g c d> <f g c d>
+} \\ {
+  <g a> <a b> <g a e'> <g a c e> <f g a> <a b c>
+  <g a e'> <g a e'> <g c d> <g a b>
+} >>