+2006-10-25 Jan Nieuwenhuizen <janneke@gnu.org>
+
+ * scm/define-grobs.scm (all-grob-descriptions): FretBoard: use
+ fret-diagram-interface (WAS: fret-board-interface). Fixes build.
+
+2006-10-23 Jan Nieuwenhuizen <janneke@gnu.org>
+
+ * flower/file-name.cc (dos_to_posix): Help std::string.copy with
+ trailing zero.
+
+ * GNUmakefile.in ($(tree-share-prefix)/mf-link-tree link-mf-tree):
+ Remove bashism in delete.
+
2006-10-25 Han-Wen Nienhuys <hanwen@lilypond.org>
+ * scm/define-grobs.scm (all-grob-descriptions): set finger-code.
+
+ * scm/translation-functions.scm (determine-frets-mf): flatten let*
+
+ * scm/define-context-properties.scm
+ (all-user-translation-properties): add maximumFretStretch property.
+
+ * scm/translation-functions.scm (tunings): read and use maximumFretStretch.
+
* lily/source-file.cc (get_counts): use multibyte variable.
* scm/translation-functions.scm (determine-frets-mf): new
((eq? my-code 'place-fret)
(set! dot-list (cons* (cdr my-item) dot-list))))
(parse-item (cdr mylist)))))
- ; calculate fret-range
+
+ ;; calculate fret-range
(let ((maxfret 0) (minfret 99))
(let updatemax ((fret-list dot-list))
(if (null? fret-list)
(acons 'barre-list barre-list
(acons 'dot-list dot-list
(acons 'xo-list xo-list '()))))))
-
+
+
+
(define (subtract-base-fret base-fret dot-list)
"Subtract @var{base-fret} from every fret in @var{dot-list}"
(if (null? dot-list)
(define (draw-dots layout props string-count fret-range size finger-code
dot-position dot-radius dot-thickness dot-list)
"Make dots for fret diagram."
+
(let* ((scale-dot-radius (* size dot-radius))
(scale-dot-thick (* size dot-thickness))
(dot-color (chain-assoc-get 'dot-color props 'black))
variable @var{finger-code}. There is no limit to the number of fret
indications per string.
+
+
+
@end table
"
(make-fret-diagram layout props marking-list))
((tunings (ly:context-property context 'stringTunings))
(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 '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-fret note string))))
- (sort notes note-pitch<?))
+ (set! specified-frets
+ (filter identity (map
+ (lambda (note)
+ (if (note-string note)
+ (calc-fret (note-pitch note)
+ (note-string note) tunings)
+ #f))
+ notes)))
+ (set! free-strings (map 1+ (iota (length tunings))))
+
- (display 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-frets))
-
+ string-fret-fingering-tuples)
projects / lilypond.git / commitdiff