X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Foutput-svg.scm;h=786a37ca177deb434518e3b5e2d650053dba97bd;hb=d8129105de72faa549e7d1f5667973233b67cf60;hp=786efb8602cc2212514407b30ae5ae5936c8aab6;hpb=bf41bb2eb8df456cdf738d42062b28d21bf42b6c;p=lilypond.git

diff --git a/scm/output-svg.scm b/scm/output-svg.scm
index 786efb8602..786a37ca17 100644
--- a/scm/output-svg.scm
+++ b/scm/output-svg.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;;
-;;;; (c) 2002--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 2002--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 
 ;;;; http://www.w3.org/TR/SVG11
 ;;;; http://www.w3.org/TR/SVG12/ -- page, pageSet in draft
@@ -60,10 +60,6 @@
   (format #f "</~S>\n" entity))
 
 
-(define-public (setcolor r g b))
-
-(define-public (resetcolor))
-
 
 (define-public (entity entity string . attributes-alist)
   (if (equal? string "")
@@ -189,64 +185,6 @@
   "")
 
 
-(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 . "currentColor")
-	    '(fill . "currentColor")
-	    `(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 . "currentColor")
-	    '(fill . "currentColor")
-	    `(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))
@@ -286,9 +224,6 @@
 (define (dashed-line thick on off dx dy)
   (draw-line thick 0 0 dx dy `(style . ,(format "stroke-dasharray:~a,~a;" on off))))
 
-(define (filledbox breapth width depth height)
-  (round-filled-box breapth width depth height 0))
-
 (define (named-glyph font name)
   (dispatch
    `(fontify ,font ,(entity 'tspan
@@ -297,10 +232,10 @@
 
 (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 . ,(format #f "translate(~f, ~f)"
 				 x (- y)))))
 
 (define (polygon coords blot-diameter is-filled)
@@ -315,6 +250,16 @@
 		(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 ""
 	  ;; The stroke will stick out.  To use stroke,
@@ -345,7 +290,7 @@
 (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))))