X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Ftime-signature-settings.scm;h=59adb1cdde6549ad222c7226439fd1a2d803ee6a;hb=c3510f0a271637b8aaa5b616bb08042f5c071800;hp=42bf5bfd41ee163ec17e74132d43b75c1ac695fd;hpb=144cd434d02e6d90b2fb738eeee99119a7c5e1d2;p=lilypond.git diff --git a/scm/time-signature-settings.scm b/scm/time-signature-settings.scm index 42bf5bfd41..59adb1cdde 100644 --- a/scm/time-signature-settings.scm +++ b/scm/time-signature-settings.scm @@ -1,6 +1,6 @@ ;;;; This file is part of LilyPond, the GNU music typesetter. ;;;; -;;;; Copyright (C) 2009--2010 Carl Sorensen +;;;; Copyright (C) 2009--2011 Carl Sorensen ;;;; ;;;; LilyPond is free software: you can redistribute it and/or modify ;;;; it under the terms of the GNU General Public License as published by @@ -46,7 +46,7 @@ ;;; If an exception is specified for a given beam-type, it will apply to all ;;; beams of shorter durations that don't have an individual exception, so ;;; ((1 . 8) . (3 3 2)) -;;; will cause all primary beams to be broken at 3/8, 5/8, and 8/8. +;;; will cause all primary beams to be broken at 3/8, 6/8, and 8/8. ;;; ;;; ((1. 32) . (16 8 4 4)) ;;; will cause all 1/32, 1/64, and 1/128 beams to be broken at 1/2, 3/4, @@ -61,9 +61,6 @@ ;;; a list of (1 1 1 ...), where the number of entries is the ;;; number of base moments in a measure otherwise. ;;; -;;; If no value is given for beatCombinations, no beats will be combined without -;;; beamExceptions rules. -;;; ;;; NOTE: numerator is kept in beam-type because of ;;; tuplets, e.g. (2 . 24) = (2 . 3) * (1 . 8) ;;; for eighth-note triplets. @@ -88,11 +85,11 @@ ;; use defaults, but combine all beats into a unit if possible ;; ;; set all beams to end on beats, but 1 8 to beam entire measure - ;; in order to avoid beaming every beat for entier measure, we set + ;; in order to avoid beaming every beam type for the entire measure, we set ;; triplets back to every beat. ((3 . 4) . - ((beamExceptions . ((end . (((1 . 8) . (6)) - ((1 . 12) . (3 3 3)))))))) + ((beamExceptions . ((end . (((1 . 8) . (6)) ;1/8 note whole measure + ((1 . 12) . (3 3 3)))))))) ;Anything shorter by beat ;; in 3 8 time: ;; beam entire measure together @@ -112,14 +109,14 @@ ;; ly/engraver-init.ly where the default time signature is set ;; are set ((4 . 4) . - ((beamExceptions . ((end . (((1 . 8) . (4 4)) - ((1 . 12) . (3 3 3 3)))))))) + ((beamExceptions . ((end . (((1 . 8) . (4 4)) ; 1/8 notes half measure + ((1 . 12) . (3 3 3 3)))))))) ;Anything shorter by beat ;; in 4/8 time: ;; combine beats 1 and 2, so beam in 2 ((4 . 8) . ((beatStructure . (2 2)))) - ;; in 4/8 and 4/16 time: + ;; in 4/16 time: ;; use defaults, so no entries necessary ;; in 6 4 time: @@ -128,12 +125,10 @@ ((beamExceptions . ((end . (((1 . 16) . (4 4 4 4 4 4)))))))) ;; in 6 8 time: - ;; use defaults, but end beams with 32nd or finer each 1 8 beat - ((6 . 8) . - ((beamExceptions . ((end . (((1 . 32) . (4 4 4 4 4 4)))))))) + ;; use defaults, so no entries necessary ;; in 6 16 time: - ;; use defaults, so no entry necessary + ;; use defaults, so no entries necessary ;; in 9 4 time: ;; use defaults, but end beams with 32nd or finer each 1 4 beat @@ -141,12 +136,10 @@ ((beamExceptions . ((end . (((1 . 32) . (8 8 8 8 8 8 8 8)))))))) ;; in 9 8 time - ;; use defaults, but end beams with 32nd notes each 1 8 beat - ((9 . 8) . - ((beamExceptions . ((end . (((1 . 32) . (4 4 4 4 4 4 4 4 4)))))))) + ;; use defaults, so no entries necessary ;; in 9 16 time - ;; use defaults, so no entry necessary + ;; use defaults, so no entries necessary ;; in 12 4 time: ;; use defaults, but end beams with 32nd or finer notes each 1 4 beat @@ -154,24 +147,20 @@ ((beamExceptions . ((end . (((1 . 32) . (8 8 8 8 8 8 8 8 8 8 8 8)))))))) ;; in 12 8 time: - ;; use defaults, but end beams with 32nd notes each 1 8 beat - ((12 . 8) . - ((beamExceptions . ((end . (((1 . 32) . (4 4 4 4 4 4 4 4 4 4 4 4)))))))) + ;; use defaults, so no entries necessary ;; in 12 16 time: - ;; use defaults; no entry needed + ;; use defaults, so no entries necessary ;; in 5 8 time: ;; default: group (3 2) ((5 . 8) . - ((baseMoment . (1 . 8)) - (beatStructure . (3 2)))) + ((beatStructure . (3 2)))) ;; in 8 8 time: ;; default: group (3 3 2) ((8 . 8) . - ((baseMoment . (1 . 8)) - (beatStructure . (3 3 2)))) + ((beatStructure . (3 3 2)))) )) ; end of alist definition @@ -195,8 +184,8 @@ (cons 'beamExceptions beam-exceptions))) (define-public (base-fraction time-signature time-signature-settings) - "Get @code{baseMoment} fraction value for @code{time-signature} from -@code{time-signature-settings}." + "Get @code{baseMoment} fraction value for @var{time-signature} from +@var{time-signature-settings}." (let ((return-value (get-setting 'baseMoment time-signature time-signature-settings))) @@ -205,9 +194,8 @@ return-value))) (define-public (beat-structure base-fraction time-signature time-signature-settings) - "Get beatStructure value in @code{base-fraction} units -for @code{time-signature} from -@code{time-signature-settings}." + "Get @code{beatStructure} value in @var{base-fraction} units +for @var{time-signature} from @var{time-signature-settings}." (define (fraction-divide numerator denominator) (/ (* (car numerator) (cdr denominator)) (* (cdr numerator) (car denominator)))) @@ -232,8 +220,8 @@ for @code{time-signature} from return-value))) (define-public (beam-exceptions time-signature time-signature-settings) - "Get beamExceptions value for @code{time-signature} from -@code{time-signature-settings}." + "Get @code{beamExceptions} value for @var{time-signature} from +@var{time-signature-settings}." (get-setting 'beamExceptions time-signature time-signature-settings)) @@ -242,7 +230,7 @@ for @code{time-signature} from (define (override-property-setting context property setting value) "Like the C++ code that executes \\override, but without type -checking. " +checking." (begin (revert-property-setting context property setting) (ly:context-set-property! @@ -252,7 +240,7 @@ checking. " (define (revert-property-setting context property setting) "Like the C++ code that executes \revert, but without type -checking. " +checking." (define (entry-count alist entry-key) "Count the number of entries in alist with a key of @@ -281,9 +269,9 @@ a fresh copy of the list-head is made." property (revert-member current-value setting))))) -(define-public (override-time-signature-setting time-signature setting . rest) - "Override the time signature settings for the context in @var{rest}, -with the new setting alist @var{setting}. " +(define-public (override-time-signature-setting time-signature setting) + "Override the time signature settings for the context in +@var{time-signature}, with the new setting alist @var{setting}." (context-spec-music (make-apply-context (lambda (c) (override-property-setting @@ -291,17 +279,9 @@ with the new setting alist @var{setting}. " 'timeSignatureSettings time-signature setting))) - (if (and (pair? rest) (symbol? (car rest))) - (car rest) - 'Voice))) - -(define-public (score-override-time-signature-setting - time-signature setting) - (override-time-signature-setting - time-signature setting 'Score)) + 'Timing)) -(define-public (revert-time-signature-setting - time-signature . rest) +(define-public (revert-time-signature-setting time-signature) (context-spec-music (make-apply-context (lambda (c) @@ -309,6 +289,103 @@ with the new setting alist @var{setting}. " c 'timeSignatureSettings time-signature))) - (if (and (pair? rest) (symbol? (car rest))) - (car rest) - 'Voice))) + 'Timing)) + + + + +;;;%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +;;; Formatting of complex/compound time signatures + +(define (insert-markups l m) + (let ((ll (reverse l))) + (let join-markups ((markups (list (car ll))) + (remaining (cdr ll))) + (if (pair? remaining) + (join-markups (cons (car remaining) (cons m markups)) (cdr remaining)) + markups)))) + +;;; Use a centered-column inside a left-column, because the centered column +;;; moves its reference point to the center, which the left-column undoes. +(define (format-time-fraction time-sig-fraction) + (let* ((revargs (reverse (map number->string time-sig-fraction))) + (den (car revargs)) + (nums (reverse (cdr revargs)))) + (make-override-markup '(baseline-skip . 0) + (make-number-markup + (make-left-column-markup (list + (make-center-column-markup (list + (make-line-markup (insert-markups nums "+")) + den)))))))) + +(define (format-complex-compound-time time-sig) + (make-override-markup '(baseline-skip . 0) + (make-number-markup + (make-line-markup + (insert-markups (map format-time-fraction time-sig) + (make-vcenter-markup "+")))))) + +(define-public (format-compound-time time-sig) + (cond + ((not (pair? time-sig)) (null-markup)) + ((pair? (car time-sig)) (format-complex-compound-time time-sig)) + (else (format-time-fraction time-sig)))) + + +;;;%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +;;; Measure length calculation of (possibly complex) compound time signatures + +(define (calculate-time-fraction time-sig-fraction) + (let* ((revargs (reverse time-sig-fraction)) + (den (car revargs)) + (num (apply + (cdr revargs)))) + (ly:make-moment num den))) + +(define (calculate-complex-compound-time time-sig) + (let add-moment ((moment ZERO-MOMENT) + (remaining (map calculate-time-fraction time-sig))) + (if (pair? remaining) + (add-moment (ly:moment-add moment (car remaining)) (cdr remaining)) + moment))) + +(define-public (calculate-compound-measure-length time-sig) + (cond + ((not (pair? time-sig)) (ly:make-moment 4 4)) + ((pair? (car time-sig)) (calculate-complex-compound-time time-sig)) + (else (calculate-time-fraction time-sig)))) + + +;;;%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +;;; Base beat length: Use the smallest denominator from all fraction + +(define (calculate-compound-base-beat-full time-sig) + (apply max (map last time-sig))) + +(define-public (calculate-compound-base-beat time-sig) + (ly:make-moment 1 + (cond + ((not (pair? time-sig)) 4) + ((pair? (car time-sig)) (calculate-compound-base-beat-full time-sig)) + (else (calculate-compound-base-beat-full (list time-sig)))))) + + +;;;%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +;;; Beat Grouping + +(define (normalize-fraction frac beat) + (let* ((thisbeat (car (reverse frac))) + (factor (/ beat thisbeat))) + (map (lambda (f) (* factor f)) frac))) + +(define (beat-grouping-internal time-sig) + ;; Normalize to given beat, extract the beats and join them to one list + (let* ((beat (calculate-compound-base-beat-full time-sig)) + (normalized (map (lambda (f) (normalize-fraction f beat)) time-sig)) + (beats (map (lambda (f) (reverse (cdr (reverse f)))) normalized))) + (apply append beats))) + +(define-public (calculate-compound-beat-grouping time-sig) + (cond + ((not (pair? time-sig)) '(2 . 2)) + ((pair? (car time-sig)) (beat-grouping-internal time-sig)) + (else (beat-grouping-internal (list time-sig)))))