make grob-interpret-markup, a public function.

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

diff --git a/scm/output-svg.scm b/scm/output-svg.scm
index cabf8f7da09d5ce7606fa6d763fe1a49036fe926..b0bf088b3697fb2867bd267a5fdd2852e9a1554b 100644 (file)
--- 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)
@@ -201,20 +212,40 @@
            )))
 
 (define (path thick commands)
-  (define (ps-path-entries->svg-path entries)
-    
+  (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 . "currentColor")
-           
+         '(fill . "none")
+         `(d . ,(string-join (convert-path-exps commands) " "))))
   
-  ))
-
-
 (define (char font i)
   (dispatch
    `(fontify ,font ,(entity 'tspan (char->entity (integer->char i))))))
@@ -236,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)