X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fframework-svg.scm;h=84deff1b5f267150751ffd9f87692a7fc9e73a67;hb=623fac8d645e4078af36758af5d437c5eb39e793;hp=ebd4eb6b42fa33b2f0cfc9dfcd069e1e5c384517;hpb=0074bd08e3e2e0016585ffcc5aed52fb1966a821;p=lilypond.git

diff --git a/scm/framework-svg.scm b/scm/framework-svg.scm
index ebd4eb6b42..84deff1b5f 100644
--- a/scm/framework-svg.scm
+++ b/scm/framework-svg.scm
@@ -1,6 +1,6 @@
 ;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;; Copyright (C) 2004--2010 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; Copyright (C) 2004--2012 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;;                Patrick McCarty <pnorcks@gmail.com>
 ;;;;
 ;;;; LilyPond is free software: you can redistribute it and/or modify
@@ -58,31 +58,56 @@
 (define (svg-end)
   (ec 'svg))
 
+(define (mkdirs dir-name mode)
+  (let loop ((dir-name (string-split dir-name #\/)) (root ""))
+    (if (pair? dir-name)
+	(let ((dir (string-append root (car dir-name))))
+	  (if (not (file-exists? dir))
+	      (mkdir dir mode))
+	  (loop (cdr dir-name) (string-append dir "/"))))))
+   
+(define output-dir #f)
+
 (define (svg-define-font font font-name scaling)
-  (string-append
-   "@font-face {
-font-family: '"
-   font-name
-"';
+  (let* ((base-file-name (basename (if (list? font) (pango-pf-file-name font)
+				       (ly:font-file-name font)) ".otf"))
+	 (woff-file-name (string-regexp-substitute "([.]otf)?$" ".woff"
+						    base-file-name))
+	 (woff-file (or (ly:find-file woff-file-name) "/no-such-file.woff"))
+	 (url (string-append output-dir "/fonts/" (lilypond-version) "/"
+			     (basename woff-file-name)))
+	 (lower-name (string-downcase font-name)))
+    (if (file-exists? woff-file)
+	(begin
+	  (if (not (file-exists? url))
+	      (begin
+		(ly:message (_ "Updating font into: ~a") url)
+		(mkdirs (string-append output-dir "/" (dirname url)) #o700)
+		(copy-file woff-file url)
+		(ly:progress "\n")))
+	  (ly:format
+	   "@font-face {
+font-family: '~a';
 font-weight: normal;
 font-style: normal;
-src: url('"
-   (string-downcase font-name)
-   ".woff');
+src: url('~a');
 }
-"))
+"
+	   font-name url))
+	"")))
 
-(define (woff-header paper)
+(define (woff-header paper dir)
   "TODO:
       * add (ly:version) to font name
       * copy woff font with version alongside svg output
 "
+  (set! output-dir dir)
   (string-append
    (eo 'defs)
    (eo 'style '(text . "style/css"))
    "<![CDATA[
 "
-   (define-fonts paper svg-define-font)
+   (define-fonts paper svg-define-font svg-define-font)
    "]]>
 "
    (ec 'style)
@@ -99,11 +124,15 @@ src: url('"
 	 (page-width (* output-scale device-width))
 	 (page-height (* output-scale device-height)))
 
+    (if (ly:get-option 'svg-woff)
+	(module-define! (ly:outputter-module outputter) 'paper paper))
     (dump (svg-begin page-width page-height
 		     0 0 device-width device-height))
     (if (ly:get-option 'svg-woff)
-	(dump (woff-header paper)))
-    (dump (comment (format "Page: ~S/~S" page-number page-count)))
+	(module-remove! (ly:outputter-module outputter) 'paper))
+    (if (ly:get-option 'svg-woff)
+	(dump (woff-header paper (dirname filename))))
+    (dump (comment (format #f "Page: ~S/~S" page-number page-count)))
     (ly:outputter-output-scheme outputter
 				`(begin (set! lily-unit-length ,unit-length)
 					""))
@@ -126,10 +155,14 @@ src: url('"
 	 (svg-width (* output-scale device-width))
 	 (svg-height (* output-scale device-height)))
 
+    (if (ly:get-option 'svg-woff)
+	(module-define! (ly:outputter-module outputter) 'paper paper))
     (dump (svg-begin svg-width svg-height
 		     left-x (- top-y) device-width device-height))
-    (if (ly:get-option svg-woff)
-	(dump (woff-header paper)))
+    (if (ly:get-option 'svg-woff)
+	(module-remove! (ly:outputter-module outputter) 'paper))
+    (if (ly:get-option 'svg-woff)
+	(dump (woff-header paper (dirname filename))))
     (ly:outputter-output-scheme outputter
 				`(begin (set! lily-unit-length ,unit-length)
 					""))
@@ -145,11 +178,11 @@ src: url('"
 	 (page-count (length page-stencils))
 	 (filename "")
 	 (file-suffix (lambda (num)
-			(if (= page-count 1) "" (format "-page-~a" num)))))
+			(if (= page-count 1) "" (format #f "-page-~a" num)))))
     (for-each
       (lambda (page)
 	(set! page-number (1+ page-number))
-	(set! filename (format "~a~a.svg"
+	(set! filename (format #f "~a~a.svg"
 			       basename
 			       (file-suffix page-number)))
 	(dump-page paper filename page page-number page-count))
@@ -163,4 +196,4 @@ src: url('"
 		  (stack-stencils Y DOWN 0.0
 				  (map paper-system-stencil
 				       (reverse to-dump-systems)))
-		  (format "~a.preview.svg" basename))))
+		  (format #f "~a.preview.svg" basename))))