small fixes.

[lilypond.git] / input / regression / collision-merge-differently-dotted.ly

diff --git a/input/regression/collision-merge-differently-dotted.ly b/input/regression/collision-merge-differently-dotted.ly
index 28b94a3f9b63a9df3bf27069152fadcfeb288e08..227fd8c4464ced06923673e7d7a9a9ab1e8a983e 100644 (file)
--- a/input/regression/collision-merge-differently-dotted.ly
+++ b/input/regression/collision-merge-differently-dotted.ly
@@ -1,21 +1,30 @@
-\version "1.9.4"
+\version "2.2.0"
 \header {
+    
+    texidoc = "If NoteCollision has 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 }
-
-
+\paper { raggedright= ##t }
        
-\score { \notes {
-  \context Staff <<
-  \new Voice { \voiceOne g'8 g'8 
-     \property Staff.NoteCollision \override #'merge-differently-dotted = ##t
-     g'8 g'8
-     }
-  \new Voice { \voiceTwo  g'8.[ f16]  g'8.[ f'16] } 
-  >>
-}}
+\score {
+    \context Staff \notes\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
+       }
+    >>
+}