release: 1.3.121

[lilypond.git] / input / test / part-combine.ly

diff --git a/input/test/part-combine.ly b/input/test/part-combine.ly
index d228cd703dca2575c20260b0ff5eec183eb5ae90..d710038cde3b9c4351edb72ff6ecbec353e28f23 100644 (file)
--- a/input/test/part-combine.ly
+++ b/input/test/part-combine.ly
@@ -1,18 +1,51 @@
+\header{
+texidoc="
+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.
+";
+}
+
 \score{
-       \context Staff = first <
-               \context Voice=first { \skip 1; }
-               \context Voice=second { \skip 1; }
+       \context Staff = flauti <
+               \time 4/4;
 
-               \context Voice=first \partcombine Voice
-                       \context Thread \notes\relative c''
+               \context Voice=one \partcombine Voice
+                       \context Thread=one \notes\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
                                }
-                       \context Thread \notes\relative c''
+                       \context Thread=two \notes\relative c''
                                {
-                                       a b c d
+                                       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
                                }
                >
+       \paper{
+               linewidth = 140.\mm;
+               \translator{
+                       \ThreadContext
+                       \consists Rest_engraver;
+               }
+               \translator{
+                       \VoiceContext
+                       \remove Rest_engraver;
+               }
+       }
 }