X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Ftest%2Fhymn.ly;h=a16739b846d9d8295719ef0d1b2b4bddaba1d3b5;hb=3ee5a5b2e566aa1638b4cb2d883e8e2b99c3fce5;hp=8003c4dbd42960d6e721d4a53d43f94b5457ad59;hpb=c7f0e307fbca6cd8e225d34f5e2a56046c229d89;p=lilypond.git

diff --git a/input/test/hymn.ly b/input/test/hymn.ly
index 8003c4dbd4..a16739b846 100644
--- a/input/test/hymn.ly
+++ b/input/test/hymn.ly
@@ -1,32 +1,36 @@
-\score{
-	\context Staff <
-		\context Voice=one { \skip 1; }
-		\context Voice=two { \skip 1; }
 
-		\context Voice=one \partcombine Voice
-			\context Thread=one \notes\relative c'' {
-				%a4 c4.()g8 a4 |
-				g4 e' g()f | 
+\version "2.10.0"
+
+\header { texidoc = "
+
+You can combine two parts on the same staff using the part
+combiner. For vocal scores (hymns), there is no need to add solo/a2
+texts, so they should be switched off.
+
+" }
+
+\score{
+	\context Staff <<
+		\time 4/4
+		\partcombine 
+			\relative c'' {
+				a4 c4.(g8) a4 |
+				g4 e' g(f) | 
 				b, a c2
 			}
-			\context Thread=two \notes\relative c'' {
-				%g4 e4.()d8 c4 |
-				g4 c, e()f |
+			\relative c'' {
+				g4 e4.(d8) c4 |
+				g'4 c, e(f) |
 				d2 a
 			}
-	>
-	\paper{
-		linewidth=140.\mm;
-		\translator {
-			\VoiceContext
-			soloADue = ##f
-			%\remove Slur_engraver;
-			\consists Slur_engraver;
+	>>
+	\layout{
+		line-width=140.\mm
+		\context {
+			\Voice
+			printPartCombineTexts = ##f
 		}
-%		\translator {
-%			\ThreadContext
-%			\consists Slur_engraver;
-%		}
 	}
 }
 
+