X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Foutput-svg.scm;h=a15a9d8ad0bc59432a8b69bf164017a56fa78ccf;hb=7404fd9d0d16a12b5f065268f5a6196024496aca;hp=a5a108a964aabad086292aafccffe97fe2ba30a6;hpb=a6bd229f7fe1dc4a03478e14ccc0c0c66b225061;p=lilypond.git

diff --git a/scm/output-svg.scm b/scm/output-svg.scm
index a5a108a964..a15a9d8ad0 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--2010 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; Copyright (C) 2002--2012 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;;                Patrick McCarty <pnorcks@gmail.com>
 ;;;;
 ;;;; LilyPond is free software: you can redistribute it and/or modify
@@ -19,10 +19,17 @@
 (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))
@@ -48,20 +55,26 @@
 		      (value (cdr x)))
 		  (if (number? value)
 		      (set! value (ly:format "~4f" value)))
-		  (format " ~s=\"~a\"" attr 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"))
@@ -79,7 +92,7 @@
   (define (helper lst)
     (if (null? lst)
 	'()
-	(cons (format "~S ~S" (car lst) (- (cadr lst)))
+	(cons (format #f "~S ~S" (car lst) (- (cadr lst)))
 	      (helper (cddr lst)))))
 
   (string-join (helper lst) " "))
@@ -114,10 +127,10 @@
   (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-text str expr)
   (define alist '())
@@ -231,7 +244,7 @@
 	   (begin
 	     (set! path (apply dump-path d-attr-value
 					 font-scale
-					 (list (cadr rest) (caddr rest))))
+					 (list (caddr rest) (cadddr rest))))
 	     (set! next-horiz-adv (+ next-horiz-adv
 				     (car rest)))
 	     path))
@@ -250,7 +263,7 @@
 	    ""))))
 
 (define (extract-glyph-info all-glyphs glyph size)
-  (let* ((offsets (list-head glyph 3))
+  (let* ((offsets (list-head glyph 4))
 	 (glyph-name (car (reverse glyph))))
     (apply extract-glyph all-glyphs glyph-name size offsets)))
 
@@ -266,7 +279,7 @@
 	(extract-glyph all-glyphs glyph size))))
 
 
-(define (feta-alphabet-to-path font size glyph)
+(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"))))
@@ -285,28 +298,37 @@
 	(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-text font expr)
-      (font-smob-to-path font expr)))
+      (font-smob-to-text font expr)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; 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))))))
@@ -323,7 +345,7 @@
 
 (define (dashed-line thick on off dx dy phase)
   (draw-line thick 0 0 dx dy
-	     `(stroke-dasharray . ,(format "~a,~a" on off))))
+	     `(stroke-dasharray . ,(format #f "~a,~a" on off))))
 
 (define (draw-line thick x1 y1 x2 y2 . alist)
   (apply entity 'line ""
@@ -349,25 +371,117 @@
     `(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 (glyph-string font size cid glyphs)
+(define (embedded-glyph-string pango-font font size cid glyphs)
   (define path "")
   (if (= 1 (length glyphs))
-      (set! path (feta-alphabet-to-path font size (car glyphs)))
+      (set! path (music-string-to-path font size (car glyphs)))
       (begin
 	(set! path
 	      (string-append (eo 'g)
 			     (string-join
 			       (map (lambda (x)
-				      (feta-alphabet-to-path font size 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 (grob-cause offset grob)
   "")
 
@@ -377,27 +491,7 @@
 (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)))))
-
-(define (path thick commands)
+(define* (path thick commands #:optional (cap 'round) (join 'round) (fill? #f))
   (define (convert-path-exps exps)
     (if (pair? exps)
 	(let*
@@ -419,17 +513,31 @@
 				  (closepath . z))
 				"")))
 
-	  (cons (format "~a~a" svg-head (number-list->point args))
+	  (cons (format #f "~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 . ,(apply string-append (convert-path-exps commands)))))
+  (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 . ,(apply string-append (convert-path-exps commands))))))
 
 (define (placebox x y expr)
   (if (string-null? expr)
@@ -464,23 +572,15 @@
     `(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))))))
-
 (define (resetcolor)
   "</g>\n")
 
 (define (resetrotation ang x y)
   "</g>\n")
 
+(define (resetscale)
+  "</g>\n")
+
 (define (round-filled-box breapth width depth height blot-diameter)
   (entity
     'rect ""
@@ -500,7 +600,7 @@
     '(fill . "currentColor")))
 
 (define (setcolor r g b)
-  (format "<g color=\"rgb(~a%, ~a%, ~a%)\">\n"
+  (format #f "<g color=\"rgb(~a%, ~a%, ~a%)\">\n"
 	  (* 100 r) (* 100 g) (* 100 b)))
 
 ;; rotate around given point
@@ -508,6 +608,10 @@
   (ly:format "<g transform=\"rotate(~4f, ~4f, ~4f)\">\n"
 	     (- ang) x (- y)))
 
+(define (setscale x y)
+  (ly:format "<g transform=\"scale(~4f, ~4f)\">\n"
+	     x y))
+
 (define (text font string)
   (dispatch `(fontify ,font ,(entity 'tspan (string->entities string)))))
 
@@ -525,4 +629,8 @@
    (ec 'a)))
 
 (define (utf-8-string pango-font-description string)
-  (dispatch `(fontify ,pango-font-description ,(entity 'tspan string))))
+  (let ((escaped-string (string-regexp-substitute
+			  "<" "&lt;"
+			  (string-regexp-substitute "&" "&amp;" string))))
+    (dispatch `(fontify ,pango-font-description
+			,(entity 'tspan escaped-string)))))