X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=input%2Ftest%2Fpart-combine.ly;h=05c87cbc2aae05e996a7cda7f215ed55862e4f36;hb=ecaf73bb03e974018c17e3051b3ac3a805dd1653;hp=9e95a44c266dc14d9cb3916eb1e474219a01ed1d;hpb=3db08de4502e30616808fc348b054d32822e5cc4;p=lilypond.git

diff --git a/input/test/part-combine.ly b/input/test/part-combine.ly
index 9e95a44c26..05c87cbc2a 100644
--- a/input/test/part-combine.ly
+++ b/input/test/part-combine.ly
@@ -1,38 +1,31 @@
-\version "1.7.18"
+
+\version "2.1.28"
 
 \header{ texidoc="@cindex Part Combine
-In orchestral scores and hymns, voices are traditionally combined onto
-one staff.  LilyPond has a part combiner, that combines or separates two
-voices according to actual rhythm and pitch.  User-defined texts such as
-``solo'' and ``@`a2'' are typeset automagically, as appropriate. "
+In orchestral scores and hymns, voices are traditionally combined into
+one staff.  LilyPond has a part combiner that combines, or separates, two
+voices according to the actual rhythm and pitch.  Configurable texts, such 
+as ``solo'' and ``@`a2'', are typeset automatically in appropriate
+places. "
 }
 
 \score{
-   \notes \context Staff = flauti <
+   \notes \context Staff = flauti <<
     \time 4/4
-    \context Voice=one \partcombine Voice
-    \context Thread=one\relative c'' {
+    \partcombine
+    \relative c'' {
       c4 d e f | b,4 d c d | r2 e4 f | c4 d e f |
       c4 r e f | c4 r e f | c4 r a r | a a r a |
-      a2 \property Voice.soloADue = ##f a |
+      a2 \set soloADue = ##f a |
     }
-    \context Thread=two\relative c'' {
+    \relative c'' {
       g4 b d f | r2 c4 d | a c c d | a4. b8 c4 d
       c r e r | r2 s2 | a,4 r a r | a r r a |
-      a2 \property Voice.soloADue = ##f a |
+      a2 \set soloADue = ##f a |
     }
-  >
+  >>
   \paper{
 	raggedright = ##t
-    linewidth = 80 * \staffspace
-    \translator{
-      \ThreadContext
-      \consists Rest_engraver
-    }
-    \translator{
-      \VoiceContext
-      \remove Rest_engraver
-    }
   }
 }