tuning)))
(if (< this-fret 0)
(ly:warning (_ "Negative fret for pitch ~a on string ~a")
- (note-pitch note) string))
+ (car pitch-entry) string))
(delete-free-string string)
(set! specified-frets (cons this-fret specified-frets))
(list-set! string-fret-fingers
(cdr pitch-entry)
(list string this-fret finger))))
+ (define (kill-note! string-fret-fingers note-index)
+ (list-set! string-fret-fingers note-index (list #f #t)))
+
(define string-fret-fingers
(map (lambda (string finger)
(if (null? finger)
(_ "Requested string for pitch requires negative fret: string ~a pitch ~a")
string
pitch)
- (ly:warning (_ "Ignoring string request."))
+ (ly:warning (_ "Ignoring string request and recalculating."))
(list-set! string-fret-fingers
(cdr pitch-entry)
(if (null? finger)
(list '() #f)
- (list '() #f finger)))))))))))
+ (list '() #f finger)))))
+ ((eq? handle-negative 'ignore)
+ (begin
+ (ly:warning
+ (_ "Requested string for pitch requires negative fret: string ~a pitch ~a")
+ string
+ pitch)
+ (ly:warning (_ "Ignoring note in tablature."))
+ (kill-note! string-fret-fingers
+ (cdr pitch-entry))))))))))
pitch-alist string-fret-fingers)
;; handle notes without strings assigned -- sorted by pitch, so
;; we need to use the alist to have the note number available
(if (not (list-ref string-fret-finger 1))
(if fit-string
(set-fret! pitch-entry fit-string finger)
- (ly:warning (_ "No string for pitch ~a (given frets ~a)")
- pitch
- specified-frets)))))
+ (begin
+ (ly:warning (_ "No string for pitch ~a (given frets ~a)")
+ pitch
+ specified-frets)
+ (kill-note! string-fret-fingers
+ (cdr pitch-entry)))))))
(sort pitch-alist (lambda (pitch-entry-a pitch-entry-b)
(ly:pitch<? (car pitch-entry-b)
(car pitch-entry-a)))))
string-frets
(create-fretboard
context grob (string-frets->placement-list
- string-frets string-count))))
+ (filter (lambda (entry)
+ (car entry))
+ string-frets)
+ string-count))))
(if (null? grob)
(placement-list->string-frets predefined-fretboard)
(create-fretboard context grob predefined-fretboard)))))
(define-public (fret-number-tablature-format
context string-number fret-number)
(make-vcenter-markup
- (format "~a" fret-number)))
+ (format #f "~a" fret-number)))
;; The 5-string banjo has got a extra string, the fifth (duh), which
;; starts at the fifth fret on the neck. Frets on the fifth string
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; bar numbers
-(define-public ((every-nth-bar-number-visible n) barnum)
+(define-public ((every-nth-bar-number-visible n) barnum mp)
(= 0 (modulo barnum n)))
-(define-public ((modulo-bar-number-visible n m) barnum)
+(define-public ((modulo-bar-number-visible n m) barnum mp)
(and (> barnum 1) (= m (modulo barnum n))))
(define-public ((set-bar-number-visibility n) tr)
(ly:context-set-property! tr 'barNumberVisibility
(modulo-bar-number-visible n (modulo bn n)))))
-(define-public (first-bar-number-invisible barnum) (> barnum 1))
-
-(define-public (all-bar-numbers-visible barnum) #t)
+(define-public (first-bar-number-invisible barnum mp)
+ (> barnum 1))
+
+(define-public (first-bar-number-invisible-save-broken-bars barnum mp)
+ (or (> barnum 1)
+ (> (ly:moment-main-numerator mp) 0)))
+
+(define-public (first-bar-number-invisible-and-no-parenthesized-bar-numbers barnum mp)
+ (and (> barnum 1)
+ (= (ly:moment-main-numerator mp) 0)))
+
+(define-public (robust-bar-number-function barnum measure-pos alt-number context)
+ (define (get-number-and-power an pow)
+ (if (<= an alt-number)
+ (get-number-and-power (+ an (expt 26 (1+ pow))) (1+ pow))
+ (cons (+ alt-number (- (expt 26 pow) an)) (1- pow))))
+ (define (make-letter so-far an pow)
+ (if (< pow 0)
+ so-far
+ (let ((pos (modulo (quotient an (expt 26 pow)) 26)))
+ (make-letter (string-append so-far
+ (substring "abcdefghijklmnopqrstuvwxyz"
+ pos
+ (1+ pos)))
+ an
+ (1- pow)))))
+ (let* ((number-and-power (get-number-and-power 0 0))
+ (begin-measure (= 0 (ly:moment-main-numerator measure-pos)))
+ (maybe-open-parenthesis (if begin-measure "" "("))
+ (maybe-close-parenthesis (if begin-measure "" ")")))
+ (markup (string-append maybe-open-parenthesis
+ (number->string barnum)
+ (make-letter ""
+ (car number-and-power)
+ (cdr number-and-power))
+ maybe-close-parenthesis))))
+
+(define-public (all-bar-numbers-visible barnum mp) #t)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;