Merge commit 'origin' into beamlets2

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

diff --git a/input/regression/part-combine-solo-global.ly b/input/regression/part-combine-solo-global.ly
index 47c1a2ff862cbfc386a4872caa914e8026a8ba62..5f0e7b8414c96438ca9dd07b07e70f2eef0772cd 100644 (file)
--- a/input/regression/part-combine-solo-global.ly
+++ b/input/regression/part-combine-solo-global.ly
@@ -1,19 +1,18 @@
 
-\header { texidoc = "Solo/Solo2 also is global: In this example, solo1
-         should not printed over the 1st note, because the voice
-         switch would kill the slur."
+\header { texidoc = "In this example, solo1
+         should not be printed over the 1st note, because of the slur
+         which is present from the one-voice to the two-voice situation."
 
 }
 
-\version "2.1.18"
+\version "2.12.0"
+\paper { ragged-right = ##t } 
 
-\score {
-    \new Staff
-    \partcombine \notes \relative c'' {
+\new Staff
+    \partcombine  \relative c'' {
        bes2(
         a4)
        }
-    \notes \relative c' {
+     \relative c' {
        r2 cis4
     }
-}