Merge commit 'origin' into beamlets2

[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 17704c5fbbf248e323a8f76d78dc2b2a140f3c35..77ea8e2877bc96565638901fcc97fb132888cef4 100644 (file)
--- a/input/regression/collision-merge-differently-dotted.ly
+++ b/input/regression/collision-merge-differently-dotted.ly
@@ -1,21 +1,29 @@
-\version "1.9.2"
+\version "2.12.0"
 \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 <
-  \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] } 
-  >
-}}
+\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
+  }
+>>