X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Foutput-svg.scm;h=60ad51f2814788d22008ab75d572fb9ee5f4f9c3;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=d993c356358c94fa21fe70f57c09e28cce49687b;hpb=9a2ffbf058002a6a82acc5748a2998840885afb8;p=lilypond.git

diff --git a/scm/output-svg.scm b/scm/output-svg.scm
index d993c35635..60ad51f281 100644
--- a/scm/output-svg.scm
+++ b/scm/output-svg.scm
@@ -1,6 +1,6 @@
 ;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;; Copyright (C) 2002--2011 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; Copyright (C) 2002--2014 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;;                Patrick McCarty <pnorcks@gmail.com>
 ;;;;
 ;;;; LilyPond is free software: you can redistribute it and/or modify
@@ -17,46 +17,37 @@
 ;;;; along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (scm output-svg))
-(define this-module (current-module))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; globals
 
 ;;; set by framework-gnome.scm
 (define paper #f)
-  
+
 (use-modules
-  (guile)
-  (ice-9 regex)
-  (ice-9 format)
-  (ice-9 optargs)
-  (lily)
-  (srfi srfi-1)
-  (srfi srfi-13))
+ (guile)
+ (ice-9 regex)
+ (ice-9 format)
+ (ice-9 optargs)
+ (lily)
+ (srfi srfi-1)
+ (srfi srfi-13))
 
 (define fancy-format format)
 (define format ergonomic-simple-format)
 
 (define lily-unit-length 1.7573)
 
