Merge branch 'translation' into staging

[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 71571a1980dcee1218db08957e1c7ed867c09d10..e2c0da08b3c1586865623436beec6c7f50da7476 100644 (file)
--- a/input/regression/collision-merge-differently-dotted.ly
+++ b/input/regression/collision-merge-differently-dotted.ly
@@ -1,7 +1,8 @@
-\version "2.7.32"
+\version "2.19.21"
 \header {
     
-    texidoc = "If NoteCollision has merge-differently-dotted = ##t note
+    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."
     
@@ -9,10 +10,10 @@ should not disappear when merging similar note heads."
 
 \layout { ragged-right= ##t }
        
-\context Staff \relative c'' <<
+\context Staff \relative <<
   {
-    g8[ g8]
-    \override Staff.NoteCollision  #'merge-differently-dotted = ##t
+    g'8[ g8]
+    \override Staff.NoteCollision.merge-differently-dotted = ##t
     g8[ g8]
     g4. r8 g8. g16
     g8 g4 r8 g4