Merge branch 'master' into lilypond/translation

[lilypond.git] / Documentation / snippets / conducting-signs,-measure-grouping-signs.ly

diff --git a/Documentation/snippets/conducting-signs,-measure-grouping-signs.ly b/Documentation/snippets/conducting-signs,-measure-grouping-signs.ly
index a6e8abe2b55e62c54247d55f32efe5c1b6b71750..9b48fcac3176f5849f12126bddb57ce8e311d9c5 100644 (file)
--- a/Documentation/snippets/conducting-signs,-measure-grouping-signs.ly
+++ b/Documentation/snippets/conducting-signs,-measure-grouping-signs.ly
@@ -1,26 +1,29 @@
-% Do not edit this file; it is automatically
+% DO NOT EDIT this file manually; it is automatically
 % generated from Documentation/snippets/new
+% Make any changes in Documentation/snippets/new/
+% and then run scripts/auxiliar/makelsr.py
+%
 % This file is in the public domain.
-%% Note: this file works from version 2.13.36
-\version "2.13.36"
+%% Note: this file works from version 2.15.19
+\version "2.15.19"
 
 \header {
-%% Translation of GIT committish: fa19277d20f8ab0397c560eb0e7b814bd804ecec
+%% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
 La agrupación de pulsos dentro de un compás está controlada por la
 propiedad de contexto @code{beatStructure}.  Hay establecidos valores
 de @code{beatStructure} para muchos tipos de compases en
 @file{scm/time-signature-settings.scm}.  Los valores de
 @code{beatStructure} se pueden cambiar o establecer con @code{\\set}.
-Como alternativa, se puede usar la función de Scheme
-@code{set-time-signature} para establecer tanto el compás como la
-estructura de pulsos.  @code{set-time-signature} acepta tres
-argumentos: el número de pulsos, la longitud del pulso y la agrupación
-interna de los pulsos en el compás.  Tanto @code{\\time} como
-@code{set-time-signature} se aplican al contexto @code{Timing}, por lo
-que no restablecen los valores de @code{beatStructure} ni de
-@code{baseMoment} que se establezcan en otros contextos de nivel
-inferior, como @code{Voice}.
+Como alternativa, se puede usar @code{\\time} para establecer tanto el
+compás como la estructura de pulsos.  Para ello, especificamos la
+agrupación interna de los pulsos del compás como una lista de números
+(en la sintaxis de Scheme) antes de la indicación de compás.
+
+@code{\\time} se aplica al contexto @code{Timing}, por lo que no
+restablece los valores de @code{beatStructure} ni de @code{baseMoment}
+que se establezcan en otros contextos de nivel inferior, como
+@code{Voice}.
 
 Si el grabador @code{Measure_grouping_engraver} está incluido en uno
 de los contextos de presentación, se imprimirán signos de agrupación
@@ -52,7 +55,7 @@ der @code{set-time-signature}-Funktion als das dritte Argument mitgegeben:
 
 
 
-%% Translation of GIT committish: 190a067275167c6dc9dd0afef683d14d392b7033
+%% Translation of GIT committish: 3b125956b08d27ef39cd48bfa3a2f1e1bb2ae8b4
   texidocfr = "
 Les règles de ligature par mesure sont gérées par la propriété
 @code{beatStructure}.  Ses valeurs par défaut sont répertoriées, par
@@ -67,12 +70,14 @@ regroupement des pulsations dans la mesure.   @code{\\time} et
 @code{beatStructure} ou @code{baseMoment} lorsque qu'elles sont
 modifiées dans un contexte de niveau inférieur comme @code{Voice} par
 exemple.
+
 Si l'on fait appel au @code{Measure_grouping_engraver}, la fonction
 @code{set-time-signature} créera aussi des symboles
 @code{MeasureGrouping}.  Ces symboles aident à la lecture des œuvres
 modernes à la rythmique complexe.  Dans l'exemple qui suit, la mesure à
 9/8 est divisée en 2, 2, 2 et 3, alors que la mesure à 5/8 répond aux
-règles par défaut contenues dans le fichier @w{@code{scm/@/beam@/-settings@/.scm}}.
+règles par défaut contenues dans le fichier
+@w{@code{scm/@/beam@/-settings@/.scm}}.
 
 "
   doctitlefr = "Signes de direction signes de sous-groupe"
@@ -84,15 +89,14 @@ Beat grouping within a measure is controlled by the context property
 established for many time signatures in
 @file{scm/time-signature-settings.scm}.  Values of @code{beatStructure}
 can be changed or set with @code{\\set}.
-Alternatively, the
-Scheme function @code{set-time-signature} can be used to both
+Alternatively, @code{\\time} can be used to both
 set the time signature and establish the beat structure.
-@code{set-time-signature}, takes three arguments: the
-number of beats, the beat length, and the internal grouping of beats in
-the measure.  @code{\\time} and @code{set-time-signature} both apply
-to the @code{Timing} context, so they will not reset values of
-@code{beatStructure} or @code{baseMoment} that are set in
-other lower-level contexts, such as @code{Voice}.
+For this, you specify the internal grouping of beats in a measure
+as a list of numbers (in Scheme syntax) before the time signature.
+
+@code{\\time} applies to the @code{Timing} context, so it will not
+reset values of @code{beatStructure} or @code{baseMoment} that are set
+in other lower-level contexts, such as @code{Voice}.
 
 If the @code{Measure_grouping_engraver} is included
 in one of the display contexts, measure grouping signs will be
@@ -113,7 +117,7 @@ is grouped according to the default setting in
     g8 g d d g g a( bes g) |
     \set Timing.beatStructure = #'(2 2 2 3)
     g8 g d d g g a( bes g) |
-    #(set-time-signature 9 8 '(4 5))
+    \time #'(4 5) 9/8
     g8 g d d g g a( bes g) |
     \time 5/8
     a4. g4 |