;;;;
;;;; source file of the GNU LilyPond music typesetter
;;;;
-;;;; (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; (c) 1998--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
;;;; Jan Nieuwenhuizen <janneke@gnu.org>
;; metronome marks
-(define-public (format-metronome-markup dur count context)
- (let* ((note-mark (make-smaller-markup
- (make-note-by-number-markup (ly:duration-log dur)
- (ly:duration-dot-count dur)
- 1))))
- (make-line-markup
- (list
- (make-general-align-markup Y DOWN note-mark)
- (make-simple-markup "=")
- (make-simple-markup (number->string count))))))
+(define-public (format-metronome-markup text dur count context)
+ (let* ((hide_note (eq? #t (ly:context-property context 'tempoHideNote)))
+ (note-mark (if (and (not hide_note) (ly:duration? dur))
+ (make-smaller-markup
+ (make-note-by-number-markup (ly:duration-log dur)
+ (ly:duration-dot-count dur)
+ 1))
+ #f))
+ (note-markup (if (and note-mark (number? count) (> count 0) )
+ (make-concat-markup (list
+ (make-general-align-markup Y DOWN note-mark)
+ (make-simple-markup " ")
+ (make-simple-markup "=")
+ (make-simple-markup " ")
+ (make-simple-markup (number->string count))))
+ #f))
+ (text-markup (if (not (null? text))
+ (make-bold-markup text)
+ #f)))
+ (if text-markup
+ (if note-markup
+ (make-line-markup (list text-markup
+ (make-concat-markup (list (make-simple-markup "(")
+ note-markup
+ (make-simple-markup ")")))))
+ (make-line-markup (list text-markup))
+ )
+ (if note-markup
+ (make-line-markup (list note-markup))
+ #f
+ )
+ )
+ )
+)
(define-public (format-mark-alphabet mark context)
(make-bold-markup (make-markalphabet-markup (1- mark))))
(lambda (y) (make-translate-scaled-markup (cons -0.7 0) y))
identity)
- (if (eq? #t (ly:event-property event 'diminished))
- (markup #:slashed-digit figure)
- (markup #:number (number->string figure 10))))
+ (cond
+ ((eq? #t (ly:event-property event 'diminished))
+ (markup #:slashed-digit figure))
+ ((eq? #t (ly:event-property event 'augmented-slash))
+ (markup #:backslashed-digit figure))
+ (else (markup #:number (number->string figure 10)))))
#f
))
(alt (ly:event-property event 'alteration))
b))
(let*
((tunings (ly:context-property context 'stringTunings))
+ (details (ly:grob-property grob 'fret-diagram-details))
(minimum-fret (ensure-number
(ly:context-property context 'minimumFret) 0))
+ (max-stretch (ensure-number
+ (ly:context-property context 'maximumFretStretch) 4))
(string-frets (determine-frets-mf notes string-numbers
- minimum-fret
+ minimum-fret max-stretch
tunings)))
-
- (set! (ly:grob-property grob 'string-count) (length tunings))
- (set! (ly:grob-property grob 'string-frets) string-frets)
-
- ))
+ (set! (ly:grob-property grob 'fret-diagram-details)
+ (if (null? details)
+ (acons 'string-count (length tunings) '())
+ (acons 'string-count (length tunings) details)))
+ (set! (ly:grob-property grob 'string-fret-finger-combinations) string-frets)))
(define-public (determine-frets-mf notes string-numbers
- minimum-fret
+ minimum-fret max-stretch
tunings)
(define (calc-fret pitch string tuning)
(define (note-pitch<? a b)
(ly:pitch<? (note-pitch a)
(note-pitch b)))
+
+ (define (note-finger ev)
+ (let* ((articulations (ly:event-property ev 'articulations))
+ (finger-found #f))
+
+ (map (lambda (art)
+ (let*
+ ((num (ly:event-property art 'digit)))
+
+ (if (and (eq? 'fingering-event (ly:event-property art 'class))
+ (number? num))
+ (set! finger-found num))))
+ articulations)
+
+ finger-found))
- (define (note-ev-string ev)
+ (define (note-string ev)
(let* ((articulations (ly:event-property ev 'articulations))
(string-found #f))
(if (number? num)
(set! string-found num))))
articulations)
+
string-found))
- (let*
- ((free-strings (map 1+ (iota (length tunings))))
- (del-string (lambda (string)
- (if (number? string)
- (set! free-strings
- (delete string free-strings)))))
- (string-qualifies (lambda (string pitch)
- (and (>= (calc-fret pitch string tunings)
- minimum-fret))))
- (string-frets '())
- (set-fret (lambda (note string)
- (set! string-frets
- (acons string
- (calc-fret (ly:event-property note 'pitch)
- string tunings)
- string-frets))
- (del-string string)
- ))
+ (define (del-string string)
+ (if (number? string)
+ (set! free-strings
+ (delete string free-strings))))
+ (define specified-frets '())
+ (define free-strings '())
+
+ (define (close-enough fret)
+ (reduce
+ (lambda (x y)
+ (and x y))
+ #t
+ (map (lambda (specced-fret)
+ (> max-stretch (abs (- fret specced-fret))))
+ specified-frets)
+ ))
+
+ (define (string-qualifies string pitch)
+ (let*
+ ((fret (calc-fret pitch string tunings)))
+
+ (and (>= fret minimum-fret)
+ (close-enough fret))
+
+ ))
+
+ (define string-fret-fingering-tuples '())
+ (define (set-fret note string)
+ (set! string-fret-fingering-tuples
+ (cons (list string
+ (calc-fret (ly:event-property note 'pitch)
+ string tunings)
+ (note-finger note))
+ string-fret-fingering-tuples))
+ (del-string string))
- )
-
- (for-each (lambda (note)
- (del-string (note-ev-string note)))
- notes)
-
-
- (for-each
- (lambda (note)
- (if (note-ev-string note)
- (set-fret note (note-ev-string note))
- (let*
- ((string (find (lambda (string) (string-qualifies string
- (note-pitch note)))
- (reverse free-strings))))
+ ;;; body.
+ (set! specified-frets
+ (filter identity (map
+ (lambda (note)
+ (if (note-string note)
+ (calc-fret (note-pitch note)
+ (note-string note) tunings)
+ #f))
+ notes)))
- (set-fret note string))))
- (sort notes note-pitch<?))
+ (set! free-strings (map 1+ (iota (length tunings))))
- (display string-frets)
-
-
- string-frets))
-
+ (for-each (lambda (note)
+ (del-string (note-string note)))
+ notes)
+
+
+ (for-each
+ (lambda (note)
+ (if (note-string note)
+ (set-fret note (note-string note))
+ (let*
+ ((string (find (lambda (string) (string-qualifies string
+ (note-pitch note)))
+ (reverse free-strings))))
+ (if string
+ (set-fret note string)
+ (ly:warning "No string for pitch ~a (given frets ~a)" (note-pitch note)
+ specified-frets))
+
+ )))
+ (sort notes note-pitch<?))
+
+ string-fret-fingering-tuples)