-;;;
-;;; auto-beam.scm -- Auto-beam settings
-;;;
-;;; source file of the GNU LilyPond music typesetter
-;;;
-;;; (c) 2000 Jan Nieuwenhuizen <janneke@gnu.org>
-;;;
+;;;; auto-beam.scm -- Auto-beam-engraver settings
+;;;;
+;;;; source file of the GNU LilyPond music typesetter
+;;;;
+;;;; (c) 2000--2004 Jan Nieuwenhuizen <janneke@gnu.org>
-;;; setup for auto-beam engraver
-;;;
-;;; specify generic beam end times
+;;; specify generic beam begin and end times
;;; format:
;;;
-;;; [time-signature]'beamAutoEnd'[duration]
+;;; function shortest-duration-in-beam time-signature
;;;
;;; where
;;;
-;;; time-signature = 'time'[numerator]'_'denominator; eg: 3_4
-;;; duration = [numerator]'_'denominator; eg: 3_8, _16
+;;; 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 * *
-;;; 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
+;;; 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
-;;;
-;;;UGH UGH.
-;;;
-;;;Fixme: should use an alist
-;;;
-;;;autoBeamSettings = (list
-;;; (cons (list (make-moment MEASURE) TIME-SIGNATURE) (make-moment INTERVAL)
-;;; ..
-;;;
-;;; )
-;;;
-;;;
-
-(define auto-beam-settings
- (list
+(define-public default-auto-beam-settings
`(
- ((end * * 3 2) . ,(make-moment 1 2))
- ((end 1 16 3 2) . ,(make-moment 1 4))
- ((end 1 32 3 2) . ,(make-moment 1 8))
+ ((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) . ,(make-moment 1 4))
+ ((begin 1 8 3 4) . ,(ly:make-moment 1 4))
- ((end * * 3 4) . ,(make-moment 3 4))
- ((begin 1 16 3 4) . ,(make-moment 1 16))
- ((end 1 16 3 4) . ,(make-moment 1 4))
- ;;((begin 1 32 3 4) . ,(make-moment 1 8))
- ((end 1 32 3 4) . ,(make-moment 1 8))
+ ((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) . ,(make-moment 1 8))
- ((end * * 3 8) . ,(make-moment 3 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) . ,(make-moment 1 2))
- ((end 1 12 4 4) . ,(make-moment 1 4))
- ((end 1 16 4 4) . ,(make-moment 1 4))
- ((end 1 32 4 4) . ,(make-moment 1 8))
-
- ((end * * 2 4) . ,(make-moment 1 4))
- ((end 1 12 2 4) . ,(make-moment 1 4))
- ((end 1 16 2 4) . ,(make-moment 1 4))
- ((end 1 32 2 4) . ,(make-moment 1 8))
-
-
- ((end * * 4 8) . ,(make-moment 1 4))
- ((end 1 16 4 8) . ,(make-moment 1 4))
- ((end 1 32 4 8) . ,(make-moment 1 8))
-
- ((end * * 4 16) . ,(make-moment 1 8))
-
- ((end * * 6 8) . ,(make-moment 3 8))
- ((end 1 16 6 8) . ,(make-moment 3 8))
- ((end 1 32 6 8) . ,(make-moment 1 8))
-
- ((end * * 9 8) . ,(make-moment 3 8))
- ((end 1 16 9 8) . ,(make-moment 3 8))
- ((end 1 32 9 8) . ,(make-moment 1 8))
-
- ((end * * 12 8) . ,(make-moment 3 8))
- ((end 1 16 12 8) . ,(make-moment 3 8))
- ((end 1 32 12 8) . ,(make-moment 1 8))
- )))
-
-;;; Users may override in most cases, simply by issuing
-;;;
-;;; ;;; from here on consider ending beam every 1/4 note
-;;; \property Voice.beamAutoend1_1 = (make-moment 1 4)
-;;;
-;;; ;;; no autobeaming
-;;; \property Voice.beamAuto = f
-;;;
-;;;or, more globally, by doing:
-;;;
-;;; \paper{
-;;; \translator{
-;;; \VoiceContext
-;;; ;;; consider ending beam at every 1/2 note
-;;; beamAutoend1_1 = (make-moment 1 2)
-;;; }
-;;; }
-;;;
-;;; see also input/test/auto-beam-override.ly
+ ;; 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:context-set-property! context context-prop
+ (cons (cons setting value)
+ (ly: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:context-set-property!
+ context context-prop
+ (revert-assoc (ly:context-property context context-prop)
+ setting))
+ )
+
+(define-public (override-auto-beam-setting setting num den . rest)
+ (ly:export
+ (context-spec-music
+ (make-apply-context (lambda (c)
+ (override-property-setting
+ c 'autoBeamSettings
+ setting (ly:make-moment num den))
+ ))
+ (if (and (pair? rest) (symbol? (car rest)))
+ (car rest)
+ 'Voice)
+ )))
+
+(define-public (revert-auto-beam-setting setting . rest)
+ (ly:export
+ (context-spec-music
+ (make-apply-context (lambda (c)
+ (revert-property-setting
+ c 'autoBeamSettings
+ setting)))
+ (if (and (pair? rest) (symbol? (car rest)))
+ (car rest)
+ 'Voice))))
projects / lilypond.git / blobdiff