Merge branch 'master' into dev/texi2html

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

diff --git a/input/regression/part-combine-a2.ly b/input/regression/part-combine-a2.ly
index ad91a0b26f20020f6e3939cef0367430de9eb998..b67cdadce9f7c8f2a54376b8071cd02d802b41a8 100644 (file)
--- a/input/regression/part-combine-a2.ly
+++ b/input/regression/part-combine-a2.ly
@@ -1,16 +1,19 @@
 
+\version "2.11.51"
 \header {
-    texidoc ="The a2 string is only printed on notes, not on rests,
+    texidoc ="The a2 string is printed only on notes (i.e. not on rests),
 and only after chords, solo or polyphony."
     }
 
-vone = \notes \relative a' { R1*2 g2 r2 g2 r2 a4 r4 g
-                        }
-vtwo = \notes \relative a' { R1*2 g2 r2 g2 r2 f4 r4 g }
+vone =  \relative a' { R1*2 g2 r2 g2 r2 a4 r4 g }
+vtwo =  \relative a' { R1*2 g2 r2 g2 r2 f4 r4 g }
 
-\score {
-    << \property Score.skipBars = ##t 
-   \newpartcombine \vone \vtwo
-       >>
-}
+comment = \relative { s1*2 s2_"a2" s2 s2_"no a2" s2 s4 s4 s4_"a2" } 
+
+\layout { ragged-right = ##T }
+
+\new Staff << \set Score.skipBars = ##t 
+   \partcombine \vone \vtwo
+   \comment
+>>