X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fsnippets%2Fconducting-signs%2C-measure-grouping-signs.ly;h=060b3faf2a3fbbf602380ab7a38b7b1d7d83e40c;hb=76e75986e490c66ef6b141a9465d540824d6f71e;hp=d9fdc16f529f288a712c88ff710f5cafc8e694bd;hpb=1c859650b6ff11a7dbe829328fd5cae3816b9231;p=lilypond.git

diff --git a/Documentation/snippets/conducting-signs,-measure-grouping-signs.ly b/Documentation/snippets/conducting-signs,-measure-grouping-signs.ly
index d9fdc16f52..060b3faf2a 100644
--- a/Documentation/snippets/conducting-signs,-measure-grouping-signs.ly
+++ b/Documentation/snippets/conducting-signs,-measure-grouping-signs.ly
@@ -1,84 +1,49 @@
-%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.di.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
 %% This file is in the public domain.
-\version "2.13.1"
+\version "2.18.0"
 
 \header {
   lsrtags = "rhythms"
 
-%% Translation of GIT committish: 151f1bb8c0aae8294e62d0470246ee1019aedfbc
-  texidoces = "
-Las opciones para agrupar los pulsos de un compás están a nuestra
-disposición a través de la función de Scheme
-@code{set-time-signature}, que acepta tres argumentos: el número
-de pulsos, la longitud del pulso, y la agrupación interna de los
-pulsos dentro del compás.  Si se incluye el grabador
-@code{Measure_grouping_engraver}, la función crea también símbolos
-de agrupación @code{MeasureGrouping}.  Dichos símbolos facilitan
-la lectura de la música moderna de cierta complejidad rítmica.  En
-el ejemplo, el compás de 9/8 se subdivide en 2, 2, 2 y 3.  Esto se
-pasa a la función @code{set-time-signature} como tercer argumento:
-@code{'(2 2 2 3)}:
-
-"
-doctitlees = "Símbolos de dirección, símbolos de agrupación de compás"
-
-%% Translation of GIT committish: 0364058d18eb91836302a567c18289209d6e9706
-  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: b3196fadd8f42d05ba35e8ac42f7da3caf8a3079
-  texidocfr = "
-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 este divisée en 2, 2, 2 et 3.  Ceci est fourni en tant que troisième
-argument à @code{set-time-signature} : @code{'(2 2 2 3)}.
-
-"
-  doctitlefr = "Signes de direction, signes de sous-groupe"
-
   texidoc = "
-Options to group beats within a bar are available through the Scheme
-function @code{set-time-signature}, which 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, the
-function will also create @code{MeasureGrouping} signs.  Such signs
-ease reading rhythmically complex modern music.  In the example, the
-9/8 measure is subdivided in 2, 2, 2 and 3.  This is passed to
-@code{set-time-signature} as the third argument: @code{'(2 2 2 3)}:
+Beat grouping within a measure is controlled by the context property
+@code{beatStructure}.  Values of @code{beatStructure} are established
+for many time signatures in @code{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 @code{scm/time-signature-settings.scm}:
 
 "
-  doctitle = "Conducting signs, measure grouping signs"
+  doctitle = "Conducting signs measure grouping signs"
 } % begin verbatim
 
 \score {
-  \relative c'' {
-    #(set-time-signature 9 8 '(2 2 2 3))
-    #(revert-auto-beam-setting '(end * * 9 8) 3 8)
-    #(override-auto-beam-setting '(end 1 8 9 8) 1 4)
-    #(override-auto-beam-setting '(end 1 8 9 8) 2 4)
-    #(override-auto-beam-setting '(end 1 8 9 8) 3 4)
+  \new Voice \relative c'' {
+    \time 9/8
     g8 g d d g g a( bes g) |
-    #(set-time-signature 5 8 '(3 2))
-    a4. g4
+    \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 |
   }
   \layout {
     \context {
@@ -87,4 +52,3 @@ ease reading rhythmically complex modern music.  In the example, the
     }
   }
 }
-