;;;; This file is part of LilyPond, the GNU music typesetter.
;;;;
-;;;; Copyright (C) 2002--2010 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; Copyright (C) 2002--2011 Jan Nieuwenhuizen <janneke@gnu.org>
;;;; Patrick McCarty <pnorcks@gmail.com>
;;;;
;;;; LilyPond is free software: you can redistribute it and/or modify
(guile)
(ice-9 regex)
(ice-9 format)
+ (ice-9 optargs)
(lily)
(srfi srfi-1)
(srfi srfi-13))
(format "<~S~a>\n" entity (attributes attributes-alist)))
(define-public (eoc entity . attributes-alist)
- " oc = open/close"
+ "oc = open/close"
(format "<~S~a/>\n" entity (attributes attributes-alist)))
(define-public (ec entity)
(- (* start-radius (sin new-start-angle))))
"")))))))
-(define (connected-shape pointlist thick x-scale y-scale connect fill)
- (entity
- 'path ""
- `(fill . ,(if fill "currentColor" "none"))
- `(stroke . "currentColor")
- `(stroke-width . ,thick)
- '(stroke-linejoin . "round")
- '(stroke-linecap . "round")
- (cons
- 'd
- (ly:format
- "M0 0~a ~a"
- (string-concatenate
- (map (lambda (x)
- (apply
- (if (eq? (length x) 6)
- (lambda (x1 x2 x3 x4 x5 x6)
- (ly:format "C~4f ~4f ~4f ~4f ~4f ~4f"
- (* x1 x-scale)
- (- (* x2 y-scale))
- (* x3 x-scale)
- (- (* x4 y-scale))
- (* x5 x-scale)
- (- (* x6 y-scale))))
- (lambda (x1 x2)
- (ly:format "L~4f ~4f"
- (* x-scale x1)
- (- (* y-scale x2)))))
- x))
- pointlist))
- (if connect "z " "")))))
-
(define (embedded-svg string)
string)
x-max y-min
x-max 0)))))
-(define (path thick commands)
+(define* (path thick commands #:optional (cap 'round) (join 'round) (fill? #f))
(define (convert-path-exps exps)
(if (pair? exps)
(let*
(convert-path-exps (drop rest arity))))
'()))
- (entity 'path ""
- `(stroke-width . ,thick)
- '(stroke-linejoin . "round")
- '(stroke-linecap . "round")
- '(stroke . "currentColor")
- '(fill . "none")
- `(d . ,(apply string-append (convert-path-exps commands)))))
+ (let* ((line-cap-styles '(butt round square))
+ (line-join-styles '(miter round bevel))
+ (cap-style (if (not (memv cap line-cap-styles))
+ (begin
+ (ly:warning (_ "unknown line-cap-style: ~S")
+ (symbol->string cap))
+ 'round)
+ cap))
+ (join-style (if (not (memv join line-join-styles))
+ (begin
+ (ly:warning (_ "unknown line-join-style: ~S")
+ (symbol->string join))
+ 'round)
+ join)))
+ (entity 'path ""
+ `(stroke-width . ,thick)
+ `(stroke-linejoin . ,(symbol->string join-style))
+ `(stroke-linecap . ,(symbol->string cap-style))
+ '(stroke . "currentColor")
+ `(fill . ,(if fill? "currentColor" "none"))
+ `(d . ,(apply string-append (convert-path-exps commands))))))
(define (placebox x y expr)
(if (string-null? expr)
(define (resetrotation ang x y)
"</g>\n")
+(define (resetscale)
+ "</g>\n")
+
(define (round-filled-box breapth width depth height blot-diameter)
(entity
'rect ""
(ly:format "<g transform=\"rotate(~4f, ~4f, ~4f)\">\n"
(- ang) x (- y)))
+(define (setscale x y)
+ (ly:format "<g transform=\"scale(~4f, ~4f)\">\n"
+ x y))
+
(define (text font string)
(dispatch `(fontify ,font ,(entity 'tspan (string->entities string)))))
(let ((escaped-string (string-regexp-substitute
"<" "<"
(string-regexp-substitute "&" "&" string))))
- (dispatch `(fontify ,pango-font-description
- ,(entity 'tspan escaped-string)))))
+ (dispatch `(fontify ,pango-font-description
+ ,(entity 'tspan escaped-string)))))