;;;; source file of the GNU LilyPond music typesetter
;;;;
;;;; (c) 1998--2006 Jan Nieuwenhuizen <janneke@gnu.org>
-;;;; Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; Han-Wen Nienhuys <hanwen@xs4all.nl>
;;;; Note: currently misused as testbed for titles with markup, see
;;;; input/test/title-markup.ly
polygon
repeat-slash
resetcolor
- resetrotatino
+ resetrotation
round-filled-box
setcolor
- setrotation
+ setrotation
text
zigzag-line))
(/ (round (* 10000 num)) 10000))
(define (str4 num)
- (format #f "~f" (round4 num)))
+ (if (or (nan? num) (inf? num))
+ (begin
+ (ly:warning (_ "Found infinity or nan in output. Substituting 0.0"))
+ (if (ly:get-option 'strict-infinity-checking)
+ (exit 1))
+ "0.0")
+ (format #f "~f" (round4 num))))
(define (number-pair->string4 numpair)
- (format #f "~f ~f" (round4 (car numpair)) (round4 (cdr numpair))))
+ (string-append (str4 (car numpair))
+ " "
+ (str4 (cdr numpair))))
(define (numbers->string4 numlist)
(string-join (map str4 numlist) " "))
"false")
(round4 radius) (round4 thick)))
-(define (dashed-line thick on off dx dy)
- (format #f "~a ~a ~a [ ~a ~a ] 0 draw_dashed_line"
+(define (dashed-line thick on off dx dy phase)
+ (format #f "~a ~a ~a [ ~a ~a ] ~a draw_dashed_line"
(str4 dx)
(str4 dy)
(str4 thick)
(str4 on)
- (str4 off)))
+ (str4 off)
+ (str4 phase)
+
+ ))
;; what the heck is this interface ?
(define (dashed-slur thick on off l)
(define (grob-cause offset grob)
(let* ((cause (ly:grob-property grob 'cause))
- (music-origin (if (ly:music? cause)
- (ly:music-property cause 'origin))))
+ (music-origin (if (ly:stream-event? cause)
+ (ly:event-property cause 'origin))))
(if (not (ly:input-location? music-origin))
""
(let* ((location (ly:input-file-line-char-column music-origin))
(format #f "~a draw_repeat_slash"
(numbers->string4 (list x-width width height)))))
-;; restore color from stack
-(define (resetcolor) "setrgbcolor\n")
-
(define (round-filled-box left right bottom top blotdiam)
(let* ((halfblot (/ blotdiam 2))
;; save current color on stack and set new color
(define (setcolor r g b)
- (format #f "currentrgbcolor ~a setrgbcolor\n"
+ (format #f "gsave ~a setrgbcolor\n"
(numbers->string4 (list r g b))))
+;; restore color from stack
+(define (resetcolor) "grestore \n")
+
;; rotation around given point
(define (setrotation ang x y)
(format "gsave ~a translate ~a rotate ~a translate\n"
(define (path thickness exps)
- (define (path-exps->ps-path-exps exps)
+ (define (convert-path-exps exps)
(if (pair? exps)
(let*
((head (car exps))
(cons (format "~a ~a "
(string-join (map (lambda (x) (format "~a " x)) args) " ")
head)
- (path-exps->ps-path-exps (drop rest arity))))
+ (convert-path-exps (drop rest arity))))
'()))
(format
"1 setlinecap ~a setlinewidth\n~a stroke"
thickness
- (string-join (path-exps->ps-path-exps exps) " ")))
+ (string-join (convert-path-exps exps) " ")))