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 c03eaf34c17cdb0a5f12749c891d243e73674a6c..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 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 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.14.0
+\version "2.14.0"
 
 \header {
-  lsrtags = "rhythms"
-
-%% Translation of GIT committish: 151f1bb8c0aae8294e62d0470246ee1019aedfbc
+%% 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
@@ -15,8 +18,9 @@ compás de 7/8, especificamos los finales de barra en 2/8 y 5/8:
 
 "
   doctitlees = "Agrupamiento de las barras en el compás de 7/8"
-  
-%% Translation of GIT committish: 6ce7f350682dfa99af97929be1dec6b9f1cbc01a
+
+
+%% Translation of GIT committish: 0a868be38a775ecb1ef935b079000cebbc64de40
 texidocde = "
 Es gibt keine automatischen Balkengruppen für 7/8-Takte.  Wenn diese
 Taktart benötigt wird, müssen die Gruppierungen definiert werden.  Um
@@ -26,22 +30,32 @@ für 2/8 und 5/8 definiert werden:
 "
   doctitlede = "Balkengruppen für 7/8-Takte"
 
-  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: 
+
+%% 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,
+il faudra donc définir les terminaisons de 2/8 et 5/8 :
 
+"
+  doctitlefr = "Règle de ligature dans une mesure à 7/8"
+
+  lsrtags = "rhythms"
+  texidoc = "
+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
 
+
 \relative c'' {
   \time 7/8
   % rhythm 2-3-2
   a8 a a a a a a
-  #(override-auto-beam-setting '(end * * 7 8) 2 8)
-  #(override-auto-beam-setting '(end * * 7 8) 5 8)
+  \set Score.beatStructure = #'(2 3 2)
   a8 a a a a a a
 }
-