;;;;
;;;; source file of the GNU LilyPond music typesetter
;;;;
-;;;; (c) 2002--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 2002--2007 Jan Nieuwenhuizen <janneke@gnu.org>
;;;; http://www.w3.org/TR/SVG11
;;;; http://www.w3.org/TR/SVG12/ -- page, pageSet in draft
(use-modules
(guile)
(ice-9 regex)
+ (ice-9 format)
(lily)
+ (srfi srfi-1)
(srfi srfi-13))
+(define fancy-format format)
+(define format ergonomic-simple-format)
(define lily-unit-length 1.75)
(if (module-defined? this-module keyword)
(apply (eval keyword this-module) (cdr expr))
(begin
- (display
- (string-append "undefined: " (symbol->string keyword) "\n"))
+ (ly:warning (_ "undefined: ~S") keyword)
""))))))
;; Helper functions
(define-public (attributes attributes-alist)
(apply string-append
- (map (lambda (x) (format #f " ~s=\"~a\"" (car x) (cdr x)))
+ (map (lambda (x) (format " ~s=\"~a\"" (car x) (cdr x)))
attributes-alist)))
(define-public (eo entity . attributes-alist)
"o = open"
- (format #f "<~S~a>\n" entity (attributes attributes-alist)))
+ (format "<~S~a>\n" entity (attributes attributes-alist)))
(define-public (eoc entity . attributes-alist)
" oc = open/close"
- (format #f "<~S~a/>\n" entity (attributes attributes-alist)))
+ (format "<~S~a/>\n" entity (attributes attributes-alist)))
(define-public (ec entity)
"c = close"
- (format #f "</~S>\n" entity))
+ (format "</~S>\n" entity))
+
+
(define-public (entity entity string . attributes-alist)
(if (equal? string "")
(apply eo (cons entity attributes-alist)) string (ec entity))))
(define (offset->point o)
- (format #f " ~S,~S" (car o) (- (cdr o))))
+ (format " ~S,~S" (car o) (- (cdr o))))
+
+(define (number-list->point lst)
+ (define (helper lst)
+ (if (null? lst)
+ '()
+ (cons (format "~S,~S" (car lst) (cadr lst))
+ (helper (cddr lst)))))
+
+ (string-join (helper lst) " "))
+
(define (svg-bezier lst close)
(let* ((c0 (car (list-tail lst 3)))
(* x x))
(define (integer->entity integer)
- (format #f "&#x~x;" integer))
+ (fancy-format "&#x~x;" integer))
(define (char->entity char)
(integer->entity (char->integer char)))
(map (lambda (x) (char->entity x)) (string->list string))))
(define pango-description-regexp-comma
- (make-regexp "^([^,]+), ?([-a-zA-Z_]*) ([0-9.]+)$"))
+ (make-regexp "([^,]+), ?([-a-zA-Z_]*) ([0-9.]+)$"))
(define pango-description-regexp-nocomma
- (make-regexp "^([^ ]+) ([-a-zA-Z_]*) ?([0-9.]+)$"))
+ (make-regexp "([^ ]+) ([-a-zA-Z_]*) ?([0-9.]+)$"))
(define (pango-description-to-svg-font str)
(let*
(set! size
(string->number (match:substring match 3))))
- (display (format "Cannot decypher Pango description: ~a\n" str)))
+ (ly:warning (_ "cannot decypher Pango description: ~a") str))
(set! style
(if (string? style)
(size (modified-font-metric-font-scaling font))
(anchor "west"))
- (format #f "font-family:~a;font-style:~a;font-size:~a;text-anchor:~a;"
+ (format "font-family:~a;font-style:~a;font-size:~a;text-anchor:~a;"
(car name-style) (cadr name-style)
size anchor))))
(define (fontify font expr)
(entity 'text expr
`(style . ,(svg-font font))
+ '(fill . "currentColor")
))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
"")
-(define (rect-beam width slope thick blot-diameter)
- (let* ((x width)
- (y (* slope width))
- (z (/ y x)))
- (entity 'rect ""
- ;; The stroke will stick out. To use stroke,
- ;; the stroke-width must be subtracted from all other dimensions.
- ;;'(stroke-linejoin . "round")
- ;;'(stroke-linecap . "round")
- ;;`(stroke-width . ,blot-diameter)
- ;;'(stroke . "red")
- ;;'(fill . "orange")
-
- `(x . 0)
- `(y . ,(- (/ thick 2)))
- `(width . ,width)
- `(height . ,(+ thick (* (abs z) (/ thick 2))))
- `(rx . ,(/ blot-diameter 2))
- `(transform . ,(format #f "matrix (1, ~f, 0, 1, 0, 0)" z)
- ))))
-
-(define (beam width slope thick blot-diameter)
- (let* ((b blot-diameter)
- (t (- thick b))
- (w (- width b))
- (h (* w slope)))
- (entity 'polygon ""
- '(stroke-linejoin . "round")
- '(stroke-linecap . "round")
- `(stroke-width . ,blot-diameter)
- '(stroke . "black")
- '(fill . "black")
- `(points . ,(string-join
- (map offset->point
- (list (cons (/ b 2) (/ t 2))
- (cons (+ w (/ b 2)) (+ h (/ t 2)))
- (cons (+ w (/ b 2)) (+ h (- (/ t 2))))
- (cons (/ b 2) (- (/ t 2)))))))
- )))
-
-(define (path-beam width slope thick blot-diameter)
- (let* ((b blot-diameter)
- (t (- thick b))
- (w (- width b))
- (h (* w slope)))
- (entity 'path ""
- '(stroke-linejoin . "round")
- '(stroke-linecap . "round")
- `(stroke-width . ,blot-diameter)
- '(stroke . "black")
- '(fill . "black")
- `(d . ,(format #f "M ~S,~S l ~S,~S l ~S,~S l ~S,~S l ~S,~S"
- (/ b 2) (/ t 2)
- w (- h)
- 0 (- t)
- (- w) h
- 0 t))
- )))
(define (bezier-sandwich lst thick)
(let* ((first (list-tail lst 4))
(entity 'path ""
'(stroke-linejoin . "round")
'(stroke-linecap . "round")
+ '(stroke . "currentColor")
+ '(fill . "currentColor")
`(stroke-width . ,thick)
- '(stroke . "black")
- '(fill . "black")
`(d . ,(string-append (svg-bezier first #f)
(svg-bezier second first-c0)))
)))
+(define (path thick commands)
+ (define (convert-path-exps exps)
+ (if (pair? exps)
+ (let*
+ ((head (car exps))
+ (rest (cdr exps))
+ (arity
+ (cond
+ ((memq head '(rmoveto rlineto lineto moveto)) 2)
+ ((memq head '(rcurveto curveto)) 6)
+ (else 1)))
+ (args (take rest arity))
+ (svg-head (assoc-get head '((rmoveto . m)
+ (rcurveto . c)
+ (curveto . C)
+ (moveto . M)
+ (lineto . L)
+ (rlineto . l))
+ ""))
+ )
+
+ (cons (format "~a~a "
+ svg-head (number-list->point args)
+ )
+ (convert-path-exps (drop rest arity))))
+ '()))
+
+ (entity 'path ""
+ `(stroke-width . ,thick)
+ '(stroke-linejoin . "round")
+ '(stroke-linecap . "round")
+ '(stroke . "currentColor")
+ '(fill . "none")
+ `(d . ,(string-join (convert-path-exps commands) " "))))
+
(define (char font i)
(dispatch
`(fontify ,font ,(entity 'tspan (char->entity (integer->char i))))))
`((stroke-linejoin . "round")
(stroke-linecap . "round")
(stroke-width . ,thick)
- (stroke . "black")
- ;;'(fill . "black")
+ (stroke . "currentColor")
(x1 . ,x1)
- (y1 . ,y1)
+ (y1 . ,(- y1))
(x2 . ,x2)
- (y2 . ,y2))
+ (y2 . ,(- y2)))
alist)))
-(define (dashed-line thick on off dx dy)
+(define (dashed-line thick on off dx dy phase)
(draw-line thick 0 0 dx dy `(style . ,(format "stroke-dasharray:~a,~a;" on off))))
-;; WTF is this in every backend?
-(define (horizontal-line x1 x2 th)
- (filledbox (- x1) (- x2 x1) (* .5 th) (* .5 th)))
-
-(define (filledbox breapth width depth height)
- (round-filled-box breapth width depth height 0))
-
(define (named-glyph font name)
(dispatch
`(fontify ,font ,(entity 'tspan
(define (placebox x y expr)
(entity 'g
- ;; FIXME -- JCN
- ;;(dispatch expr)
expr
- `(transform . ,(format #f "translate (~f, ~f)"
+ ;; FIXME: Not using GNU coding standards [translate ()] here
+ ;; to work around a bug in Microsoft Internet Explorer 6.0
+ `(transform . ,(ly:format "translate(~f, ~f)"
x (- y)))))
-
-(define (polygon coords blot-diameter)
- (entity 'polygon ""
- '(stroke-linejoin . "round")
- '(stroke-linecap . "round")
- `(stroke-width . ,blot-diameter)
- '(stroke . "black")
- ;;'(fill . "black")
- `(points . ,(string-join
- (map offset->point (ly:list->offsets '() coords))))
- ))
+(define (polygon coords blot-diameter is-filled)
+ (entity
+ 'polygon ""
+ '(stroke-linejoin . "round")
+ '(stroke-linecap . "round")
+ `(stroke-width . ,blot-diameter)
+ `(fill . ,(if is-filled "currentColor" "none"))
+ '(stroke . "currentColor")
+ `(points . ,(string-join
+ (map offset->point (ly:list->offsets '() coords))))
+ ))
+
+;; rotate around given point
+(define (setrotation ang x y)
+ (format "<g transform=\"rotate(~a,~a,~a)\">"
+ (number->string (* -1 ang))
+ (number->string x)
+ (number->string (* -1 y))))
+
+(define (resetrotation ang x y)
+ "</g>")
(define (round-filled-box breapth width depth height blot-diameter)
(entity 'rect ""
`(ry . ,(/ blot-diameter 2))
))
+(define (circle radius thick is-filled)
+ (entity
+ 'circle ""
+ '(stroke-linejoin . "round")
+ '(stroke-linecap . "round")
+ `(fill . ,(if is-filled "currentColor" "none"))
+ `(stroke . "currentColor")
+ `(stroke-width . ,thick)
+ `(r . ,radius)))
+
+(define (ellipse x-radius y-radius thick is-filled)
+ (entity
+ 'ellipse ""
+ '(stroke-linejoin . "round")
+ '(stroke-linecap . "round")
+ `(fill . ,(if is-filled "currentColor" "none"))
+ `(stroke . "currentColor")
+ `(stroke-width . ,thick)
+ `(rx . ,x-radius)
+ `(ry . ,y-radius)))
+
+(define (oval x-radius y-radius thick is-filled)
+ (let ((x-max x-radius)
+ (x-min (- x-radius))
+ (y-max y-radius)
+ (y-min (- y-radius)))
+ (entity
+ 'path ""
+ '(stroke-linejoin . "round")
+ '(stroke-linecap . "round")
+ `(fill . ,(if is-filled "currentColor" "none"))
+ `(stroke . "currentColor")
+ `(stroke-width . ,thick)
+ `(d . ,(ly:format "M~4f,~4f C~4f,~4f ~4f,~4f ~4f,~4f S~4f,~4f ~4f,~4f"
+ x-max 0
+ x-max y-max
+ x-min y-max
+ x-min 0
+ x-max y-min
+ x-max 0)))))
+
(define (text font string)
(dispatch `(fontify ,font ,(entity 'tspan (string->entities string)))))
-(define (utf8-string pango-font-description string)
+(define (utf-8-string pango-font-description string)
(dispatch `(fontify ,pango-font-description ,(entity 'tspan string))))
+
+
+
+(define (setcolor r g b)
+ (format "<g color=\"rgb(~a%,~a%,~a%)\">"
+ (* 100 r) (* 100 g) (* 100 b)
+ ))
+
+(define (resetcolor)
+ "</g>")
projects / lilypond.git / blobdiff