X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Foutput-svg.scm;h=60ad51f2814788d22008ab75d572fb9ee5f4f9c3;hb=0b544cfb7332615ef809b71b57ab656741311ae1;hp=bc27ed6d7ace0d787774068ddfcf4bd7af571b29;hpb=a5ff1c9ccdb83bd120edf2035532f47f578dc331;p=lilypond.git

diff --git a/scm/output-svg.scm b/scm/output-svg.scm
index bc27ed6d7a..60ad51f281 100644
--- a/scm/output-svg.scm
+++ b/scm/output-svg.scm
@@ -1,29 +1,34 @@
-;;;; output-svg.scm -- implement Scheme output routines for SVG1
+;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;;  source file of the GNU LilyPond music typesetter
+;;;; Copyright (C) 2002--2014 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;;                Patrick McCarty <pnorcks@gmail.com>
 ;;;;
-;;;; (c) 2002--2009 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; LilyPond is free software: you can redistribute it and/or modify
+;;;; it under the terms of the GNU General Public License as published by
+;;;; the Free Software Foundation, either version 3 of the License, or
+;;;; (at your option) any later version.
+;;;;
+;;;; LilyPond is distributed in the hope that it will be useful,
+;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;;; GNU General Public License for more details.
+;;;;
+;;;; You should have received a copy of the GNU General Public License
+;;;; along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 
-;;;; http://www.w3.org/TR/SVG11
-;;;; http://www.w3.org/TR/SVG12/ -- page, pageSet in draft
+(define-module (scm output-svg))
 
