X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Fcollision-merge-differently-dotted.ly;h=a682b171ace83c3fe8edf5185348cc758c6bd0c8;hb=f0bd72f53dca7b79853a70007e53f31d7e21ac76;hp=6140e4261f202f10ee538808b0b6798ddccf7631;hpb=955f829883aa125b2b633b1e71f6256da5b773fa;p=lilypond.git

diff --git a/input/regression/collision-merge-differently-dotted.ly b/input/regression/collision-merge-differently-dotted.ly
index 6140e4261f..a682b171ac 100644
--- a/input/regression/collision-merge-differently-dotted.ly
+++ b/input/regression/collision-merge-differently-dotted.ly
@@ -1,21 +1,29 @@
-\version "1.9.0"
+\version "2.11.51"
 \header {
+    
+    texidoc = "If @code{NoteCollision} has
+ @code{merge-differently-dotted = ##t} note
+heads that have differing dot counts may be merged anyway.  Dots
+should not disappear when merging similar note heads."
+    
+}
 
-texidoc = "If NoteCollision has merge-differently-dotted set, note
-heads that have differing dot counts may be merged anyway."
-
- }
-    \paper { raggedright= ##t }
-
-
+\layout { ragged-right= ##t }
 	
-\score { \notes {
-  \context Staff <
-  \context Voice = VA { \voiceOne g'8 g'8 
-     \property Staff.NoteCollision \override #'merge-differently-dotted = ##t
-     g'8 g'8
-     }
-  \context Voice = VB { \voiceTwo  g'8.-[ f16]  g'8.-[ f'16] } 
-  >
-}}
+\context Staff \relative c'' <<
+  {
+    g8[ g8]
+    \override Staff.NoteCollision  #'merge-differently-dotted = ##t
+    g8[ g8]
+    g4. r8 g8. g16
+    g8 g4 r8 g4
+  }
+  \\
+  {
+    g8.[ f16]
+    g8.[ f16]
+    g8 g4 r8 g4
+    g4. r8 g8. g16
+  }
+>>