X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fsnippets%2Fcombining-two-parts-on-the-same-staff.ly;h=c0549d7970a1fad923277127e941272e19adb152;hb=22d889f4d27469864c31db81445e9de49774ae23;hp=4916607521b66d071fa145cc8607ed50acfae116;hpb=69f0ec479a6ade46d0a227755bb02562112c6743;p=lilypond.git

diff --git a/Documentation/snippets/combining-two-parts-on-the-same-staff.ly b/Documentation/snippets/combining-two-parts-on-the-same-staff.ly
index 4916607521..c0549d7970 100644
--- a/Documentation/snippets/combining-two-parts-on-the-same-staff.ly
+++ b/Documentation/snippets/combining-two-parts-on-the-same-staff.ly
@@ -1,23 +1,24 @@
-%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
+%% Do not edit this file; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
-\version "2.13.1"
+\version "2.13.16"
 
 \header {
   lsrtags = "simultaneous-notes, text"
 
-%% Translation of GIT committish: 04ab6c269b4067b6ed334d460339818d90513396
+%% Translation of GIT committish: d2119a9e5e951c6ae850322f41444ac98d1ed492
   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 propiedad
-@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.
+tales como @qq{solo} o @qq{a2} se añaden de forma predeterminada; para
+quitarlas, sencillamente establezca la propiedad
+@code{printPartCombineTexts} al valor @qq{falso}.  Para partituras
+vocales (como himnos), no hay necesidad de añadir los textos @qq{solo}
+o @qq{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,
@@ -27,7 +28,7 @@ textos.
 "
   doctitlees = "Combinar dos partes sobre el mismo pentagrama"
 
-%% Translation of GIT committish: 0364058d18eb91836302a567c18289209d6e9706
+%% Translation of GIT committish: 0a868be38a775ecb1ef935b079000cebbc64de40
   texidocde = "
 Die Funktion, die Stimmen kombiniert (also der @code{\\partcombine}-Befehl)
 ermöglicht die Kombination unterschiedlicher Stimmen auf einem
@@ -46,17 +47,36 @@ kombinieren: Standardpolyphonie, @code{\\partcombine} ohne Text und
 
 "
   doctitlede = "Zwei Stimmen auf einem System kombinieren"
+%% Translation of GIT committish: 1baa2adf57c84e8d50e6907416eadb93e2e2eb5c
+  texidocfr = "
+L'outil de combinaison de parties (la commande @code{\\partcombine})
+permet d'avoir deux parties différentes sur une même portée.  LilyPond
+ajoute automatiquement des indications textuelles, telles que @qq{solo}
+ou @qq{a2}.  Si votre intention n'est que de fusionner les parties, sans
+ajouter de texte, assignez faux à la propriété
+@code{printPartCombineTexts}.  Dans le cas de partitions vocales, et
+plus particulièrement d'hymnes, ces @qq{solo/a2} ne sont d'aucune
+utilité, aussi vaut-il mieux les désactiver.  Dans le cas où il y aurait
+alternance entre @emph{solo} et @emph{tutti}, il vaut mieux faire appel
+à de la musique polyphonique standard.
+
+Voici trois moyens d'imprimer deux parties sur un même portée : en
+polyphonie normale, avec @code{\\partcombine} sans indication
+supplémentaire, et avec @code{\\partcombine} commentée.
+
+"
+  doctitlefr = "Combinaison de deux parties sur une même portée"
+
 
   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.
+directions such as @qq{solo} or @qq{a2} are added by default; to remove
+them, simply set the property @code{printPartCombineTexts} to @code{f}.
+For vocal scores (hymns), there is no need to add @qq{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
@@ -86,15 +106,15 @@ musicDown = \relative c'' {
   <<
     <<
     \new Staff {
-      \set Staff.instrumentName = "Standard polyphony  "
+      \set Staff.instrumentName = #"Standard polyphony"
       << \musicUp \\ \musicDown >>
     }
     \new Staff \with { printPartCombineTexts = ##f } {
-      \set Staff.instrumentName = "PartCombine without texts  "
+      \set Staff.instrumentName = #"PartCombine without texts"
       \partcombine \musicUp \musicDown
     }
     \new Staff {
-      \set Staff.instrumentName = "PartCombine with texts  "
+      \set Staff.instrumentName = #"PartCombine with texts"
       \partcombine \musicUp \musicDown
     }
     >>