-;;;; TODO:
-;;;;  * .cff MUST NOT be in fc's fontpath.
-;;;;    - workaround: remove mf/out from ~/.fonts.conf,
-;;;;      instead add ~/.fonts and symlink all /mf/out/*otf there.
-;;;;    - bug in fontconfig/freetype/pango?
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; globals
 
-;;;;  * inkscape page/pageSet support
-;;;;  * inkscape SVG-font support
-;;;;    - use fontconfig/fc-cache for now, see output-gnome.scm
-
-(define-module (scm output-svg))
-(define this-module (current-module))
+;;; 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))
@@ -31,39 +36,39 @@
 (define fancy-format format)
 (define format ergonomic-simple-format)
 
-(define lily-unit-length 1.75)
-
-(define (dispatch expr)
-  (let ((keyword (car expr)))
-    (cond
-     ((eq? keyword 'some-func) "")
-     ;;((eq? keyword 'placebox) (dispatch (cadddr expr)))
-     (else
-      (if (module-defined? this-module keyword)
-	  (apply (eval keyword this-module) (cdr expr))
-	  (begin
-	    (ly:warning (_ "undefined: ~S") keyword)
-	    ""))))))
+(define lily-unit-length 1.7573)
 
 ;; Helper functions
 (define-public (attributes attributes-alist)
-  (apply string-append
-	 (map (lambda (x) (format " ~s=\"~a\"" (car x) (cdr x)))
-	      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"
-  (format "<~S~a>\n" entity (attributes attributes-alist)))
+  (format #f "<~S~a>\n" entity (attributes attributes-alist)))
 
 (define-public (eoc entity . attributes-alist)
-  " oc = open/close"
-  (format "<~S~a/>\n" entity (attributes attributes-alist)))
+  "oc = open/close"
+  (format #f "<~S~a/>\n" entity (attributes attributes-alist)))
 
 (define-public (ec entity)
   "c = close"
-  (format "</~S>\n" entity))
+  (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"))
 
 (define-public (entity entity string . attributes-alist)
   (if (equal? string "")
@@ -72,27 +77,26 @@
        (apply eo (cons entity attributes-alist)) string (ec entity))))
 
 (define (offset->point o)
-  (format " ~S,~S" (car o)  (- (cdr o))))
+  (ly:format "~4f ~4f" (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)))))
+        '()
+        (cons (format #f "~S ~S" (car lst) (- (cadr lst)))
+              (helper (cddr lst)))))
 
-  (string-join (helper 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 ")
+     (if (not close) "M" "L")
      (offset->point c0)
-     "C " (apply string-append (map offset->point c123))
-     (if (not close) "" (string-append
-			 "L " (offset->point close))))))
+     "C" (string-join (map offset->point c123) " ")
+     (if (not close) "" "z"))))
 
 (define (sqr x)
   (* x x))
@@ -104,192 +108,473 @@
   (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]+) (.*>)"))
+  (make-regexp "^(<[a-z]+) ?(.*>)"))
+
+(define scaled-element-regexp
+  (make-regexp "^(<[a-z]+ transform=\")(scale.[-0-9. ]+,[-0-9. ]+.\" .*>)"))
 
 (define pango-description-regexp-comma
-  (make-regexp ",( Bold)?( Italic)?( Small-Caps)? ([0-9.]+)$"))
+  (make-regexp ",( Bold)?( Italic)?( Small-Caps)?[ -]([0-9.]+)$"))
 
 (define pango-description-regexp-nocomma
-  (make-regexp "( Bold)?( Italic)?( Small-Caps)? ([0-9.]+)$"))
+  (make-regexp "( Bold)?( Italic)?( Small-Caps)?[ -]([0-9.]+)$"))
 
-(define (pango-description-to-svg-font str expr)
+(define (pango-description-to-text str expr)
   (define alist '())
   (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)))
+  (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)))
 
     (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))))
 
-(define (font-smob-to-svg-font font expr)
-  (let ((name-style (font-name-style font))
-	(size (modified-font-metric-font-scaling font)))
-
-    (entity 'text expr
-	    ;; FIXME: The cdr of `name-style' cannot select the
-	    ;; correct SVG font, so we ignore this information for now
-	    `(font-family . ,(car name-style))
-	    `(font-size . ,size)
-	    '(text-anchor . "start"))))
+(define (dump-path path scale . rest)
+  (define alist '())
+  (define (set-attribute attr val)
+    (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 ")"))))
+      (set-attribute 'transform (string-append
+                                 "scale(" scale ", -" scale ")")))
+
+  (set-attribute 'd path)
+  (set-attribute 'fill "currentColor")
+  (apply entity 'path "" (reverse alist)))
+
+
+;; A global variable for keeping track of the *cumulative*
+;; horizontal advance for glyph strings, but only if there
+;; is more than one glyph.
+(define next-horiz-adv 0.0)
+
+;; Matches the required "unicode" attribute from <glyph>
+(define glyph-unicode-value-regexp
+  (make-regexp "unicode=\"([^\"]+)\""))
+
+;; Matches the optional path data from <glyph>
+(define glyph-path-regexp
+  (make-regexp "d=\"([-MmZzLlHhVvCcSsQqTt0-9.\n ]*)\""))
+
+;; Matches a complete <glyph> element with the glyph-name
+;; attribute value of NAME.  For example:
+;;
+;; <glyph glyph-name="period" unicode="." horiz-adv-x="110"
+;; d="M0 55c0 30 25 55 55 55s55 -25 55
+;; -55s-25 -55 -55 -55s-55 25 -55 55z" />
+;;
+;; TODO: it would be better to use an XML library to extract
+;; the glyphs instead, and store them in a hash table.  --pmccarty
+;;
+(define (glyph-element-regexp name)
+  (make-regexp (string-append "<glyph"
+                              "(([[: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 ""))
+
+    (if (and unicode-attr? (not unicode-attr-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 (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 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>")))
+    (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))))
+
+
+(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"))))
+
+    (if 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"))))
+
+    (if 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))))
+
+(define font-smob-to-text
+  (if (not (ly:get-option 'svg-woff))
+      font-smob-to-path woff-font-smob-to-text))
 
 (define (fontify font expr)
   (if (string? font)
-      (pango-description-to-svg-font font expr)
-      (font-smob-to-svg-font font expr)))
+      (pango-description-to-text font expr)
+      (font-smob-to-text font expr)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; stencil outputters
 ;;;
 
-;;; catch-all for missing stuff
-;;; comment this out to see find out what functions you miss :-)
+(define (char font i)
+  (fontify font (entity 'tspan (char->entity (integer->char i)))))
 
-(if #f
-    (begin
-      (define (dummy . foo) "")
-      (map (lambda (x) (module-define! this-module x dummy))
-	   (append
-	    (ly:all-stencil-expressions)
-	    (ly:all-output-backend-commands)))
-      ))
+(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)))
 
-(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"))
-   (ec 'a)))
+(define (dashed-line thick on off dx dy phase)
+  (draw-line thick 0 0 dx dy
+             `(stroke-dasharray . ,(format #f "~a,~a" on off))))
 
-(define (grob-cause offset grob)
-  "")
+(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)))
 
-(define (no-origin)
-  "")
+(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)))
 
+(define (partial-ellipse x-radius y-radius start-angle end-angle thick connect fill)
+  (define (make-ellipse-radius x-radius y-radius angle)
+    (/ (* x-radius y-radius)
+       (sqrt (+ (* (* y-radius y-radius)
+                   (* (cos angle) (cos angle)))
+                (* (* 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
+            "M~4f ~4fA~4f ~4f 0 ~4f 0 ~4f ~4f"
+            (* start-radius (cos new-start-angle))
+            (- (* start-radius (sin new-start-angle)))
+            x-radius
+            y-radius
+            (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))))
+               "")))))))
 
+(define (embedded-svg string)
+  string)
 
-(define (bezier-sandwich lst thick)
-  (let* ((first (list-tail lst 4))
-	 (first-c0 (car (list-tail first 3)))
-	 (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 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))))))
+(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! next-horiz-adv 0.0)
+  path)
+
+(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 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)))))
+
+    (string-join (map (lambda (x) (apply glyph-spec x))
+                      (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-public (comment s)
-  (string-append "<!-- " s " !-->\n"))
+(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 (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)))
+(define (named-glyph font name)
+  (fontify font name))
 
-(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 (no-origin) "</a>\n")
 
-(define (named-glyph font name)
-  (dispatch
-   `(fontify ,font ,(entity 'tspan
-			    (integer->entity
-			     (ly:font-glyph-name-to-charcode font name))))))
+(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* ((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)))
+    (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 . ,(string-concatenate (convert-path-exps commands))))))
 
 (define (placebox x y expr)
-  (let*
-    ((match (regexp-exec svg-element-regexp expr))
-     (tagname (match:substring match 1))
-     (attributes (match:substring match 2)))
-
-    (string-append tagname
-		   ;; FIXME: Not using GNU coding standards
-		   ;; [translate ()] here to work around a
-		   ;; bug in Microsoft Internet Explorer 6.0
-		   (ly:format " transform=\"translate(~f, ~f)\" " x (- y))
-		   attributes
-		   "\n")))
+  (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")))))
 
 (define (polygon coords blot-diameter is-filled)
   (entity
@@ -300,91 +585,67 @@
    `(fill . ,(if is-filled "currentColor" "none"))
    '(stroke . "currentColor")
    `(points . ,(string-join
-		(map offset->point (ly:list->offsets '() coords))))
-   ))
+                (map offset->point (ly:list->offsets '() coords))))))
 
-;; rotate around given point
-(define (setrotation ang x y)
-  (format "<g transform=\"rotate(~a,~a,~a)\">\n"
-    (number->string (* -1 ang))
-    (number->string x)
-    (number->string (* -1 y))))
+(define (resetcolor)
+  "</g>\n")
 
 (define (resetrotation ang x y)
   "</g>\n")
 
-(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")
-	  ))
-
-(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)))
+(define (resetscale)
+  "</g>\n")
 
-(define (ellipse x-radius y-radius thick is-filled)
+(define (round-filled-box breapth width depth height blot-diameter)
   (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)))
+   '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 (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,~4f C~4f,~4f  ~4f,~4f ~4f,~4f S~4f,~4f ~4f,~4f" 
-               x-max 0
-               x-max y-max
-               x-min y-max
-               x-min 0
-               x-max y-min
-               x-max 0)))))
+(define (setcolor r g b)
+  (format #f "<g color=\"rgb(~a%, ~a%, ~a%)\">\n"
+          (* 100 r) (* 100 g) (* 100 b)))
 
-(define (text font string)
-  (dispatch `(fontify ,font ,(entity 'tspan (string->entities string)))))
+;; rotate around given point
+(define (setrotation ang x y)
+  (ly:format "<g transform=\"rotate(~4f, ~4f, ~4f)\">\n"
+             (- ang) x (- y)))
 
-(define (utf-8-string pango-font-description string)
-  (dispatch `(fontify ,pango-font-description ,(entity 'tspan string))))
+(define (setscale x y)
+  (ly:format "<g transform=\"scale(~4f, ~4f)\">\n"
+             x y))
 
-(define (embedded-svg string)
-  string)
+(define (text font string)
+  (fontify font (entity 'tspan (string->entities string))))
 
-(define (setcolor r g b)
-  (format "<g color=\"rgb(~a%,~a%,~a%)\">\n"
-	  (* 100 r) (* 100 g) (* 100 b)
-	  ))
+(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"))
+   (ec 'a)))
 
-(define (resetcolor)
-  "</g>\n")
+(define (utf-8-string pango-font-description string)
+  (let ((escaped-string (string-regexp-substitute
+                         "<" "&lt;"
+                         (string-regexp-substitute "&" "&amp;" string))))
+    (fontify pango-font-description
+             (entity 'tspan escaped-string))))