X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Foutput-svg.scm;h=b0bf088b3697fb2867bd267a5fdd2852e9a1554b;hb=929c5e8ed2ff44d60a6b7f403ba0762a99597458;hp=ab6ec5a6e206c8dab060546119995f4bd26e449a;hpb=51af9db63bb975c9b00af933b8ba3b433d5f7d41;p=lilypond.git

diff --git a/scm/output-svg.scm b/scm/output-svg.scm
index ab6ec5a6e2..b0bf088b36 100644
--- a/scm/output-svg.scm
+++ b/scm/output-svg.scm
@@ -24,6 +24,7 @@
  (guile)
  (ice-9 regex)
  (lily)
+ (srfi srfi-1)
  (srfi srfi-13))
 
 
@@ -70,6 +71,16 @@
 (define (offset->point o)
   (format #f " ~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)))
 	 (c123 (list-head lst 3)))
@@ -94,10 +105,10 @@
 	 (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*
@@ -118,7 +129,7 @@
 	  (set! size
 		(string->number (match:substring match 3))))
 
-	(ly:warning (_ "can't decypher Pango description: ~a") str))
+	(ly:warning (_ "cannot decypher Pango description: ~a") str))
 
     (set! style
 	  (if (string? style)
@@ -193,13 +204,48 @@
     (entity 'path ""
 	    '(stroke-linejoin . "round")
 	    '(stroke-linecap . "round")
-	    `(stroke-width . ,thick)
 	    '(stroke . "currentColor")
 	    '(fill . "currentColor")
+	    `(stroke-width . ,thick)
 	    `(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))))))
@@ -221,7 +267,7 @@
 	    (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))))
 
 (define (named-glyph font name)
@@ -232,10 +278,9 @@
 
 (define (placebox x y expr)
   (entity 'g
-	  
-	  ;; FIXME -- JCN
-	  ;;(dispatch expr)
 	  expr
+	  ;; 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)))))
 
@@ -251,6 +296,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,