;;; end of tablature functions
+(define-public (make-stencil-boxer thickness padding callback)
+ "Return function that adds a box around the grob passed as argument."
+ (lambda (grob) (box-stencil (callback grob) thickness padding)))
-(define-public (make-stencil-boxer line-thick x-padding y-padding callback)
- "Makes a routine that adds a box around the grob parsed as argument"
- (define (stencil-boxer grob)
- (let* ((mol (callback grob))
- (x-ext (interval-widen (ly:stencil-extent mol 0) x-padding))
- (y-ext (interval-widen (ly:stencil-extent mol 1) y-padding))
- (x-rule (make-filled-box-stencil (interval-widen x-ext line-thick)
- (cons 0 line-thick)))
- (y-rule (make-filled-box-stencil (cons 0 line-thick) y-ext)))
-
- (set! mol (ly:stencil-combine-at-edge mol 0 1 y-rule x-padding))
- (set! mol (ly:stencil-combine-at-edge mol 0 -1 y-rule x-padding))
- (set! mol (ly:stencil-combine-at-edge mol 1 1 x-rule 0))
- (set! mol (ly:stencil-combine-at-edge mol 1 -1 x-rule 0))
- mol))
- stencil-boxer)
+(define-public (make-stencil-circler thickness padding callback)
+ "Return function that adds a circle around the grob passed as argument."
+ (lambda (grob) (circle-stencil (callback grob) thickness padding)))
(define-public (arg->string arg)
(cond ((number? arg) (ly:inexact->string arg 10))
(defs (ly:output-def-lookup layout 'text-font-defaults))
(props (ly:grob-alist-chain grob defs))
(circle (Text_interface::interpret_markup
- layout props (make-draw-circle-markup 0.8 0.1)))
+ layout props (make-draw-circle-markup 0.8 0.1 #f)))
(text-stencil (Text_interface::interpret_markup layout props text)))
+
(ly:stencil-add (centered-stencil text-stencil) circle)))
(number->string duration)))
((mensural)
(string-append (number->string duration) (symbol->string style)))
+ ((petrucci)
+ (if (< duration 0)
+ (string-append (number->string duration) "mensural")
+ (string-append (number->string duration) (symbol->string style))))
((neomensural)
(string-append (number->string duration) (symbol->string style)))
((default)
("bracket" . (() . "bracket")) ))))
(if (equal? result #f)
- (ly:warn "Unknown bar glyph: `~S'" glyph)
+ (ly:warning (_ "unknown bar glyph: `~S'" glyph))
(index-cell (cdr result) dir))))
(define-public (shift-right-at-line-begin g)