Merge branch 'master' into dev/texi2html

[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 b180f3b5a71b6dfd72de9f37fe797df668101989..5674978017f457c95eb0ee8b9f9cc87a772b67b9 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,25 +1,31 @@
 %% 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"
+\version "2.11.51"
 
 \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.
-
-
-
-" }
-% begin verbatim
+
+  texidoc = "
+The part combiner tool ( @code{\\partcombine} command ) allows the
+combination of several 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, it
+might be better not to use it if there are any solos, as they won't be
+indicated.  In such cases, standard polyphonic notation may be
+preferable.
+
+This snippet presents the three ways two parts can be printed on a same
+staff: standard polyphony, @code{\\partcombine} without texts, and
+@code{\\partcombine} with texts.
+
+
+
+
+"
+  doctitle = "Combining two parts on the same staff"
+} % begin verbatim
 musicUp = \relative c'' {
   \time 4/4
   a4 c4.( g8) a4 |
@@ -38,7 +44,7 @@ musicDown = \relative c'' {
     <<
     \new Staff {
       \set Staff.instrumentName = "Standard polyphony  "
-      << \musicUp  \\ \musicDown >>
+      << \musicUp \\ \musicDown >>
     }
     \new Staff \with { printPartCombineTexts = ##f } {
       \set Staff.instrumentName = "PartCombine without texts  "