;;;;
;;;; source file of the GNU LilyPond music typesetter
;;;;
-;;;; (c) 1998--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 1998--2005 Jan Nieuwenhuizen <janneke@gnu.org>
;;;; Han-Wen Nienhuys <hanwen@cs.uu.nl>
(let ((x (/ (- (cdr (ly:stencil-extent slur 0))
(/ (cdr (ly:stencil-extent text 0)) 2.0))
-2.0)))
-
- (ly:stencil-set-extent! text 0 (cons x x))
- (ly:stencil-align-to! text 0 1)))))
-
-;; (ly:stencil-combine-at-edge slur 1 1 text -0.6)
+ (set! text
+ (ly:make-stencil (ly:stencil-expr text)
+ (cons x x)
+ (ly:stencil-extent text Y)))
+
+ (ly:stencil-aligned-to text X RIGHT)))))
(define-public guitar-tuning '(4 -1 -5 -10 -15 -20))
;;; 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))
((string? arg) (string-append "\"" arg "\""))
((symbol? arg) (string-append "\"" (symbol->string arg) "\""))))
-(define-public (func name . args)
- (string-append
- "(" name
- (if (null? args)
- ""
- (apply string-append
- (map (lambda (x) (string-append " " (arg->string x))) args)))
- ")\n"))
+(define-public (print-circled-text-callback grob)
+ (let* ((text (ly:grob-property grob 'text))
+ (layout (ly:grob-layout grob))
+ (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 #f)))
+ (text-stencil (Text_interface::interpret_markup layout props text)))
+
+ (ly:stencil-add (centered-stencil text-stencil) circle)))
+
;;(define (mm-to-pt x)
;; (* (/ 72.27 25.40) x))
(string-append (ly:number->string (car c)) " "
(ly:number->string (cdr c))))
-(define (font i)
- (string-append
- "font"
- (make-string 1 (integer->char (+ (char->integer #\A) i)))))
-
-(define (scm-scm action-name)
- 1)
;; silly, use alist?
(define-public (find-notehead-symbol duration style)
(define-safe-public (all-visible d) '(#f . #f))
(define-safe-public (all-invisible d) '(#t . #t))
(define-safe-public (begin-of-line-invisible d) (if (= d 1) '(#t . #t) '(#f . #f)))
+(define-safe-public (center-invisible d) (if (= d 0) '(#t . #t) '(#f . #f)))
(define-safe-public (end-of-line-invisible d) (if (= d -1) '(#t . #t) '(#f . #f)))
("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)