X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fauto-beam.scm;h=6479969eb8deb1c2b39b2387f8da0600df5ceb1f;hb=101210f95c0bc5c790c3051d35af60a045abacc2;hp=5af3af086c689b09628f795c88e6d69c3ddc5928;hpb=7f3f0083f89d87c5ed0422858e9648fc759e98a4;p=lilypond.git diff --git a/scm/auto-beam.scm b/scm/auto-beam.scm index 5af3af086c..6479969eb8 100644 --- a/scm/auto-beam.scm +++ b/scm/auto-beam.scm @@ -1,10 +1,10 @@ ;;;; auto-beam.scm -- Auto-beam-engraver settings ;;;; ;;;; source file of the GNU LilyPond music typesetter -;;;; -;;;; (c) 2000--2008 Jan Nieuwenhuizen +;;;; +;;;; (c) 2000--2009 Jan Nieuwenhuizen -;;; specify generic beam begin and end times +;;; specify generic beam end times ;;; format: ;;; @@ -23,49 +23,68 @@ (define-public default-auto-beam-settings `( - ;; in 3 2 time: - ;; end beams each 1 2 note - ;; end beams with 16th notes each 1 4 note - ;; end beams with 32nd notes each 1 8 note + ;; in 2 2 time: + ;; use beatLength for all except 32nd notes + ;; end beams with 32nd notes each 1 4 beat - ((end * * 3 2) . ,(ly:make-moment 1 2)) - ((end * * 3 2) . ,(ly:make-moment 2 2)) + ((end 1 32 2 2) . ,(ly:make-moment 1 4)) + ((end 1 32 2 2) . ,(ly:make-moment 2 4)) + ((end 1 32 2 2) . ,(ly:make-moment 3 4)) + + ;; in 3 2 time: + ;; use beatLength for all except 16th and 32nd notes + ;; end beams with 16th notes each 1 4 beat + ;; end beams with 32nd notes each 1 8 beat ((end 1 16 3 2) . ,(ly:make-moment 1 4)) - ((end 1 16 3 2) . ,(ly:make-moment 1 2)) + ((end 1 16 3 2) . ,(ly:make-moment 2 4)) ((end 1 16 3 2) . ,(ly:make-moment 3 4)) + ((end 1 16 3 2) . ,(ly:make-moment 4 4)) ((end 1 16 3 2) . ,(ly:make-moment 5 4)) ((end 1 32 3 2) . ,(ly:make-moment 1 8)) - ((end 1 32 3 2) . ,(ly:make-moment 1 4)) + ((end 1 32 3 2) . ,(ly:make-moment 2 8)) ((end 1 32 3 2) . ,(ly:make-moment 3 8)) - ((end 1 32 3 2) . ,(ly:make-moment 1 2)) + ((end 1 32 3 2) . ,(ly:make-moment 4 8)) ((end 1 32 3 2) . ,(ly:make-moment 5 8)) - ((end 1 32 3 2) . ,(ly:make-moment 3 4)) + ((end 1 32 3 2) . ,(ly:make-moment 6 8)) ((end 1 32 3 2) . ,(ly:make-moment 7 8)) + ((end 1 32 3 2) . ,(ly:make-moment 8 8)) ((end 1 32 3 2) . ,(ly:make-moment 9 8)) - ((end 1 32 3 2) . ,(ly:make-moment 5 4)) + ((end 1 32 3 2) . ,(ly:make-moment 10 8)) ((end 1 32 3 2) . ,(ly:make-moment 11 8)) - ((end * * 3 4) . ,(ly:make-moment 3 4)) + ;; in 2 4 time: + ;; use beatLength for all except 32nd notes + ;; end beams with 32nd notes each 1 8 beat - ((end 1 16 3 4) . ,(ly:make-moment 1 4)) - ((end 1 16 3 4) . ,(ly:make-moment 1 2)) + ((end 1 32 2 4) . ,(ly:make-moment 1 8)) + ((end 1 32 2 4) . ,(ly:make-moment 2 8)) + ((end 1 32 2 4) . ,(ly:make-moment 3 8)) + + ;; in 3 4 time: + ;; override beatLength which would end beams at 1 4 beats + ;; end beams with 16th notes each 1 4 beat + ;; end beams with 32nd notes each 1 8 beat + ((end * * 3 4) . ,(ly:make-moment 3 4)) + ((end 1 16 3 4) . ,(ly:make-moment 1 4)) + ((end 1 16 3 4) . ,(ly:make-moment 2 4)) ((end 1 32 3 4) . ,(ly:make-moment 1 8)) - ((end 1 32 3 4) . ,(ly:make-moment 1 4)) + ((end 1 32 3 4) . ,(ly:make-moment 2 8)) ((end 1 32 3 4) . ,(ly:make-moment 3 8)) - ((end 1 32 3 4) . ,(ly:make-moment 1 2)) + ((end 1 32 3 4) . ,(ly:make-moment 4 8)) ((end 1 32 3 4) . ,(ly:make-moment 5 8)) - ((end * * 3 8) . ,(ly:make-moment 3 8)) - ;; in common time: - ;; end beams each 1 2 note - ;; end beams with 32nd notes each 1 8 note - ;; end beams with 1 8 triplets each 1 4 note + ;; override beatLength which would end beams at 1 4 beats + ;; end all beams at 1 2 beat + ;; end beams with 8th triplets each 1 4 beat + ;; end beams with 16th notes each 1 4 beat + ;; end beams with 32nd notes each 1 8 beat ((end * * 4 4) . ,(ly:make-moment 1 2)) + ((end 1 12 4 4) . ,(ly:make-moment 1 4)) ((end 1 12 4 4) . ,(ly:make-moment 3 4)) @@ -73,25 +92,29 @@ ((end 1 16 4 4) . ,(ly:make-moment 3 4)) ((end 1 32 4 4) . ,(ly:make-moment 1 8)) - ((end 1 32 4 4) . ,(ly:make-moment 1 4)) + ((end 1 32 4 4) . ,(ly:make-moment 2 8)) ((end 1 32 4 4) . ,(ly:make-moment 3 8)) ((end 1 32 4 4) . ,(ly:make-moment 5 8)) - ((end 1 32 4 4) . ,(ly:make-moment 3 4)) + ((end 1 32 4 4) . ,(ly:make-moment 6 8)) ((end 1 32 4 4) . ,(ly:make-moment 7 8)) - ((end * * 2 4) . ,(ly:make-moment 1 4)) - ((end 1 32 2 4) . ,(ly:make-moment 1 8)) - ((end 1 32 2 4) . ,(ly:make-moment 3 8)) + ;; in 3 8 time: + ;; override beatLength which would end beams at 1 8 beats + + ((end * * 3 8) . ,(ly:make-moment 3 8)) + + ;; in 4 8 time + ;; override beatLength which would end beams at 1 8 beats + ;; end all beams at 1 4 beat + ;; end beams with 32nd notes each 1 8 beat ((end * * 4 8) . ,(ly:make-moment 1 4)) ((end 1 32 4 8) . ,(ly:make-moment 1 8)) ((end 1 32 4 8) . ,(ly:make-moment 3 8)) - ((end * * 4 16) . ,(ly:make-moment 1 8)) - ;; in 6 8, 9 8 and 12 8 time: - ;; use beatGrouping for all except 1 32nd notes - ;; end beams with 32nd notes every 1 8 note + ;; use beatGrouping for all except 32nd notes + ;; end beams with 32nd notes each 1 8 beat ((end 1 32 6 8) . ,(ly:make-moment 1 8)) ((end 1 32 6 8) . ,(ly:make-moment 2 8)) @@ -119,6 +142,12 @@ ((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)) + + ;; in 4 16 time + ;; end all beams each 1 8 beat + + ((end * * 4 16) . ,(ly:make-moment 1 8)) + )) (define (override-property-setting context property setting value)