Merge branch 'master' of git://git.savannah.gnu.org/lilypond.git

[lilypond.git] / Documentation / snippets / beam-endings-in-score-context.ly

diff --git a/Documentation/snippets/beam-endings-in-score-context.ly b/Documentation/snippets/beam-endings-in-score-context.ly
index 9e12eb16105af04bc758bb9b174dd2189450ff41..414fac1bb707b822dcaf24cd80649aad913a6b0c 100644 (file)
--- a/Documentation/snippets/beam-endings-in-score-context.ly
+++ b/Documentation/snippets/beam-endings-in-score-context.ly
@@ -1,20 +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 {
-%% Translation of GIT committish: 21c8461ea87cd670a35a40b91d3ef20de03a0409
-  texidocfr = "
-Les règles de ligatures définies au niveau du contexte @code{Score}
-s'appliqueront à toutes les portées.  Il est toutefois possible de
-moduler au niveau @code{Staff} ou @code{Voice} :
-
-"
-  doctitlefr = "Définition de règles de ligature pour la partition"
-
-  lsrtags = "rhythms"
-
-%% Translation of GIT committish: b2d4318d6c53df8469dfa4da09b27c15a374d0ca
+%% Translation of GIT committish: 70f5f30161f7b804a681cd080274bfcdc9f4fe8c
   texidoces = "
 Las reglas de final de barra especificadas en el contexto
 @code{Score} se aplican a todos los pentagramas, pero se pueden
@@ -24,7 +18,8 @@ modificar tanto en los niveles de @code{Staff} como de
 "
   doctitlees = "Finales de barra en el contexto Score"
 
-%% Translation of GIT committish: d96023d8792c8af202c7cb8508010c0d3648899d
+
+%% Translation of GIT committish: 0a868be38a775ecb1ef935b079000cebbc64de40
   texidocde = "
 Balkenenderegeln, die im @code{Score}-Kontext definiert werden, wirken
 sich auf alle Systeme aus, können aber auf @code{Staff}- und
@@ -35,28 +30,37 @@ sich auf alle Systeme aus, können aber auf @code{Staff}- und
 
 
 
+%% Translation of GIT committish: 190a067275167c6dc9dd0afef683d14d392b7033
+  texidocfr = "
+Les règles de ligatures définies au niveau du contexte @code{Score}
+s'appliqueront à toutes les portées.  Il est toutefois possible de
+moduler au niveau @code{Staff} ou @code{Voice}@tie{}:
+
+"
+  doctitlefr = "Définition de règles de ligature pour la partition"
+
+  lsrtags = "rhythms"
   texidoc = "
-Beam-ending rules specified in the @code{Score} context apply to all
+Beat structure rules specified in the @code{Score} context apply to all
 staves, but can be modified at both @code{Staff} and @code{Voice}
-levels: 
-
+levels:
 "
   doctitle = "Beam endings in Score context"
 } % begin verbatim
 
+
 \relative c'' {
   \time 5/4
   % Set default beaming for all staves
-  #(score-override-auto-beam-setting '(end * * 5 4) 3 8)
-  #(score-override-auto-beam-setting '(end * * 5 4) 7 8)
+  \set Score.baseMoment = #(ly:make-moment 1 8)
+  \set Score.beatStructure = #'(3 4 3)
   <<
     \new Staff {
       c8 c c c c c c c c c
     }
     \new Staff {
       % Modify beaming for just this staff
-      #(override-auto-beam-setting '(end * * 5 4) 6 8 'Staff)
-      #(revert-auto-beam-setting '(end * * 5 4) 7 8 'Staff)
+      \set Staff.beatStructure = #'(6 4)
       c8 c c c c c c c c c
     }
     \new Staff {
@@ -69,12 +73,10 @@ levels:
         % Modify beaming for this voice only
         \new Voice {
           \voiceTwo
-          #(override-auto-beam-setting '(end * * 5 4) 6 8)
-          #(revert-auto-beam-setting '(end * * 5 4) 7 8)
+          \set Voice.beatStructure = #'(6 4)
           a8 a a a a a a a a a
         }
       >>
     }
   >>
 }
-