From 5ad974e9c62a2506cf2b064a24138024ec4aae1a Mon Sep 17 00:00:00 2001 From: Trevor Daniels Date: Tue, 4 Nov 2008 09:04:51 +0000 Subject: [PATCH] Remove beam ending rules in 6/8, 9/8 and 12/8 time - Now that beatGrouping works correctly, beam ending rules are not required for those values of beatGrouping that are set up by default in scm/music-functions.scm. At present these are set just for 6/8, 9/8 and 12/8 signatures. - The beam ending rules for 1/32 notes are retained, however, but are extended to cover those moments which previously were covered by the deleted rules. --- scm/auto-beam.scm | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/scm/auto-beam.scm b/scm/auto-beam.scm index 3e04ea81a0..f22499aa3a 100644 --- a/scm/auto-beam.scm +++ b/scm/auto-beam.scm @@ -90,34 +90,32 @@ ((end * * 4 16) . ,(ly:make-moment 1 8)) ;; in 6 8, 9 8 and 12 8 time: - ;; end beams every 3 8 ths + ;; use beatGrouping for all except 1 32nd notes ;; end beams with 32nd notes every 1 8 note - ((end * * 6 8) . ,(ly:make-moment 3 8)) ((end 1 32 6 8) . ,(ly:make-moment 1 8)) - ((end 1 32 6 8) . ,(ly:make-moment 1 4)) - ((end 1 32 6 8) . ,(ly:make-moment 1 2)) + ((end 1 32 6 8) . ,(ly:make-moment 2 8)) + ((end 1 32 6 8) . ,(ly:make-moment 3 8)) + ((end 1 32 6 8) . ,(ly:make-moment 4 8)) ((end 1 32 6 8) . ,(ly:make-moment 5 8)) - ((end * * 9 8) . ,(ly:make-moment 3 8)) - ((end * * 9 8) . ,(ly:make-moment 3 4)) ((end 1 32 9 8) . ,(ly:make-moment 1 8)) - ((end 1 32 9 8) . ,(ly:make-moment 1 4)) - ((end 1 32 9 8) . ,(ly:make-moment 1 2)) + ((end 1 32 9 8) . ,(ly:make-moment 2 8)) + ((end 1 32 9 8) . ,(ly:make-moment 3 8)) + ((end 1 32 9 8) . ,(ly:make-moment 4 8)) ((end 1 32 9 8) . ,(ly:make-moment 5 8)) + ((end 1 32 9 8) . ,(ly:make-moment 6 8)) ((end 1 32 9 8) . ,(ly:make-moment 7 8)) - ((end 1 32 9 8) . ,(ly:make-moment 1 1)) - ((end * * 12 8) . ,(ly:make-moment 3 8)) - ((end * * 12 8) . ,(ly:make-moment 3 4)) - ((end * * 12 8) . ,(ly:make-moment 9 8)) ((end 1 32 12 8) . ,(ly:make-moment 1 8)) - ((end 1 32 12 8) . ,(ly:make-moment 1 4)) - ((end 1 32 12 8) . ,(ly:make-moment 1 2)) + ((end 1 32 12 8) . ,(ly:make-moment 2 8)) + ((end 1 32 12 8) . ,(ly:make-moment 3 8)) + ((end 1 32 12 8) . ,(ly:make-moment 4 8)) ((end 1 32 12 8) . ,(ly:make-moment 5 8)) + ((end 1 32 12 8) . ,(ly:make-moment 6 8)) ((end 1 32 12 8) . ,(ly:make-moment 7 8)) - ((end 1 32 12 8) . ,(ly:make-moment 1 1)) - ((end 1 32 12 8) . ,(ly:make-moment 5 4)) + ((end 1 32 12 8) . ,(ly:make-moment 9 8)) + ((end 1 32 12 8) . ,(ly:make-moment 10 8)) ((end 1 32 12 8) . ,(ly:make-moment 11 8)) )) -- 2.39.5