Merge master into nested-bookparts

[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 0fd7054f47b7cdf0d85390b43dab108592dfa56c..46725a7eb264f077e2d42352a389c237be05a62b 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,19 +1,40 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
 %% 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.62"

 
 \header {
   lsrtags = "simultaneous-notes, text"
 
 
 \header {
   lsrtags = "simultaneous-notes, text"
 

+  texidoces = "
+La herramienta de combinación de partes ( instrucción
+@code{\\partcombine}) permite la combinación de varias partes
+diferentes sobre el mismo pentagrama.  Las indicaciones textuales
+tales como \"solo\" o \"a2\" se añaden de forma predeterminada;
+para quitarlas, sencillamente establezca la proopiedad
+@code{printPartCombineTexts} al valor \"falso\".  Para partituras
+vocales (como himnos), no hay necesidad de añadir los textos
+\"solo\" o \"a2\", por lo que se deben desactivar.  Sin embargo,
+podría ser mejor no usarlo si hay solos, porque éstos no se
+indicarán.  En tales casos podría ser preferible la notación
+polifónica estándar.
+
+Este fragmento de código presenta las tres formas en que se pueden
+imprimir dos partes sobre un solo pentagrama: polifonía estándar,
+@code{\\partcombine} sin textos, y @code{\\partcombine} con
+textos.
+
+"
+  doctitlees = "Combinar dos partes sobre el mismo pentagrama"
+

   texidoc = "
 The part combiner tool ( @code{\\partcombine} command ) allows the
   texidoc = "
 The part combiner tool ( @code{\\partcombine} command ) allows the

-combination of several different parts on the same staff. Text
+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
 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
+\"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
 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
+indicated.  In such cases, standard polyphonic notation may be

 preferable.
 
 This snippet presents the three ways two parts can be printed on a same
 preferable.
 
 This snippet presents the three ways two parts can be printed on a same


@@ -44,7 +65,7 @@ musicDown = \relative c'' {
     <<
     \new Staff {
       \set Staff.instrumentName = "Standard polyphony  "
     <<
     \new Staff {
       \set Staff.instrumentName = "Standard polyphony  "

-      << \musicUp  \\ \musicDown >>
+      << \musicUp \\ \musicDown >>

     }
     \new Staff \with { printPartCombineTexts = ##f } {
       \set Staff.instrumentName = "PartCombine without texts  "
     }
     \new Staff \with { printPartCombineTexts = ##f } {
       \set Staff.instrumentName = "PartCombine without texts  "