Merge branch 'master' of ssh+git://git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / input / lsr / combining-two-parts-on-the-same-staff.ly

diff --git a/input/lsr/combining-two-parts-on-the-same-staff.ly b/input/lsr/combining-two-parts-on-the-same-staff.ly
index 869e018ce83d83b3fd5ef509ae258a38425e8af2..b180f3b5a71b6dfd72de9f37fe797df668101989 100644 (file)
--- a/input/lsr/combining-two-parts-on-the-same-staff.ly
+++ b/input/lsr/combining-two-parts-on-the-same-staff.ly
@@ -1,75 +1,60 @@
-%% Do not edit this file; it is auto-generated from LSR!
-%% Tags: simultaneous-notes, text
-\version "2.11.35"
+%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
+%% This file is in the public domain.
+\version "2.11.38"
+
+\header {
+  lsrtags = "simultaneous-notes, text"
+ texidoc = "
+The part combiner tool ( @code{\\partcombine} command ) allows you to
+combine different parts on the same staff. Text directions such as
+\"solo\" or \"a2\" are added by default; to remove them, simply set the
+property @code{printPartCombineTexts} to \"false\". For vocal scores
+(hymns), there is no need to add \"solo\"/\"a2\" texts, so they should
+be switched off. However, you'd better not use it if there are any
+solos, as they won't be indicated. In such cases, you may simply want
+to use standard LilyPond polyphony. This snippet presents the three
+ways two parts can be printed on a same staff: standard polyphony,
+@code{\\partcombine} whitout texts, and @code{\\partcombine} with texts.
 
-\header { texidoc = "
-The part combiner tool ( \\partcombine command ) allows you to combine
-different parts on a same Staff. You can choose whether you want or
-don't want to add texts such as \"solo\" or \"a2\", by defining the
-printPartCombineTexts property.
-
-For vocal scores (hymns), there is no need to add \"solo\"/\"a2\"
-texts, so they should be switched off. However, you'd better not use it
-if there are any solos, as they won't be indicated. In such cases, you
-may simply want to use standard LilyPond polyphony.
-
-This snippet presents the three ways two parts can be printed on a same
-staff : standard polyphony, \\partcombine whitout texts, and
-\\partcombine with texts.
 
 
 " }
 % begin verbatim
-musicUp = {     \time 4/4
-                       \relative c'' {
-                               a4 c4.(g8) a4 |
-                               g4 e' g,( a8 b) | 
-                               c b a2.
-                       }
-}
-
-musicDown = {
-                       \relative c'' {
-                               g4 e4.(d8) c4 |
-                               r2 g'4( f8 e) |
-                               d2 a
-                       }
-}
-\score{
-       \new Staff {
-               \set Staff.instrumentName = "Standard polyphony  "
-               << \musicUp  \\ \musicDown >>
-       }
-       \layout{ 
-       indent = 6.0\cm 
-       }
+musicUp = \relative c'' {
+  \time 4/4
+  a4 c4.( g8) a4 |
+  g4 e' g,( a8 b) |
+  c b a2.
 }
 
-\score{
-       \context Staff {
-                       \set Staff.instrumentName = "PartCombine without texts  "
-                       \partcombine \musicUp \musicDown
-       }
-       \layout{
-               indent = 6.0\cm
-               \context {
-                       \Voice
-                       printPartCombineTexts = ##f
-               }
-       }
+musicDown = \relative c'' {
+  g4 e4.( d8) c4 |
+  r2 g'4( f8 e) |
+  d2 \stemDown a
 }
 
-\score{
-       \context Staff {
-                       \set Staff.instrumentName = "PartCombine with texts  "
-                       \partcombine \musicUp \musicDown
-       }
-       \layout{
-               indent = 6.0\cm
-               \context {
-                       \Voice
-                       printPartCombineTexts = ##t
-               }
-       }
+\score {
+  <<
+    <<
+    \new Staff {
+      \set Staff.instrumentName = "Standard polyphony  "
+      << \musicUp  \\ \musicDown >>
+    }
+    \new Staff \with { printPartCombineTexts = ##f } {
+      \set Staff.instrumentName = "PartCombine without texts  "
+      \partcombine \musicUp \musicDown
+    }
+    \new Staff {
+      \set Staff.instrumentName = "PartCombine with texts  "
+      \partcombine \musicUp \musicDown
+    }
+    >>
+  >>
+  \layout {
+    indent = 6.0\cm
+    \context {
+      \Score
+      \override SystemStartBar #'collapse-height = #30
+    }
+  }
 }
-