X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fauto-beam.scm;h=14e0209675d02c1b220745d39c14c46271625b2b;hb=bb0acf78567a60b30623792e87399f695ac26d71;hp=564be84af428124ac12ba29838768f3387c55f77;hpb=4ba016b96df4ec610212643c445bf96c019e3d70;p=lilypond.git diff --git a/scm/auto-beam.scm b/scm/auto-beam.scm index 564be84af4..14e0209675 100644 --- a/scm/auto-beam.scm +++ b/scm/auto-beam.scm @@ -1,141 +1,120 @@ -;;; -;;; auto-beam.scm -- Auto-beam-engraver settings -;;; -;;; source file of the GNU LilyPond music typesetter -;;; -;;; (c) 2000--2003 Jan Nieuwenhuizen -;;; - -;;; specify generic beam begin and end times - -;;; format: -;;; -;;; function shortest-duration-in-beam time-signature -;;; -;;; where -;;; -;;; function = begin or end -;;; shortest-duration-in-beam = numerator denominator; eg: 1 16 -;;; time-signature = numerator denominator, eg: 4 4 -;;; -;;; unspecified or wildcard entries for duration or time-signature -;;; are given by * * - -;;; maybe do: '(end shortest-1 16 time-3 4) ? - -;;; in 3 2 time: -;;; end beams each 1 2 note -;;; end beams with 16th notes each 1 4 note -;;; end beams with 32th notes each 1 8 note - -(define-public default-auto-beam-settings - `( - ((end * * 3 2) . ,(ly:make-moment 1 2)) - ((end 1 16 3 2) . ,(ly:make-moment 1 4)) - ((end 1 32 3 2) . ,(ly:make-moment 1 8)) - - ((begin 1 8 3 4) . ,(ly:make-moment 1 4)) - - ((end * * 3 4) . ,(ly:make-moment 3 4)) - ((begin 1 16 3 4) . ,(ly:make-moment 1 16)) - ((end 1 16 3 4) . ,(ly:make-moment 1 4)) - ;;((begin 1 32 3 4) . ,(ly:make-moment 1 8)) - ((end 1 32 3 4) . ,(ly:make-moment 1 8)) - - ((begin 1 16 3 8) . ,(ly:make-moment 1 8)) - ((end * * 3 8) . ,(ly:make-moment 3 8)) - - ;; in common time: - ;; end beams each 1 2 note - ;; end beams with 32th notes each 1 8 note - ;; end beams with 1 8 triplets each 1 4 note - - ((end * * 4 4) . ,(ly:make-moment 1 2)) - ((end 1 12 4 4) . ,(ly:make-moment 1 4)) - ((end 1 16 4 4) . ,(ly:make-moment 1 4)) - ((end 1 32 4 4) . ,(ly:make-moment 1 8)) - - ((end * * 2 4) . ,(ly:make-moment 1 4)) - ((end 1 12 2 4) . ,(ly:make-moment 1 4)) - ((end 1 16 2 4) . ,(ly:make-moment 1 4)) - ((end 1 32 2 4) . ,(ly:make-moment 1 8)) - - ;; It seems that, because of a bug in the previous auto-beamer, - ;; we had the effect of this setting x - ;; ((end * * 2 8) . ,(ly:make-moment 2 8)) - - ((end * * 4 8) . ,(ly:make-moment 1 4)) - ((end 1 16 4 8) . ,(ly:make-moment 1 4)) - ((end 1 32 4 8) . ,(ly:make-moment 1 8)) - - ((end * * 4 16) . ,(ly:make-moment 1 8)) - - ((end * * 6 8) . ,(ly:make-moment 3 8)) - ((end 1 16 6 8) . ,(ly:make-moment 3 8)) - ((end 1 32 6 8) . ,(ly:make-moment 1 8)) - - ((end * * 9 8) . ,(ly:make-moment 3 8)) - ((end 1 16 9 8) . ,(ly:make-moment 3 8)) - ((end 1 32 9 8) . ,(ly:make-moment 1 8)) - - ((end * * 12 8) . ,(ly:make-moment 3 8)) - ((end 1 16 12 8) . ,(ly:make-moment 3 8)) - ((end 1 32 12 8) . ,(ly:make-moment 1 8)) - )) - - -(define (override-property-setting context context-prop setting value) - "Like the C++ code that executes \\override, but without type -checking. " - - (ly:set-context-property! context context-prop - (cons (cons setting value) - (ly:get-context-property context context-prop) - ) - ) - ) - -(define (revert-property-setting context setting) - "Like the C++ code that executes \revert, but without type -checking. " - - (define (revert-assoc alist key) - "Return ALIST, with KEY removed. ALIST is not modified, instead -a fresh copy of the list-head is made." - (cond - ((null? alist) '()) - ((equal? (caar alist) key) (cdr alist)) - (else (cons (car alist) (revert-assoc alist key))) - )) - - - - (ly:set-context-property! - context context-prop - (revert-assoc (ly:get-context-property context context-prop) - setting)) - ) - -(define-public (override-auto-beam-setting setting num den) - (ly:export - (context-spec-music - (make-apply-context (lambda (c) - (override-property-setting - c 'autoBeamSettings - setting (ly:make-moment num den)) - )) - 'Voice) - )) - -(define-public (revert-auto-beam-setting setting) - (ly:export - (context-spec-music - (make-apply-context (lambda (c) - (revert-property-setting - c 'autoBeamSettings - setting))) - - 'Voice))) - - - +;;;; This file is part of LilyPond, the GNU music typesetter. +;;;; +;;;; Copyright (C) 2000--2012 Jan Nieuwenhuizen +;;;; +;;;; LilyPond is free software: you can redistribute it and/or modify +;;;; it under the terms of the GNU General Public License as published by +;;;; the Free Software Foundation, either version 3 of the License, or +;;;; (at your option) any later version. +;;;; +;;;; LilyPond is distributed in the hope that it will be useful, +;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;;; GNU General Public License for more details. +;;;; +;;;; You should have received a copy of the GNU General Public License +;;;; along with LilyPond. If not, see . + +;; Determine whether an auto beam should be extended to the right +;; of the current stem. We start anywhere, except mid-measure in +;; 3/4 time. We end according to the follwing rules, in order of +;; decreasing priority: +;; +;; 1. end +;; 2. end +;; 3. if 1-2 not specified, end at beatStructure intervals +;; +;; Rationale: +;; +;; [user override] +;; 1. override for specific duration type +;; 2. overrides apply to shorter durations +;; +;; defined in scm/time-signature-settings.scm: +;; 1. Default grouping for common time signatures + +(define-public (default-auto-beam-check context dir measure-pos test-beam) + (define (get name default) + (let ((value (ly:context-property context name))) + (if (not (null? value)) value default))) + + (define (beamingmoment (car a)) + (fraction->moment (car b)))) + + (define (ending-moments group-list start-beat base-moment) + (if (null? group-list) + '() + (let ((new-start (+ start-beat (car group-list)))) + (cons (ly:moment-mul (ly:make-moment new-start 1) base-moment) + (ending-moments (cdr group-list) new-start base-moment))))) + + (define (larger-setting test-beam sorted-alist) + (if (null? sorted-alist) + '() + (let* ((first-key (caar sorted-alist)) + (first-moment (fraction->moment first-key))) + (if (moment<=? test-beam first-moment) + (car sorted-alist) + (larger-setting test-beam (cdr sorted-alist)))))) + + (define (beat-end? moment beat-structure) + (pair? (member moment beat-structure))) ;; member returns a list if found, not #t + + ;; Start of actual auto-beam test routine + ;; + ;; + ;; Don't start auto beams on grace notes + (if (and (!= (ly:moment-grace-numerator (ly:context-now context)) 0) + (= dir START)) + #f + (let* ((base-moment (get 'baseMoment (ly:make-moment 1 4))) + (measure-length (get 'measureLength (ly:make-moment 1 1))) + (time-signature-fraction + (get 'timeSignatureFraction '(4 . 4))) + (beat-structure (get 'beatStructure '(1 1 1 1))) + (beat-endings (ending-moments beat-structure 0 base-moment)) + (exceptions (sort (assoc-get 'end + (get 'beamExceptions '()) + '()) + beamingfraction test-beam)) + (non-grace (ly:make-moment + (ly:moment-main-numerator measure-pos) + (ly:moment-main-denominator measure-pos))) + (pos (if (ly:momentmoment default-beat-length) + test-beam)) + (exception-moments (ending-moments + exception-grouping 0 grouping-moment))) + + (if (= dir START) + ;; Start rules -- #t if beam is allowed to start + (or beam-half-measure ;; Start anywhere, but option for mid-measure + (not (equal? (ly:moment-add pos pos) measure-length)) + (not (= 3 (car time-signature-fraction))) ;; in triple meter + (not (= (cdr type) ;; when the beamed note is 1/6 of a measure + (* 2 (cdr time-signature-fraction))))) + ;; End rules -- #t if beam is required to end + (or (= (ly:moment-main-numerator pos) 0) ;; end at measure beginning + (if (null? exception-grouping) + (beat-end? pos beat-endings) ;; no exception, so check beat ending + (member pos exception-moments))))))) ;; check exception rule