Web: a more greenish 'squiggle'

[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 d9fdc16f529f288a712c88ff710f5cafc8e694bd..a1eb77eeda798ea098e500782619f18b7f645851 100644 (file)
--- a/Documentation/snippets/conducting-signs,-measure-grouping-signs.ly
+++ b/Documentation/snippets/conducting-signs,-measure-grouping-signs.ly
@@ -1,11 +1,11 @@
-%% 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.13.1"
+% Do not edit this file; it is automatically
+% generated from Documentation/snippets/new
+% This file is in the public domain.
+%% Note: this file works from version 2.13.4
+\version "2.13.4"
 
 \header {
-  lsrtags = "rhythms"
-
-%% Translation of GIT committish: 151f1bb8c0aae8294e62d0470246ee1019aedfbc
+%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
   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
@@ -20,9 +20,10 @@ 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"
+doctitlees = "Símbolos de dirección símbolos de agrupación de compás"
+
 
-%% Translation of GIT committish: 0364058d18eb91836302a567c18289209d6e9706
+%% 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
@@ -36,49 +37,59 @@ der @code{set-time-signature}-Funktion als das dritte Argument mitgegeben:
 @code{'(2 2 2 3)}:
 
 "
-  doctitlede = "Dirigirzeichen, Taktgruppenzeichen"
+  doctitlede = "Dirigirzeichen Taktgruppenzeichen"
 
 
-%% Translation of GIT committish: b3196fadd8f42d05ba35e8ac42f7da3caf8a3079
+
+%% 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 
+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)}.
+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"
+  doctitlefr = "Signes de direction signes de sous-groupe"
 
+  lsrtags = "rhythms"
   texidoc = "
-Options to group beats within a bar are available through the Scheme
-function @code{set-time-signature}, which takes three arguments: the
+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, 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)}:
-
+the measure.  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
+@file{scm/beam-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)
+    \time 9/8
+    \overrideBeamSettings #'Score #'(9 . 8) #'end #'((* . (2 2 2 3)))
     g8 g d d g g a( bes g) |
-    #(set-time-signature 5 8 '(3 2))
-    a4. g4
+    #(set-time-signature 9 8 '(4 5))
+    g8 g d d g g a( bes g) |
+    \time 5/8
+    a4. g4 |
   }
   \layout {
     \context {
@@ -87,4 +98,3 @@ ease reading rhythmically complex modern music.  In the example, the
     }
   }
 }
-