Merge remote-tracking branch 'origin/master' into 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 dcefd10dc050ae27736a59f96a2c1ea5635586f9..b30f7e73931ef0aa602efd175fdbf75dba37cf25 100644 (file)
--- a/Documentation/snippets/conducting-signs,-measure-grouping-signs.ly
+++ b/Documentation/snippets/conducting-signs,-measure-grouping-signs.ly
@@ -1,96 +1,49 @@
-% Do not edit this file; it is automatically
+% DO NOT EDIT this file manually; it is automatically

 % generated from Documentation/snippets/new
 % 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.
 % This file is in the public domain.

-%% Note: this file works from version 2.13.4
-\version "2.13.16"
+%% Note: this file works from version 2.16.0
+\version "2.16.0"

 
 \header {
 
 \header {

-%% Translation of GIT committish: 00ef2ac3dd16e21c9ffdffaa4d6d043a3f1a76e6
-  texidoces = "
-La agrupación de pulsos dentro de un compás está controlada por la
-agrupación predeterminada que se establece en @code{beamSettings}.
-Estas agrupaciones se pueden establecer mediante el uso de
-@code{\\overrideBeamSettings}.  De forma alternativa, se puede usar la
-función de Scheme @code{set-time-signature} para establecer tanto el
-compás como la regla de agrupamiento predeterminada.
-@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.  Si el grabador @code{Measure_grouping_engraver} está incluido
-en uno de los contextos de presentación, se imprimirán signos de
-agrupación de pulsos.  Estos símbolos facilitan la lectura de música
-moderna rítmicamente compleja.  En este ejemplo, el compás de 9/8 se
-agrupa según dos patrones distintos utilizando los dos métodos,
-mientras que el compás de 5/8 se agrupa de acuerdo con el ajuste
-predeterminado que está en @file{scm/beam-settings.scm}:
-
-"
-doctitlees = "Símbolos de dirección y símbolos de agrupación de compás"
-
-
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
-  texidocde = "
-Optionen, mit denen die Balken in einem Takt gruppiert werden, sind
-durch die Scheme-Funktion @code{set-time-signature} erhältlich, die
-drei Argumente braucht:  Die Zahl der Taktschläge, die Länge des
-Schlages und die interne gruppieren von Balken in dem Takt.  Wenn der
-@code{Measure_grouping_engraver} hinzugefügt worden ist, erstellt
-diese Funktion auch @code{MeasureGrouping}-(Taktgruppen)-Zeichen.  Derartige
-Zeichen erleichtern das Lesen von rhythmisch komplexer Musik.  In dem
-Beispiel ist der 9/8-Takt in 2, 2, 2 und 3 aufgeteilt.  Das wird
-der @code{set-time-signature}-Funktion als das dritte Argument mitgegeben:
-@code{'(2 2 2 3)}:
-
-"
-  doctitlede = "Dirigirzeichen Taktgruppenzeichen"
-
-
-
-%% Translation of GIT committish: 7b70644b95f383b4281e9ffa146d315d2ada11d3
-  texidocfr = "
-Les règles de ligature par mesure sont gérées par la propriété
-@code{beamSettings}.  Elles peuvent être modifiées par la commande
-@code{\\overrideBeamSettings}.  
-Il existe des options qui permettent de grouper les ligatures au sein
-d'une mesure, grâce à la fonction Scheme @code{set-time-signature}.
-Celle-ci prend trois arguments : le nombre de pulsations, la durée de la
-pulsation et le regroupement des pulsations dans la mesure.  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}}.
-
-"
-  doctitlefr = "Signes de direction signes de sous-groupe"
-

   lsrtags = "rhythms"
   texidoc = "
   lsrtags = "rhythms"
   texidoc = "

-Beat grouping within a bar is controlled by the default grouping
-established in @code{beamSettings}.  This grouping can be established
-by the use of @code{\\overrideBeamSettings}.  Alternatively, the
-Scheme function @code{set-time-signature} can be used to both
-set the time signature and establish the default grouping rule.
-@code{set-time-signature}, takes three arguments: the
-number of beats, the beat length, and the internal grouping of beats in
-the measure.  If the @code{Measure_grouping_engraver} is included
+Beat grouping within a measure is controlled by the context property
+@code{beatStructure}.  Values of @code{beatStructure} are
+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, @code{\\time} can be used to both
+set the time signature and establish the beat structure.
+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
 created.  Such signs ease reading rhythmically complex modern music.
 In the example, the 9/8 measure is grouped in two different
 patterns using the two different methods, while the 5/8 measure
 is grouped according to the default setting in
 in one of the display contexts, measure grouping signs will be
 created.  Such signs ease reading rhythmically complex modern music.
 In the example, the 9/8 measure is grouped in two different
 patterns using the two different methods, while the 5/8 measure
 is grouped according to the default setting in

-@file{scm/beam-settings.scm}:
+@file{scm/time-signature-settings.scm}:

 "
   doctitle = "Conducting signs measure grouping signs"
 } % begin verbatim
 
 
 "
   doctitle = "Conducting signs measure grouping signs"
 } % begin verbatim
 
 

+

 \score {
 \score {

-  \relative c'' {
+  \new Voice \relative c'' {

     \time 9/8
     \time 9/8

-    \overrideBeamSettings #'Score #'(9 . 8) #'end #'((* . (2 2 2 3)))

     g8 g d d g g a( bes g) |
     g8 g d d g g a( bes g) |

-    #(set-time-signature 9 8 '(4 5))
+    \set Timing.beatStructure = #'(2 2 2 3)
+    g8 g d d g g a( bes g) |
+    \time #'(4 5) 9/8

     g8 g d d g g a( bes g) |
     \time 5/8
     a4. g4 |
     g8 g d d g g a( bes g) |
     \time 5/8
     a4. g4 |