Run `make grand-replace'.

[lilypond.git] / scm / output-svg.scm

diff --git a/scm/output-svg.scm b/scm/output-svg.scm
index 034f831f97bdaa36065b7d671959008544ff55e1..b6bdb2721c56abc52ee406bf07c4a4bb900e2ec5 100644 (file)
--- a/scm/output-svg.scm
+++ b/scm/output-svg.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 2002--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 2002--2008 Jan Nieuwenhuizen <janneke@gnu.org>
 
 ;;;; http://www.w3.org/TR/SVG11
 ;;;; http://www.w3.org/TR/SVG12/ -- page, pageSet in draft
@@ -23,10 +23,12 @@
 (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)
@@ -96,7 +98,7 @@
   (* x x))
 
 (define (integer->entity integer)
-  (format "&#x~x;" integer))
+  (fancy-format "&#x~x;" integer))
 
 (define (char->entity char)
   (integer->entity (char->integer char)))
@@ -282,7 +284,7 @@
          expr
          ;; FIXME: Not using GNU coding standards [translate ()] here
          ;; to work around a bug in Microsoft Internet Explorer 6.0
-         `(transform . ,(format "translate(~f, ~f)"
+         `(transform . ,(ly:format "translate(~f, ~f)"
                                 x (- y)))))
 
 (define (polygon coords blot-diameter is-filled)
@@ -334,6 +336,37 @@
    `(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)))))