Merge branch 'master-git.sv.gnu.org-lilypond.git' of /home/lilydev/vc/gub/downloads...

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

diff --git a/scm/output-svg.scm b/scm/output-svg.scm
index 3ed5e22c148d5dc152839ae2972f088257b2d4fa..b0bf088b3697fb2867bd267a5fdd2852e9a1554b 100644 (file)
--- a/scm/output-svg.scm
+++ b/scm/output-svg.scm
@@ -105,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*
@@ -129,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)
@@ -267,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)