Merge branch 'master' into lilypond/translation

[lilypond.git] / Documentation / snippets / reverting-default-beam-endings.ly

diff --git a/Documentation/snippets/reverting-default-beam-endings.ly b/Documentation/snippets/reverting-default-beam-endings.ly
index 9b5666f29464660801485739642d238d08d0b349..893bc31a32ea748064f2357c012cffde263339a8 100644 (file)
--- a/Documentation/snippets/reverting-default-beam-endings.ly
+++ b/Documentation/snippets/reverting-default-beam-endings.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.20"
 
 \header {
-  lsrtags = "rhythms"
-
-%% Translation of GIT committish: 151f1bb8c0aae8294e62d0470246ee1019aedfbc
+%% Translation of GIT committish: e0aa246e0ed1a86dc41a99ab79bff822d3320aa7
   texidoces = "
 Para tipografiar las barras agrupadas en la forma @code{3-4-3-2}
 en 12/8, en primer lugar tenemos que sobreescribir los finales de
@@ -16,7 +16,8 @@ barra nuevos:
   doctitlees = "Alteración de los finales de barra predeterminados"
 
 
-%% Translation of GIT committish: 0364058d18eb91836302a567c18289209d6e9706
+
+%% Translation of GIT committish: 0a868be38a775ecb1ef935b079000cebbc64de40
   texidocde = "
 Um Balken im 12/8-Takt als @code{3-4-3-2} zu gruppieren, muss man zuerst die
 Standardwerte für die Balken im 12/8-Takt rückgängig machen und dann die neuen
@@ -25,31 +26,35 @@ Werte setzen:
 "
   doctitlede = "Standard-Balkenwerte rückgängig machen"
 
-  texidoc = "
-To typeset beams grouped @code{3-4-3-2} in 12/8 it is necessary first
-to override the default beam endings  in 12/8, and then to set up the
-new beaming endings: 
 
+
+%% Translation of GIT committish: 548076f550a2b7fb09f1260f0e5e2bb028ad396c
+  texidocfr = "
+Pour obtenir des ligatures en groupes de @code{3-4-3-2} croches, dans
+une mesure à 12/8, il faudra préalablement annuler les réglages par
+défaut relatifs à 12/8, puis ajouter nos propres règles :
+
+"
+  doctitlefr = "Annulation des règles de ligature par défaut"
+
+  lsrtags = "rhythms"
+  texidoc = "
+To typeset beams grouped @code{3-4-3-2} in 12/8 it is no longer
+necessary first to override the default beam endings in 12/8,and
+then to set up the new beaming endings:
 "
   doctitle = "Reverting default beam endings"
 } % begin verbatim
 
+
 \relative c'' {
   \time 12/8
 
   % Default beaming
   a8 a a a a a a a a a a a
 
-  % Revert default values in scm/auto-beam.scm for 12/8 time
-  #(revert-auto-beam-setting '(end * * 12 8) 3 8)
-  #(revert-auto-beam-setting '(end * * 12 8) 3 4)
-  #(revert-auto-beam-setting '(end * * 12 8) 9 8)
-  a8 a a a a a a a a a a a
-
   % Set new values for beam endings
-  #(override-auto-beam-setting '(end * * 12 8) 3 8)
-  #(override-auto-beam-setting '(end * * 12 8) 7 8)
-  #(override-auto-beam-setting '(end * * 12 8) 10 8)
+  \overrideBeamSettings #'Score #'(12 . 8) #'end
+    #'((* . (3 4 3 2)))
   a8 a a a a a a a a a a a
 }
-