;;;;
;;;; source file of the GNU LilyPond music typesetter
;;;;
-;;;; (c) 2002--2007 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 2002--2009 Jan Nieuwenhuizen <janneke@gnu.org>
;;;; http://www.w3.org/TR/SVG11
;;;; http://www.w3.org/TR/SVG12/ -- page, pageSet in draft
(apply string-append
(map (lambda (x) (char->entity x)) (string->list string))))
+(define svg-element-regexp
+ (make-regexp "^(<[a-z]+) (.*>)"))
+
(define pango-description-regexp-comma
- (make-regexp "([^,]+), ?([-a-zA-Z_]*) ([0-9.]+)$"))
+ (make-regexp ",( Bold)?( Italic)?( Small-Caps)? ([0-9.]+)$"))
(define pango-description-regexp-nocomma
- (make-regexp "([^ ]+) ([-a-zA-Z_]*) ?([0-9.]+)$"))
+ (make-regexp "( Bold)?( Italic)?( Small-Caps)? ([0-9.]+)$"))
-(define (pango-description-to-svg-font str)
+(define (pango-description-to-svg-font str expr)
+ (define alist '())
+ (define (set-attribute attr val)
+ (set! alist (assoc-set! alist attr val)))
(let*
- ((size 4.0)
- (family "Helvetica")
- (style #f)
- (match-1 (regexp-exec pango-description-regexp-comma str))
- (match-2 (regexp-exec pango-description-regexp-nocomma str))
- (match (if match-1
- match-1
- match-2)))
+ ((match-1 (regexp-exec pango-description-regexp-comma str))
+ (match-2 (regexp-exec pango-description-regexp-nocomma str))
+ (match (if match-1
+ match-1
+ match-2)))
(if (regexp-match? match)
(begin
- (set! family (match:substring match 1))
- (if (< 0 (string-length (match:substring match 2)))
- (set! style (match:substring match 2)))
- (set! size
- (string->number (match:substring match 3))))
-
+ (set-attribute 'font-family (match:prefix match))
+ (if (string? (match:substring match 1))
+ (set-attribute 'font-weight "bold"))
+ (if (string? (match:substring match 2))
+ (set-attribute 'font-style "italic"))
+ (if (string? (match:substring match 3))
+ (set-attribute 'font-variant "small-caps"))
+ (set-attribute 'font-size
+ (/ (string->number (match:substring match 4))
+ lily-unit-length))
+ (set-attribute 'text-anchor "start")
+ (set-attribute 'fill "currentColor"))
(ly:warning (_ "cannot decypher Pango description: ~a") str))
- (set! style
- (if (string? style)
- (format "font-style:~a;" style)
- ""))
-
- (format "font-family:~a;~afont-size:~a;text-anchor:west"
- family
- style
- (/ size lily-unit-length))
- ))
-
-;;; FONT may be font smob, or pango font string
-(define (svg-font font)
- (if (string? font)
- (pango-description-to-svg-font font)
- (let ((name-style (font-name-style font))
- (size (modified-font-metric-font-scaling font))
- (anchor "west"))
+ (apply entity 'text expr (reverse! alist))))
- (format "font-family:~a;font-style:~a;font-size:~a;text-anchor:~a;"
- (car name-style) (cadr name-style)
- size anchor))))
+(define (font-smob-to-svg-font font expr)
+ (let ((name-style (font-name-style font))
+ (size (modified-font-metric-font-scaling font)))
+
+ (entity 'text expr
+ ;; FIXME: The cdr of `name-style' cannot select the
+ ;; correct SVG font, so we ignore this information for now
+ `(font-family . ,(car name-style))
+ `(font-size . ,size)
+ '(text-anchor . "start"))))
(define (fontify font expr)
- (entity 'text expr
- `(style . ,(svg-font font))
- '(fill . "currentColor")
- ))
+ (if (string? font)
+ (pango-description-to-svg-font font expr)
+ (font-smob-to-svg-font font expr)))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;; stencil outputters
;;;
-;;; catch-all for missing stuff
-;;; comment this out to see find out what functions you miss :-)
-
-(if #f
- (begin
- (define (dummy . foo) "")
- (map (lambda (x) (module-define! this-module x dummy))
- (append
- (ly:all-stencil-expressions)
- (ly:all-output-backend-commands)))
- ))
(define (url-link url x y)
(string-append
`(fontify ,font ,(entity 'tspan (char->entity (integer->char i))))))
(define-public (comment s)
- (string-append "<!-- " s " !-->\n"))
+ (string-append "<!-- " s " -->\n"))
(define (draw-line thick x1 y1 x2 y2 . alist)
(ly:font-glyph-name-to-charcode font name))))))
(define (placebox x y expr)
- (entity 'g
- expr
- ;; 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)))))
+ (let*
+ ((match (regexp-exec svg-element-regexp expr))
+ (tagname (match:substring match 1))
+ (attributes (match:substring match 2)))
+
+ (string-append tagname
+ ;; FIXME: Not using GNU coding standards
+ ;; [translate ()] here to work around a
+ ;; bug in Microsoft Internet Explorer 6.0
+ (ly:format " transform=\"translate(~f, ~f)\" " x (- y))
+ attributes
+ "\n")))
(define (polygon coords blot-diameter is-filled)
(entity
;; rotate around given point
(define (setrotation ang x y)
- (format "<g transform=\"rotate(~a,~a,~a)\">"
+ (format "<g transform=\"rotate(~a,~a,~a)\">\n"
(number->string (* -1 ang))
(number->string x)
(number->string (* -1 y))))
(define (resetrotation ang x y)
- "</g>")
+ "</g>\n")
(define (round-filled-box breapth width depth height blot-diameter)
(entity 'rect ""
`(width . ,(+ breapth width))
`(height . ,(+ depth height))
`(ry . ,(/ blot-diameter 2))
+ '(fill . "currentColor")
))
(define (circle radius thick is-filled)
`(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 (utf-8-string pango-font-description string)
(dispatch `(fontify ,pango-font-description ,(entity 'tspan string))))
-
+(define (embedded-svg string)
+ string)
(define (setcolor r g b)
- (format "<g color=\"rgb(~a%,~a%,~a%)\">"
+ (format "<g color=\"rgb(~a%,~a%,~a%)\">\n"
(* 100 r) (* 100 g) (* 100 b)
))
(define (resetcolor)
- "</g>")
+ "</g>\n")
projects / lilypond.git / blobdiff