X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Fcollision-manual.ly;h=b39b0eafeb1b1ed9151480d60cbb737f788cc09c;hb=79c17e0eaedca79e5f7605f5b9f92db27c68e679;hp=fa22c8fa692ed29325c163f96f6e11dd8deaa07a;hpb=20b8c1519bbba8728457aa98e59993837bedfb04;p=lilypond.git

diff --git a/input/regression/collision-manual.ly b/input/regression/collision-manual.ly
index fa22c8fa69..b39b0eafeb 100644
--- a/input/regression/collision-manual.ly
+++ b/input/regression/collision-manual.ly
@@ -1,17 +1,28 @@
 \header {
-
-  texidoc = "Collision resolution may be forced manually with @code{force-hshift}. "
+  texidoc = "Colliding note-columns may be shifted manually
+with @code{force-hshift}.  Arrangements of notes after
+collision-resolution have their main columns (not suspended notes)
+left-aligned, excluding columns with forced shifts."
 }
-\version "2.11.51"
+\version "2.19.24"
 
-\paper  {
-  ragged-right = ##t
-}
+\new PianoStaff \with { \consists #Span_stem_engraver } <<
+  \new Staff \fixed c' <<
+    \new Voice {
+      \voiceOne f e
+      \crossStaff
+      \once\override NoteColumn.force-hshift = #-0.8
+      f
+      \once\override NoteColumn.force-hshift = #-1.5
+      e
+    }
+    \new Voice {
+      \voiceTwo e f
+      \once\override NoteColumn.force-hshift = #0
+      \crossStaff e
+      \crossStaff f
+    }
+  >>
+  \new Staff {\clef bass g g e f }
+>>
 
-\relative {
-  << {  f
-	\override NoteColumn #'force-hshift = #0.1
-	f } \\
-     {  e  e }
-   >> 
-}