Merge branch 'master' into dev/texi2html

[lilypond.git] / input / regression / part-combine-text.ly

diff --git a/input/regression/part-combine-text.ly b/input/regression/part-combine-text.ly
index 0922a8d27a2689673d0380fb99598ec042ee935d..fc2496223408a4d797bd3daaa61a6346faf4a659 100644 (file)
--- a/input/regression/part-combine-text.ly
+++ b/input/regression/part-combine-text.ly
@@ -1,6 +1,6 @@
 
 \header {
-    texidoc ="The new part combiner detects a2, solo1 and solo2, and prints i
+    texidoc ="The part combiner detects a2, solo1 and solo2, and prints
 texts accordingly.
 
 "
@@ -9,13 +9,14 @@ texts accordingly.
     }
 
 
-\version "2.10.0"
+\version "2.11.51"
 
 \layout { ragged-right= ##t }
 
 vone =  \relative a' { R1 a2    r4 r a a a a }
 vtwo =  \relative a' { R1 f4 f4 f4 f f f a a  }
-comm = { s1 s2 s4_"expect: solo 2" s4 s2 s4_"expect: a2" s4 }
+comm = { s1 s2 s4_\markup { \small "expect: solo 2" }
+        s4 s2 s4_\markup { \small "expect: a2"  } s4 } 
 \new Staff <<
     \partcombine \vone \vtwo
     \comm