-(define (dispatch expr)
-  (let ((keyword (car expr)))
-    (cond ((eq? keyword 'some-func) "")
-	  (else (if (module-defined? this-module keyword)
-		    (apply (eval keyword this-module) (cdr expr))
-		    (begin (ly:warning (_ "undefined: ~S") keyword)
-			   ""))))))
-
 ;; Helper functions
 (define-public (attributes attributes-alist)
-  (apply string-append
-	 (map (lambda (x)
-		(let ((attr (car x))
-		      (value (cdr x)))
-		  (if (number? value)
-		      (set! value (ly:format "~4f" value)))
-		  (format #f " ~s=\"~a\"" attr value)))
-	      attributes-alist)))
+  (string-concatenate
+   (map (lambda (x)
+          (let ((attr (car x))
+                (value (cdr x)))
+            (if (number? value)
+                (set! value (ly:format "~4f" value)))
+            (format #f " ~s=\"~a\"" attr value)))
+        attributes-alist)))
 
 (define-public (eo entity . attributes-alist)
   "o = open"
@@ -70,6 +61,12 @@
   "c = close"
   (format #f "</~S>\n" entity))
 
+(define (start-enclosing-id-node s)
+  (string-append "<g id=\"" s "\">\n"))
+
+(define (end-enclosing-id-node)
+  "</g>\n")
+
 (define-public (comment s)
   (string-append "<!-- " s " -->\n"))
 
@@ -77,7 +74,7 @@
   (if (equal? string "")
       (apply eoc entity attributes-alist)
       (string-append
-	(apply eo (cons entity attributes-alist)) string (ec entity))))
+       (apply eo (cons entity attributes-alist)) string (ec entity))))
 
 (define (offset->point o)
   (ly:format "~4f ~4f" (car o) (- (cdr o))))
@@ -85,21 +82,21 @@
 (define (number-list->point lst)
   (define (helper lst)
     (if (null? lst)
-	'()
-	(cons (format #f "~S ~S" (car lst) (- (cadr lst)))
-	      (helper (cddr lst)))))
+        '()
+        (cons (format #f "~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)))
+         (c123 (list-head lst 3)))
     (string-append
-      (if (not close) "M" "L")
-      (offset->point c0)
-      "C" (string-join (map offset->point c123) " ")
-      (if (not close) "" "z"))))
+     (if (not close) "M" "L")
+     (offset->point c0)
+     "C" (string-join (map offset->point c123) " ")
+     (if (not close) "" "z"))))
 
 (define (sqr x)
   (* x x))
@@ -111,8 +108,8 @@
   (integer->entity (char->integer char)))
 
 (define (string->entities string)
-  (apply string-append
-	 (map (lambda (x) (char->entity x)) (string->list string))))
+  (string-concatenate
+   (map char->entity (string->list string))))
 
 (define svg-element-regexp
   (make-regexp "^(<[a-z]+) ?(.*>)"))
@@ -131,24 +128,24 @@
   (define (set-attribute attr val)
     (set! alist (assoc-set! alist attr val)))
   (let* ((match-1 (regexp-exec pango-description-regexp-comma str))
-	 (match-2 (regexp-exec pango-description-regexp-nocomma str))
-	 (match (if match-1 match-1 match-2)))
+         (match-2 (regexp-exec pango-description-regexp-nocomma str))
+         (match (if match-1 match-1 match-2)))
 
     (if (regexp-match? match)
-	(begin
-	  (set-attribute 'font-family (match:prefix match))
-	  (if (string? (match:substring match 1))
-	      (set-attribute 'font-weight "bold"))
-	  (if (string? (match:substring match 2))
-	      (set-attribute 'font-style "italic"))
-	  (if (string? (match:substring match 3))
-	      (set-attribute 'font-variant "small-caps"))
-	  (set-attribute 'font-size
-			 (/ (string->number (match:substring match 4))
-			    lily-unit-length))
-	  (set-attribute 'text-anchor "start")
-	  (set-attribute 'fill "currentColor"))
-	(ly:warning (_ "cannot decypher Pango description: ~a") str))
+        (begin
+          (set-attribute 'font-family (match:prefix match))
+          (if (string? (match:substring match 1))
+              (set-attribute 'font-weight "bold"))
+          (if (string? (match:substring match 2))
+              (set-attribute 'font-style "italic"))
+          (if (string? (match:substring match 3))
+              (set-attribute 'font-variant "small-caps"))
+          (set-attribute 'font-size
+                         (/ (string->number (match:substring match 4))
+                            lily-unit-length))
+          (set-attribute 'text-anchor "start")
+          (set-attribute 'fill "currentColor"))
+        (ly:warning (_ "cannot decypher Pango description: ~a") str))
 
     (apply entity 'text expr (reverse! alist))))
 
@@ -158,21 +155,21 @@
     (set! alist (assoc-set! alist attr val)))
   (if (not (null? rest))
       (let* ((dx (car rest))
-	     (dy (cadr rest))
-	     (total-x (+ dx next-horiz-adv)))
-	(if (or (not (zero? total-x))
-		(not (zero? dy)))
-	    (let ((x (ly:format "~4f" total-x))
-		  (y (ly:format "~4f" dy)))
-	      (set-attribute 'transform
-			     (string-append
-			       "translate(" x ", " y ") "
-			       "scale(" scale ", -" scale ")")))
-	    (set-attribute 'transform
-			   (string-append
-			     "scale(" scale ", -" scale ")"))))
+             (dy (cadr rest))
+             (total-x (+ dx next-horiz-adv)))
+        (if (or (not (zero? total-x))
+                (not (zero? dy)))
+            (let ((x (ly:format "~4f" total-x))
+                  (y (ly:format "~4f" dy)))
+              (set-attribute 'transform
+                             (string-append
+                              "translate(" x ", " y ") "
+                              "scale(" scale ", -" scale ")")))
+            (set-attribute 'transform
+                           (string-append
+                            "scale(" scale ", -" scale ")"))))
       (set-attribute 'transform (string-append
-				  "scale(" scale ", -" scale ")")))
+                                 "scale(" scale ", -" scale ")")))
 
   (set-attribute 'd path)
   (set-attribute 'fill "currentColor")
@@ -204,112 +201,112 @@
 ;;
 (define (glyph-element-regexp name)
   (make-regexp (string-append "<glyph"
-			      "(([[:space:]]+[-a-z]+=\"[^\"]*\")+)?"
-			      "[[:space:]]+glyph-name=\"("
-			      name
-			      ")\""
-			      "(([[:space:]]+[-a-z]+=\"[^\"]*\")+)?"
-			      "([[:space:]]+)?"
-			      "/>")))
+                              "(([[:space:]]+[-a-z]+=\"[^\"]*\")+)?"
+                              "[[:space:]]+glyph-name=\"("
+                              name
+                              ")\""
+                              "(([[:space:]]+[-a-z]+=\"[^\"]*\")+)?"
+                              "([[:space:]]+)?"
+                              "/>")))
 
 (define (extract-glyph all-glyphs name size . rest)
   (let* ((new-name (regexp-quote name))
-	 (regexp (regexp-exec (glyph-element-regexp new-name) all-glyphs))
-	 (glyph (match:substring regexp))
-	 (unicode-attr (regexp-exec glyph-unicode-value-regexp glyph))
-	 (unicode-attr-value (match:substring unicode-attr 1))
-	 (unicode-attr? (regexp-match? unicode-attr))
-	 (d-attr (regexp-exec glyph-path-regexp glyph))
-	 (d-attr-value "")
-	 (d-attr? (regexp-match? d-attr))
-	 ;; TODO: not urgent, but do not hardcode this value
-	 (units-per-em 1000)
-	 (font-scale (ly:format "~4f" (/ size units-per-em)))
-	 (path ""))
+         (regexp (regexp-exec (glyph-element-regexp new-name) all-glyphs))
+         (glyph (match:substring regexp))
+         (unicode-attr (regexp-exec glyph-unicode-value-regexp glyph))
+         (unicode-attr-value (match:substring unicode-attr 1))
+         (unicode-attr? (regexp-match? unicode-attr))
+         (d-attr (regexp-exec glyph-path-regexp glyph))
+         (d-attr-value "")
+         (d-attr? (regexp-match? d-attr))
+         ;; TODO: not urgent, but do not hardcode this value
+         (units-per-em 1000)
+         (font-scale (ly:format "~4f" (/ size units-per-em)))
+         (path ""))
 
     (if (and unicode-attr? (not unicode-attr-value))
-	(ly:warning (_ "Glyph must have a unicode value")))
+        (ly:warning (_ "Glyph must have a unicode value")))
 
     (if d-attr? (set! d-attr-value (match:substring d-attr 1)))
 
     (cond (
-	   ;; Glyph-strings with path data
-	   (and d-attr? (not (null? rest)))
-	   (begin
-	     (set! path (apply dump-path d-attr-value
-					 font-scale
-					 (list (cadr rest) (caddr rest))))
-	     (set! next-horiz-adv (+ next-horiz-adv
-				     (car rest)))
-	     path))
-	  ;; Glyph-strings without path data ("space")
-	  ((and (not d-attr?) (not (null? rest)))
-	   (begin
-	     (set! next-horiz-adv (+ next-horiz-adv
-				     (car rest)))
-	     ""))
-	  ;; Font smobs with path data
-	  ((and d-attr? (null? rest))
-	    (set! path (dump-path d-attr-value font-scale))
-	    path)
-	  ;; Font smobs without path data ("space")
-	  (else
-	    ""))))
+           ;; Glyph-strings with path data
+           (and d-attr? (not (null? rest)))
+           (begin
+             (set! path (apply dump-path d-attr-value
+                               font-scale
+                               (list (caddr rest) (cadddr rest))))
+             (set! next-horiz-adv (+ next-horiz-adv
+                                     (car rest)))
+             path))
+          ;; Glyph-strings without path data ("space")
+          ((and (not d-attr?) (not (null? rest)))
+           (begin
+             (set! next-horiz-adv (+ next-horiz-adv
+                                     (car rest)))
+             ""))
+          ;; Font smobs with path data
+          ((and d-attr? (null? rest))
+           (set! path (dump-path d-attr-value font-scale))
+           path)
+          ;; Font smobs without path data ("space")
+          (else
+           ""))))
 
 (define (extract-glyph-info all-glyphs glyph size)
-  (let* ((offsets (list-head glyph 3))
-	 (glyph-name (car (reverse glyph))))
+  (let* ((offsets (list-head glyph 4))
+         (glyph-name (car (reverse glyph))))
     (apply extract-glyph all-glyphs glyph-name size offsets)))
 
 (define (svg-defs svg-font)
   (let ((start (string-contains svg-font "<defs>"))
-	(end (string-contains svg-font "</defs>")))
+        (end (string-contains svg-font "</defs>")))
     (substring svg-font (+ start 7) (- end 1))))
 
 (define (cache-font svg-font size glyph)
   (let ((all-glyphs (svg-defs (cached-file-contents svg-font))))
     (if (list? glyph)
-	(extract-glyph-info all-glyphs glyph size)
-	(extract-glyph all-glyphs glyph size))))
+        (extract-glyph-info all-glyphs glyph size)
+        (extract-glyph all-glyphs glyph size))))
 
 
 (define (music-string-to-path font size glyph)
   (let* ((name-style (font-name-style font))
-	 (scaled-size (/ size lily-unit-length))
-	 (font-file (ly:find-file (string-append name-style ".svg"))))
+         (scaled-size (/ size lily-unit-length))
+         (font-file (ly:find-file (string-append name-style ".svg"))))
 
     (if font-file
-	(cache-font font-file scaled-size glyph)
-	(ly:warning (_ "cannot find SVG font ~S") font-file))))
+        (cache-font font-file scaled-size glyph)
+        (ly:warning (_ "cannot find SVG font ~S") font-file))))
 
 
 (define (font-smob-to-path font glyph)
   (let* ((name-style (font-name-style font))
-	 (scaled-size (modified-font-metric-font-scaling font))
-	 (font-file (ly:find-file (string-append name-style ".svg"))))
+         (scaled-size (modified-font-metric-font-scaling font))
+         (font-file (ly:find-file (string-append name-style ".svg"))))
 
     (if font-file
-	(cache-font font-file scaled-size glyph)
-	(ly:warning (_ "cannot find SVG font ~S") font-file))))
+        (cache-font font-file scaled-size glyph)
+        (ly:warning (_ "cannot find SVG font ~S") font-file))))
 
 (define (woff-font-smob-to-text font expr)
   (let* ((name-style (font-name-style font))
-	 (scaled-size (modified-font-metric-font-scaling font))
-	 (font-file (ly:find-file (string-append name-style ".woff")))
-	 (charcode (ly:font-glyph-name-to-charcode font expr))
-	 (char-lookup (format #f "&#~S;" charcode))
-	 (glyph-by-name (eoc 'altglyph `(glyphname . ,expr)))
-	 (apparently-broken
-	  (comment "FIXME: how to select glyph by name, altglyph is broken?"))
-	 (text (string-regexp-substitute "\n" ""
-		(string-append glyph-by-name apparently-broken char-lookup))))
-  (define alist '())
-  (define (set-attribute attr val)
-    (set! alist (assoc-set! alist attr val)))
-  (set-attribute 'font-family name-style)
-  (set-attribute 'font-size scaled-size)
-  (apply entity 'text text (reverse! alist))))
-  
+         (scaled-size (modified-font-metric-font-scaling font))
+         (font-file (ly:find-file (string-append name-style ".woff")))
+         (charcode (ly:font-glyph-name-to-charcode font expr))
+         (char-lookup (format #f "&#~S;" charcode))
+         (glyph-by-name (eoc 'altglyph `(glyphname . ,expr)))
+         (apparently-broken
+          (comment "FIXME: how to select glyph by name, altglyph is broken?"))
+         (text (string-regexp-substitute "\n" ""
+                                         (string-append glyph-by-name apparently-broken char-lookup))))
+    (define alist '())
+    (define (set-attribute attr val)
+      (set! alist (assoc-set! alist attr val)))
+    (set-attribute 'font-family name-style)
+    (set-attribute 'font-size scaled-size)
+    (apply entity 'text text (reverse! alist))))
+
 (define font-smob-to-text
   (if (not (ly:get-option 'svg-woff))
       font-smob-to-path woff-font-smob-to-text))
@@ -323,59 +320,46 @@
 ;;; stencil outputters
 ;;;
 
-(define (bezier-sandwich lst thick)
-  (let* ((first (list-tail lst 4))
-	 (second (list-head lst 4)))
-    (entity 'path ""
-	    '(stroke-linejoin . "round")
-	    '(stroke-linecap . "round")
-	    '(stroke . "currentColor")
-	    '(fill . "currentColor")
-	    `(stroke-width . ,thick)
-	    `(d . ,(string-append (svg-bezier first #f)
-				  (svg-bezier second #t))))))
-
 (define (char font i)
-  (dispatch
-   `(fontify ,font ,(entity 'tspan (char->entity (integer->char i))))))
+  (fontify font (entity 'tspan (char->entity (integer->char i)))))
 
 (define (circle radius thick is-filled)
   (entity
-    'circle ""
-    '(stroke-linejoin . "round")
-    '(stroke-linecap . "round")
-    `(fill . ,(if is-filled "currentColor" "none"))
-    `(stroke . "currentColor")
-    `(stroke-width . ,thick)
-    `(r . ,radius)))
+   'circle ""
+   '(stroke-linejoin . "round")
+   '(stroke-linecap . "round")
+   `(fill . ,(if is-filled "currentColor" "none"))
+   `(stroke . "currentColor")
+   `(stroke-width . ,thick)
+   `(r . ,radius)))
 
 (define (dashed-line thick on off dx dy phase)
   (draw-line thick 0 0 dx dy
-	     `(stroke-dasharray . ,(format #f "~a,~a" on off))))
+             `(stroke-dasharray . ,(format #f "~a,~a" on off))))
 
 (define (draw-line thick x1 y1 x2 y2 . alist)
   (apply entity 'line ""
-	 (append
-	   `((stroke-linejoin . "round")
-	     (stroke-linecap . "round")
-	     (stroke-width . ,thick)
-	     (stroke . "currentColor")
-	     (x1 . ,x1)
-	     (y1 . ,(- y1))
-	     (x2 . ,x2)
-	     (y2 . ,(- y2)))
-	   alist)))
+         (append
+          `((stroke-linejoin . "round")
+            (stroke-linecap . "round")
+            (stroke-width . ,thick)
+            (stroke . "currentColor")
+            (x1 . ,x1)
+            (y1 . ,(- y1))
+            (x2 . ,x2)
+            (y2 . ,(- y2)))
+          alist)))
 
 (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)))
+   '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 (partial-ellipse x-radius y-radius start-angle end-angle thick connect fill)
   (define (make-ellipse-radius x-radius y-radius angle)
@@ -385,38 +369,38 @@
                 (* (* x-radius x-radius)
                    (* (sin angle) (sin angle)))))))
   (let*
-    ((new-start-angle (* PI-OVER-180 (angle-0-360 start-angle)))
-     (start-radius (make-ellipse-radius x-radius y-radius new-start-angle))
-     (new-end-angle (* PI-OVER-180 (angle-0-360 end-angle)))
-     (end-radius (make-ellipse-radius x-radius y-radius new-end-angle))
-     (epsilon 1.5e-3)
-     (x-end (- (* end-radius (cos new-end-angle))
-               (* start-radius (cos new-start-angle))))
-     (y-end (- (* end-radius (sin new-end-angle))
-               (* start-radius (sin new-start-angle)))))
-   (if (and (< (abs x-end) epsilon) (< (abs y-end) epsilon))
-    (entity
-      'ellipse ""
-      `(fill . ,(if fill "currentColor" "none"))
-      `(stroke . "currentColor")
-      `(stroke-width . ,thick)
-      '(stroke-linejoin . "round")
-      '(stroke-linecap . "round")
-      '(cx . 0)
-      '(cy . 0)
-      `(rx . ,x-radius)
-      `(ry . ,y-radius))
-    (entity
-      'path ""
-      `(fill . ,(if fill "currentColor" "none"))
-      `(stroke . "currentColor")
-      `(stroke-width . ,thick)
-      '(stroke-linejoin . "round")
-      '(stroke-linecap . "round")
-      (cons
-        'd
-        (string-append
-          (ly:format
+      ((new-start-angle (* PI-OVER-180 (angle-0-360 start-angle)))
+       (start-radius (make-ellipse-radius x-radius y-radius new-start-angle))
+       (new-end-angle (* PI-OVER-180 (angle-0-360 end-angle)))
+       (end-radius (make-ellipse-radius x-radius y-radius new-end-angle))
+       (epsilon 1.5e-3)
+       (x-end (- (* end-radius (cos new-end-angle))
+                 (* start-radius (cos new-start-angle))))
+       (y-end (- (* end-radius (sin new-end-angle))
+                 (* start-radius (sin new-start-angle)))))
+    (if (and (< (abs x-end) epsilon) (< (abs y-end) epsilon))
+        (entity
+         'ellipse ""
+         `(fill . ,(if fill "currentColor" "none"))
+         `(stroke . "currentColor")
+         `(stroke-width . ,thick)
+         '(stroke-linejoin . "round")
+         '(stroke-linecap . "round")
+         '(cx . 0)
+         '(cy . 0)
+         `(rx . ,x-radius)
+         `(ry . ,y-radius))
+        (entity
+         'path ""
+         `(fill . ,(if fill "currentColor" "none"))
+         `(stroke . "currentColor")
+         `(stroke-width . ,thick)
+         '(stroke-linejoin . "round")
+         '(stroke-linecap . "round")
+         (cons
+          'd
+          (string-append
+           (ly:format
             "M~4f ~4fA~4f ~4f 0 ~4f 0 ~4f ~4f"
             (* start-radius (cos new-start-angle))
             (- (* start-radius (sin new-start-angle)))
@@ -425,189 +409,183 @@
             (if (> 0 (- new-start-angle new-end-angle)) 0 1)
             (* end-radius (cos new-end-angle))
             (- (* end-radius (sin new-end-angle))))
-            (if connect
-                (ly:format "L~4f,~4f"
-                           (* start-radius (cos new-start-angle))
-                           (- (* start-radius (sin new-start-angle))))
-                "")))))))
+           (if connect
+               (ly:format "L~4f,~4f"
+                          (* start-radius (cos new-start-angle))
+                          (- (* start-radius (sin new-start-angle))))
+               "")))))))
 
 (define (embedded-svg string)
   string)
 
-(define (embedded-glyph-string font size cid glyphs)
+(define (embedded-glyph-string pango-font font size cid glyphs)
   (define path "")
   (if (= 1 (length glyphs))
       (set! path (music-string-to-path font size (car glyphs)))
       (begin
-	(set! path
-	      (string-append (eo 'g)
-			     (string-join
-			       (map (lambda (x)
-				      (music-string-to-path font size x))
-				    glyphs)
-			       "\n")
-			     (ec 'g)))))
+        (set! path
+              (string-append (eo 'g)
+                             (string-join
+                              (map (lambda (x)
+                                     (music-string-to-path font size x))
+                                   glyphs)
+                              "\n")
+                             (ec 'g)))))
   (set! next-horiz-adv 0.0)
   path)
 
-(define (woff-glyph-string font-name size cid? w-x-y-named-glyphs)
+(define (woff-glyph-string pango-font font-name size cid? w-h-x-y-named-glyphs)
   (let* ((name-style (font-name-style font-name))
-	 (family-designsize (regexp-exec (make-regexp "(.*)-([0-9]*)")
-					 font-name))
-	 (family (if (regexp-match? family-designsize)
-		     (match:substring family-designsize 1)
-		     font-name))
-	 (design-size (if (regexp-match? family-designsize)
-			  (match:substring family-designsize 2)
-			  #f))
-	 (scaled-size (/ size lily-unit-length))
-	 (font (ly:paper-get-font paper `(((font-family . ,family)
-					   ,(if design-size
-						`(design-size . design-size)))))))
-    (define (glyph-spec w x y g)
+         (family-designsize (regexp-exec (make-regexp "(.*)-([0-9]*)")
+                                         font-name))
+         (family (if (regexp-match? family-designsize)
+                     (match:substring family-designsize 1)
+                     font-name))
+         (design-size (if (regexp-match? family-designsize)
+                          (match:substring family-designsize 2)
+                          #f))
+         (scaled-size (/ size lily-unit-length))
+         (font (ly:paper-get-font paper `(((font-family . ,family)
+                                           ,(if design-size
+                                                `(design-size . design-size)))))))
+    (define (glyph-spec w h x y g) ; h not used
       (let* ((charcode (ly:font-glyph-name-to-charcode font g))
-	     (char-lookup (format #f "&#~S;" charcode))
-	     (glyph-by-name (eoc 'altglyph `(glyphname . ,g)))
-	     (apparently-broken
-	      (comment "XFIXME: how to select glyph by name, altglyph is broken?")))
-	;; what is W?
-	(ly:format
-	 "<text~a font-family=\"~a\" font-size=\"~a\">~a</text>"
-	 (if (or (> (abs x) 0.00001)
-		 (> (abs y) 0.00001))
-	     (ly:format " transform=\"translate(~4f,~4f)\"" x y)
-	     " ")
-	 name-style scaled-size
-	 (string-regexp-substitute
-	  "\n" ""
-	  (string-append glyph-by-name apparently-broken char-lookup)))))
+             (char-lookup (format #f "&#~S;" charcode))
+             (glyph-by-name (eoc 'altglyph `(glyphname . ,g)))
+             (apparently-broken
+              (comment "XFIXME: how to select glyph by name, altglyph is broken?")))
+        ;; what is W?
+        (ly:format
+         "<text~a font-family=\"~a\" font-size=\"~a\">~a</text>"
+         (if (or (> (abs x) 0.00001)
+                 (> (abs y) 0.00001))
+             (ly:format " transform=\"translate(~4f,~4f)\"" x y)
+             " ")
+         name-style scaled-size
+         (string-regexp-substitute
+          "\n" ""
+          (string-append glyph-by-name apparently-broken char-lookup)))))
 
     (string-join (map (lambda (x) (apply glyph-spec x))
-		      (reverse w-x-y-named-glyphs)) "\n")))
+                      (reverse w-h-x-y-named-glyphs)) "\n")))
 
 (define glyph-string
   (if (not (ly:get-option 'svg-woff)) embedded-glyph-string woff-glyph-string))
 
 (define (grob-cause offset grob)
-  "")
+  (and (ly:get-option 'point-and-click)
+       (let* ((cause (ly:grob-property grob 'cause))
+              (music-origin (if (ly:stream-event? cause)
+                                (ly:event-property cause 'origin)))
+              (point-and-click (ly:get-option 'point-and-click)))
+         (and (ly:input-location? music-origin)
+              (cond ((boolean? point-and-click) point-and-click)
+                    ((symbol? point-and-click)
+                     (ly:in-event-class? cause point-and-click))
+                    (else (any (lambda (t)
+                                 (ly:in-event-class? cause t))
+                               point-and-click)))
+              (let* ((location (ly:input-file-line-char-column music-origin))
+                     (raw-file (car location))
+                     (file (if (is-absolute? raw-file)
+                               raw-file
+                               (string-append (ly-getcwd) "/" raw-file))))
+                
+                (ly:format "<a style=\"color:inherit;\" xlink:href=\"textedit://~a:~a:~a:~a\">\n"
+                           ;; Backslashes are not valid
+                           ;; file URI path separators.
+                           (ly:string-percent-encode
+                            (ly:string-substitute "\\" "/" file))
+                           
+                           (cadr location)
+                           (caddr location)
+                           (1+ (cadddr location))))))))
 
 (define (named-glyph font name)
-  (dispatch `(fontify ,font ,name)))
-
-(define (no-origin)
-  "")
-
-(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 ~4fC~4f ~4f ~4f ~4f ~4f ~4fS~4f ~4f ~4f ~4fz"
-			x-max 0
-			x-max y-max
-			x-min y-max
-			x-min 0
-			x-max y-min
-			x-max 0)))))
+  (fontify font name))
+
+(define (no-origin) "</a>\n")
 
 (define* (path thick commands #:optional (cap 'round) (join 'round) (fill? #f))
   (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)
-		   ((eq? head 'closepath) 0)
-		   (else 1)))
-	   (args (take rest arity))
-	   (svg-head (assoc-get head
-				'((rmoveto . m)
-				  (rcurveto . c)
-				  (curveto . C)
-				  (moveto . M)
-				  (lineto . L)
-				  (rlineto . l)
-				  (closepath . z))
-				"")))
-
-	  (cons (format #f "~a~a" svg-head (number-list->point args))
-		(convert-path-exps (drop rest arity))))
-	'()))
+        (let*
+            ((head (car exps))
+             (rest (cdr exps))
+             (arity
+              (cond ((memq head '(rmoveto rlineto lineto moveto)) 2)
+                    ((memq head '(rcurveto curveto)) 6)
+                    ((eq? head 'closepath) 0)
+                    (else 1)))
+             (args (take rest arity))
+             (svg-head (assoc-get head
+                                  '((rmoveto . m)
+                                    (rcurveto . c)
+                                    (curveto . C)
+                                    (moveto . M)
+                                    (lineto . L)
+                                    (rlineto . l)
+                                    (closepath . z))
+                                  "")))
+
+          (cons (format #f "~a~a" svg-head (number-list->point args))
+                (convert-path-exps (drop rest arity))))
+        '()))
 
   (let* ((line-cap-styles '(butt round square))
-	 (line-join-styles '(miter round bevel))
-	 (cap-style (if (not (memv cap line-cap-styles))
-			(begin
-			  (ly:warning (_ "unknown line-cap-style: ~S")
-				      (symbol->string cap))
-			  'round)
-			cap))
-	 (join-style (if (not (memv join line-join-styles))
-			 (begin
-			   (ly:warning (_ "unknown line-join-style: ~S")
-				       (symbol->string join))
-			   'round)
-			 join)))
+         (line-join-styles '(miter round bevel))
+         (cap-style (if (not (memv cap line-cap-styles))
+                        (begin
+                          (ly:warning (_ "unknown line-cap-style: ~S")
+                                      (symbol->string cap))
+                          'round)
+                        cap))
+         (join-style (if (not (memv join line-join-styles))
+                         (begin
+                           (ly:warning (_ "unknown line-join-style: ~S")
+                                       (symbol->string join))
+                           'round)
+                         join)))
     (entity 'path ""
-	    `(stroke-width . ,thick)
-	    `(stroke-linejoin . ,(symbol->string join-style))
-	    `(stroke-linecap . ,(symbol->string cap-style))
-	    '(stroke . "currentColor")
-	    `(fill . ,(if fill? "currentColor" "none"))
-	    `(d . ,(apply string-append (convert-path-exps commands))))))
+            `(stroke-width . ,thick)
+            `(stroke-linejoin . ,(symbol->string join-style))
+            `(stroke-linecap . ,(symbol->string cap-style))
+            '(stroke . "currentColor")
+            `(fill . ,(if fill? "currentColor" "none"))
+            `(d . ,(string-concatenate (convert-path-exps commands))))))
 
 (define (placebox x y expr)
   (if (string-null? expr)
       ""
       (let*
-	((normal-element (regexp-exec svg-element-regexp expr))
-	 (scaled-element (regexp-exec scaled-element-regexp expr))
-	 (scaled? (if scaled-element #t #f))
-	 (match (if scaled? scaled-element normal-element))
-	 (string1 (match:substring match 1))
-	 (string2 (match:substring match 2)))
-
-	(if scaled?
-	    (string-append string1
-			   (ly:format "translate(~4f, ~4f) " x (- y))
-			   string2
-			   "\n")
-	    (string-append string1
-			   (ly:format " transform=\"translate(~4f, ~4f)\" "
-				      x (- y))
-			   string2
-			   "\n")))))
+          ((normal-element (regexp-exec svg-element-regexp expr))
+           (scaled-element (regexp-exec scaled-element-regexp expr))
+           (scaled? (if scaled-element #t #f))
+           (match (if scaled? scaled-element normal-element))
+           (string1 (match:substring match 1))
+           (string2 (match:substring match 2)))
+
+        (if scaled?
+            (string-append string1
+                           (ly:format "translate(~4f, ~4f) " x (- y))
+                           string2
+                           "\n")
+            (string-append string1
+                           (ly:format " transform=\"translate(~4f, ~4f)\" "
+                                      x (- y))
+                           string2
+                           "\n")))))
 
 (define (polygon coords blot-diameter is-filled)
   (entity
-    'polygon ""
-    '(stroke-linejoin . "round")
-    '(stroke-linecap . "round")
-    `(stroke-width . ,blot-diameter)
-    `(fill . ,(if is-filled "currentColor" "none"))
-    '(stroke . "currentColor")
-    `(points . ,(string-join
-		  (map offset->point (ly:list->offsets '() coords))))))
-
-(define (repeat-slash width slope thickness)
-  (define (euclidean-length x y)
-    (sqrt (+ (* x x) (* y y))))
-  (let* ((x-width (euclidean-length thickness (/ thickness slope)))
-	 (height (* width slope)))
-    (entity
-      'path ""
-      '(fill . "currentColor")
-      `(d . ,(ly:format "M0 0l~4f 0 ~4f ~4f ~4f 0z"
-			x-width width (- height) (- x-width))))))
+   'polygon ""
+   '(stroke-linejoin . "round")
+   '(stroke-linecap . "round")
+   `(stroke-width . ,blot-diameter)
+   `(fill . ,(if is-filled "currentColor" "none"))
+   '(stroke . "currentColor")
+   `(points . ,(string-join
+                (map offset->point (ly:list->offsets '() coords))))))
 
 (define (resetcolor)
   "</g>\n")
@@ -620,54 +598,54 @@
 
 (define (round-filled-box breapth width depth height blot-diameter)
   (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)
-    ;;'(stroke . "red")
-    ;;'(fill . "orange")
-
-    `(x . ,(- breapth))
-    `(y . ,(- height))
-    `(width . ,(+ breapth width))
-    `(height . ,(+ depth height))
-    `(ry . ,(/ blot-diameter 2))
-    '(fill . "currentColor")))
+   '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)
+   ;;'(stroke . "red")
+   ;;'(fill . "orange")
+
+   `(x . ,(- breapth))
+   `(y . ,(- height))
+   `(width . ,(+ breapth width))
+   `(height . ,(+ depth height))
+   `(ry . ,(/ blot-diameter 2))
+   '(fill . "currentColor")))
 
 (define (setcolor r g b)
   (format #f "<g color=\"rgb(~a%, ~a%, ~a%)\">\n"
-	  (* 100 r) (* 100 g) (* 100 b)))
+          (* 100 r) (* 100 g) (* 100 b)))
 
 ;; rotate around given point
 (define (setrotation ang x y)
   (ly:format "<g transform=\"rotate(~4f, ~4f, ~4f)\">\n"
-	     (- ang) x (- y)))
+             (- ang) x (- y)))
 
 (define (setscale x y)
   (ly:format "<g transform=\"scale(~4f, ~4f)\">\n"
-	     x y))
+             x y))
 
 (define (text font string)
-  (dispatch `(fontify ,font ,(entity 'tspan (string->entities string)))))
+  (fontify font (entity 'tspan (string->entities string))))
 
 (define (url-link url x y)
   (string-append
    (eo 'a `(xlink:href . ,url))
    (eoc 'rect
-	`(x . ,(car x))
-	`(y . ,(car y))
-	`(width . ,(- (cdr x) (car x)))
-	`(height . ,(- (cdr y) (car y)))
-	'(fill . "none")
-	'(stroke . "none")
-	'(stroke-width . "0.0"))
+        `(x . ,(car x))
+        `(y . ,(car y))
+        `(width . ,(- (cdr x) (car x)))
+        `(height . ,(- (cdr y) (car y)))
+        '(fill . "none")
+        '(stroke . "none")
+        '(stroke-width . "0.0"))
    (ec 'a)))
 
 (define (utf-8-string pango-font-description string)
   (let ((escaped-string (string-regexp-substitute
-			  "<" "&lt;"
-			  (string-regexp-substitute "&" "&amp;" string))))
-    (dispatch `(fontify ,pango-font-description
-			,(entity 'tspan escaped-string)))))
+                         "<" "&lt;"
+                         (string-regexp-substitute "&" "&amp;" string))))
+    (fontify pango-font-description
+             (entity 'tspan escaped-string))))