Imported Upstream version 2.19.45

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

diff --git a/input/regression/collision-manual.ly b/input/regression/collision-manual.ly
index 685090b78adf710f8a465d7ac17aac2edac83e1e..b39b0eafeb1b1ed9151480d60cbb737f788cc09c 100644 (file)
--- 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.17.6"
+\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 c' {
-  << {  f
-       \override NoteColumn.force-hshift = #0.1
-       f } \\
-     {  e  e }
-   >> 
-}