LSR: adding new files.

[lilypond.git] / input / test / hymn.ly

diff --git a/input/test/hymn.ly b/input/test/hymn.ly
index e916091699625e9d62b20afd724b6922860a24ee..a16739b846d9d8295719ef0d1b2b4bddaba1d3b5 100644 (file)
--- a/input/test/hymn.ly
+++ b/input/test/hymn.ly
@@ -1,36 +1,34 @@
-\version "1.7.18"
-%  We have other examples of partcombine.  Candidate for delete.  -gp
-%  leave it for now; I need to check some things.
-% FIXMEsoon -gp
-%{
-Jan:
-> Why remove this?  Do we have another hymn with part-combiner?  Maybe
-> move to template?
-%}
 
-\header { texidoc = "@cindex Hymn
-You can combine two parts on the same staff. " }
+\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 <
+       \context Staff <<
                \time 4/4
-               \context Voice=one \partcombine Voice
-                       \context Thread=one \notes\relative c'' {
-                               a4 c4.(g8-) a4 |
-                               g4 e' g(f-) | 
+               \partcombine 
+                       \relative c'' {
+                               a4 c4.(g8) a4 |
+                               g4 e' g(f) | 
                                b, a c2
                        }
-                       \context Thread=two \notes\relative c'' {
-                               g4 e4.(d8-) c4 |
-                               g'4 c, e(f-) |
+                       \relative c'' {
+                               g4 e4.(d8) c4 |
+                               g'4 c, e(f) |
                                d2 a
                        }
-       >
-       \paper{
-               linewidth=140.\mm
-               \translator {
-                       \VoiceContext
-                       soloADue = ##f
+       >>
+       \layout{
+               line-width=140.\mm
+               \context {
+                       \Voice
+                       printPartCombineTexts = ##f
                }
        }
 }