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 ac3f7bd719c55e991cb4ba863eee0ea454ae2eed..fc2496223408a4d797bd3daaa61a6346faf4a659 100644 (file)
--- a/input/regression/part-combine-text.ly
+++ b/input/regression/part-combine-text.ly
@@ -1,8 +1,7 @@
 
 \header {
-    texidoc ="The new part combiner:
-
-Detect a2, solo1, solo2  and print texts accordingly.
+    texidoc ="The part combiner detects a2, solo1 and solo2, and prints
+texts accordingly.
 
 "
 
@@ -10,12 +9,16 @@ Detect a2, solo1, solo2  and print texts accordingly.
     }
 
 
-\version "2.1.18"
+\version "2.11.51"
 
-vone = \notes \relative a' { R1 a2    r4 r a a a a }
-vtwo = \notes \relative a' { R1 f4 f4 f4 f f f a a  }
+\layout { ragged-right= ##t }
 
-\score {
-   \partcombine \vone \vtwo
-}
+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_\markup { \small "expect: solo 2" }
+        s4 s2 s4_\markup { \small "expect: a2"  } s4 } 
+\new Staff <<
+    \partcombine \vone \vtwo
+    \comm
+>>