;;;;
;;;; source file of the GNU LilyPond music typesetter
;;;;
-;;;; (c) 1998--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 1998--2006 Jan Nieuwenhuizen <janneke@gnu.org>
;;;; Han-Wen Nienhuys <hanwen@cs.uu.nl>
(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)))
+ (circle (ly:text-interface::interpret-markup
+ layout props (make-circle-markup text))))
+ circle))
;;(define (mm-to-pt x)
(define-public (first-bar-number-invisible barnum) (> barnum 1))
-;; See documentation of Item::visibility_lambda_
+;; See documentation of ly:item::visibility-lambda-
(define-public begin-of-line-visible
#(#f #f #t))
(define-public end-of-line-visible
(define-public red '(1.0 0.0 0.0))
(define-public green '(0.0 1.0 0.0))
(define-public blue '(0.0 0.0 1.0))
-(define-public cyan '(1.0 1.0 0.0))
+(define-public cyan '(0.0 1.0 1.0))
(define-public magenta '(1.0 0.0 1.0))
-(define-public yellow '(0.0 1.0 1.0))
+(define-public yellow '(1.0 1.0 0.0))
(define-public grey '(0.5 0.5 0.5))
(define-public darkred '(0.5 0.0 0.0))
(define-public darkgreen '(0.0 0.5 0.0))
(define-public darkblue '(0.0 0.0 0.5))
-(define-public darkcyan '(0.5 0.5 0.0))
+(define-public darkcyan '(0.0 0.5 0.5))
(define-public darkmagenta '(0.5 0.0 0.5))
-(define-public darkyellow '(0.0 0.5 0.5))
+(define-public darkyellow '(0.5 0.5 0.0))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Pitch Trill Heads
+;; * Pitch Trill Heads
+;; * Parentheses
-(define (parenthesize-elements grob)
+(define (parenthesize-elements grob . rest)
(let*
- ((elts (ly:grob-object grob 'elements))
- (x-ext (ly:relative-group-extent elts grob X))
+ (
+ (refp (if (null? rest)
+ grob
+ (car rest)))
+ (elts (ly:grob-object grob 'elements))
+ (x-ext (ly:relative-group-extent elts refp X))
+
(font (ly:grob-default-font grob))
(lp (ly:font-get-glyph font "accidentals.leftparen"))
(rp (ly:font-get-glyph font "accidentals.rightparen"))
- (padding 0.1))
+ (padding (ly:grob-property grob 'padding 0.1)))
(ly:stencil-add
(ly:stencil-translate-axis lp (- (car x-ext) padding) X)
(ly:stencil-translate-axis rp (+ (cdr x-ext) padding) X))
))
+
+(define (parentheses-item::print me)
+ (let*
+ ((elts (ly:grob-object me 'elements))
+ (y-ref (ly:grob-common-refpoint-of-array me elts Y))
+ (x-ref (ly:grob-common-refpoint-of-array me elts X))
+ (stencil (parenthesize-elements me x-ref))
+ (elt-y-ext (ly:relative-group-extent elts y-ref Y))
+ (y-center (interval-center elt-y-ext)))
+
+ (ly:stencil-translate
+ stencil
+ (cons
+ (-
+ (ly:grob-relative-coordinate me x-ref X))
+ (-
+ y-center
+ (ly:grob-relative-coordinate me y-ref Y))))
+ ))
+
+
+
+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
funcs)
value)
+