Merge branch 'master' into lilypond/translation

[lilypond.git] / Documentation / snippets / beam-grouping-in-7-8-time.ly

diff --git a/Documentation/snippets/beam-grouping-in-7-8-time.ly b/Documentation/snippets/beam-grouping-in-7-8-time.ly
index 8aa690275d7bfdb585d2e91205a7c845bd5dc698..93ebd3e74c1f2df38ec9f89087ca06d890b663e9 100644 (file)
--- a/Documentation/snippets/beam-grouping-in-7-8-time.ly
+++ b/Documentation/snippets/beam-grouping-in-7-8-time.ly
@@ -1,11 +1,14 @@
-% 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.4
-\version "2.13.18"
+%% Note: this file works from version 2.14.0
+\version "2.14.0"
 
 \header {
-%% Translation of GIT committish: 2b0dc29608d6c3f5a03ead4877ae514c647adb74
+%% Translation of GIT committish: 6977ddc9a3b63ea810eaecb864269c7d847ccf98
   texidoces = "
 No está especificada ninguna agrupación predeterminada automática
 de las barras para el compás de 7/8, de forma que si se requieren
@@ -28,8 +31,8 @@ für 2/8 und 5/8 definiert werden:
   doctitlede = "Balkengruppen für 7/8-Takte"
 
 
-%% Translation of GIT committish: 548076f550a2b7fb09f1260f0e5e2bb028ad396c
-texidocfr = "
+%% Translation of GIT committish: 3b125956b08d27ef39cd48bfa3a2f1e1bb2ae8b4
+  texidocfr = "
 Aucune règle de ligature automatique n'est disponible pour une mesure à
 7/8.  Il faudra donc, en pareil cas, définir vous-même les règles de
 regroupement.  Pour, par exemple, ligaturer sur la base de 2/8-3/8-2/8,
@@ -40,10 +43,10 @@ il faudra donc définir les terminaisons de 2/8 et 5/8 :
 
   lsrtags = "rhythms"
   texidoc = "
-There are no default automatic beam groupings specified for 7/8 time,
-so if automatic beams are required the grouping must be specified.  For
-example, to group all beams 2-3-2 in 7/8 time, specify beam endings at
-2/8 and 5/8:
+There is no default beat structure specified for 7/8 time,
+so if automatic beams are required the structure must be specified.  For
+example, to group all beams 2-3-2 in 7/8 time, specify the
+beat structure to be (2 3 2):
 "
   doctitle = "Beam grouping in 7/8 time"
 } % begin verbatim
@@ -53,7 +56,6 @@ example, to group all beams 2-3-2 in 7/8 time, specify beam endings at
   \time 7/8
   % rhythm 2-3-2
   a8 a a a a a a
-  \overrideBeamSettings #'Score #'(7 . 8) #'end
-    #'((* . (2 3 2)))
+  \set Score.beatStructure = #'(2 3 2)
   a8 a a a a a a
 }