Merge with master

[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 4844cfba8c1539aa0bf2d4a3ab1df4b6d921076e..bcbd3aa8eb6ce42d08e88ba2de06b0f5583a0f68 100644 (file)
--- a/input/regression/part-combine-text.ly
+++ b/input/regression/part-combine-text.ly
@@ -9,12 +9,16 @@ texts accordingly.
     }
 
 
-\version "2.3.17"
+\version "2.10.0"
+
+\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  }
-
-\score {
-   \partcombine \vone \vtwo
-}
+comm = { s1 s2 s4_\markup { \small "expect: solo 2" }
+        s4 s2 s4_\markup { \small "expect: a2"  } s4 } 
+\new Staff <<
+    \partcombine \vone \vtwo
+    \comm
+>>