Merge branch 'master' into lilypond/translation

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

diff --git a/Documentation/snippets/new/beam-endings-in-score-context.ly b/Documentation/snippets/new/beam-endings-in-score-context.ly
index 96a2f2c411f5437f13b110b261c943540461e730..890e091ce1ecae3fa3492c3df66c86fb9e92cec9 100644 (file)
--- a/Documentation/snippets/new/beam-endings-in-score-context.ly
+++ b/Documentation/snippets/new/beam-endings-in-score-context.ly
@@ -1,9 +1,9 @@
-\version "2.13.4"
+\version "2.13.29"
 
 \header {
   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:
 "
@@ -13,18 +13,15 @@ levels:
 \relative c'' {
   \time 5/4
   % Set default beaming for all staves
-  \overrideBeamSettings #'Score #'(5 . 4) #'end
-     #'(((1 . 8) . (3 4 3))
-        ((1 . 16) . (6 8 6))
-        ((1 . 32) . (12 16 12)))
+  \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
-      \overrideBeamSettings #'Staff #'(5 . 4) #'end
-        #'((* . (3 2)))
+      \set Staff.beatStructure = #'(6 4)
       c8 c c c c c c c c c
     }
     \new Staff {
@@ -37,8 +34,7 @@ levels:
         % Modify beaming for this voice only
         \new Voice {
           \voiceTwo
-          \overrideBeamSettings #'Voice #'(5 . 4) #'end
-              #'((* . (3 2)))
+          \set Voice.beatStructure = #'(6 4)
           a8 a a a a a a a a a
         }
       >>